From 0fba5efd0932e830dcdbc3f7a1dc950b4230c163 Mon Sep 17 00:00:00 2001 From: Dark Nightmare Date: Thu, 18 Sep 2014 07:00:04 +0600 Subject: [PATCH 01/17] Fix url bbcode MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit фикс ссылок типа https://site.com/public/4f7b69175cbf%2F%D0%A1%D0%BD%D0%BE%D0%B2%D0%B0%20%D0%BE%D0%B4%D0%B8%D0%BD%20%D0%BD%D0%B0%20%D0%B2%D1%81%D0%B5%D1%85%2001_%D1%81%D0%B5%D1%80%D0%B8%D1%8F_WEBRip_1080p%20(1)-009.mkv содержащих скобки --- upload/includes/bbcode.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upload/includes/bbcode.php b/upload/includes/bbcode.php index 53ec6e420..eafbe7733 100644 --- a/upload/includes/bbcode.php +++ b/upload/includes/bbcode.php @@ -575,7 +575,7 @@ class bbcode $text = preg_replace_callback('#(\[(quote|spoiler)=")(.+?)("\])#', array(&$this, 'escape_tiltes_callback'), $text); // [url] - $url_exp = '[\w\#!$%&~/.\-;:=,?@а-яА-Я\[\]+]+?'; + $url_exp = '[\w\#!$%&~/.\-;:=,?@а-яА-Я()\[\]+]+?'; $text = preg_replace_callback("#\[url\]((?:https?://)?$url_exp)\[/url\]#isu", array(&$this, 'url_callback'), $text); $text = preg_replace_callback("#\[url\](www\.$url_exp)\[/url\]#isu", array(&$this, 'url_callback'), $text); $text = preg_replace_callback("#\[url=((?:https?://)?$url_exp)\]([^?\n\t].*?)\[/url\]#isu", array(&$this, 'url_callback'), $text); From 63c38b6a3862fb7273393213d75acb54259fb8ef Mon Sep 17 00:00:00 2001 From: Dark Nightmare Date: Thu, 18 Sep 2014 18:59:39 +0600 Subject: [PATCH 02/17] fix url bbcode make_clickable --- upload/includes/bbcode.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upload/includes/bbcode.php b/upload/includes/bbcode.php index eafbe7733..cc07348c2 100644 --- a/upload/includes/bbcode.php +++ b/upload/includes/bbcode.php @@ -739,7 +739,7 @@ class bbcode (? Date: Thu, 25 Sep 2014 15:07:35 +0400 Subject: [PATCH 03/17] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B4=D0=B5?= =?UTF-8?q?=D0=BB=D0=BA=D0=B0=20=D1=81=D1=82=D1=80=D1=83=D0=BA=D1=82=D1=83?= =?UTF-8?q?=D1=80=D1=8B=20=D0=BF=D0=B0=D0=BF=D0=BE=D0=BA=20=D0=B4=D0=B2?= =?UTF-8?q?=D0=B8=D0=B6=D0=BA=D0=B0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 30 +++++------ install/sql/mysql.sql | 2 +- upload/{ => admin}/stats/tr_stats.php | 2 +- upload/{ => admin}/stats/tracker.php | 2 +- upload/bt/includes/init_tr.php | 2 +- upload/common.php | 2 +- .../{images => data}/avatars/gallery/bot.gif | Bin .../avatars/gallery/noavatar.png | Bin upload/{ => data}/old_files/.htaccess | 0 .../thumbs => data/torrent_files}/.htaccess | 0 .../ajax_html}/jumpbox_guest.html | 0 .../ajax_html}/jumpbox_user.html | 0 upload/{ => internal_data}/atom/.keep | 0 .../cache}/.htaccess | 0 .../cache/filecache}/.htaccess | 0 .../{images => internal_data}/captcha/.keep | 0 upload/{cache => internal_data/log}/.htaccess | 0 .../log/cron}/.htaccess | 0 upload/{ => internal_data}/sitemap/.keep | 0 upload/{ => internal_data}/triggers/$on | 0 .../triggers}/.htaccess | 0 .../{ => internal_data}/triggers/cron_allowed | 0 upload/{ => library}/ajax/avatar.php | 0 .../{ => library}/ajax/change_tor_status.php | 0 upload/{ => library}/ajax/change_torrent.php | 0 upload/{ => library}/ajax/change_user_opt.php | 0 .../{ => library}/ajax/change_user_rank.php | 0 .../{ => library}/ajax/edit_group_profile.php | 0 .../{ => library}/ajax/edit_user_profile.php | 0 upload/{ => library}/ajax/gen_passkey.php | 0 .../{ => library}/ajax/group_membership.php | 0 upload/{ => library}/ajax/index_data.php | 0 upload/{ => library}/ajax/manage_admin.php | 0 upload/{ => library}/ajax/manage_user.php | 0 upload/{ => library}/ajax/mod_action.php | 0 .../{ => library}/ajax/post_mod_comment.php | 0 upload/{ => library}/ajax/posts.php | 0 upload/{ => library}/ajax/sitemap.php | 9 ++-- upload/{ => library}/ajax/topic_tpl.php | 0 upload/{ => library}/ajax/user_register.php | 0 upload/{ => library}/ajax/view_post.php | 0 upload/{ => library}/ajax/view_torrent.php | 0 .../captcha => library/attach_mod}/.htaccess | 0 .../attach_mod/attachment_mod.php | 0 .../{ => library}/attach_mod/displaying.php | 0 .../attach_mod/displaying_torrent.php | 0 .../attach_mod/includes}/.htaccess | 0 .../attach_mod/includes/functions_admin.php | 0 .../attach_mod/includes/functions_attach.php | 0 .../attach_mod/includes/functions_delete.php | 0 .../includes/functions_filetypes.php | 0 .../includes/functions_includes.php | 0 .../attach_mod/includes/functions_selects.php | 0 .../attach_mod/includes/functions_thumbs.php | 0 .../attach_mod/posting_attachments.php | 0 upload/{ => library}/config.php | 48 +++++++++--------- .../cron/jobs => library/includes}/.htaccess | 0 upload/{ => library}/includes/api.sphinx.php | 0 upload/{ => library}/includes/bbcode.php | 0 .../includes/captcha}/.htaccess | 0 .../includes/captcha/captcha.php | 0 .../captcha/kcaptcha/fonts/antiqua.png | Bin .../captcha/kcaptcha/fonts/baskerville.png | Bin .../captcha/kcaptcha/fonts/batang.png | Bin .../captcha/kcaptcha/fonts/bookman.png | Bin .../captcha/kcaptcha/fonts/calisto.png | Bin .../captcha/kcaptcha/fonts/cambria.png | Bin .../captcha/kcaptcha/fonts/centaur.png | Bin .../captcha/kcaptcha/fonts/century.png | Bin .../captcha/kcaptcha/fonts/chaparral.png | Bin .../captcha/kcaptcha/fonts/constantia.png | Bin .../captcha/kcaptcha/fonts/footlight.png | Bin .../captcha/kcaptcha/fonts/garamond.png | Bin .../captcha/kcaptcha/fonts/georgia.png | Bin .../captcha/kcaptcha/fonts/goudy_old.png | Bin .../captcha/kcaptcha/fonts/kozuka.png | Bin .../captcha/kcaptcha/fonts/lucida.png | Bin .../captcha/kcaptcha/fonts/minion.png | Bin .../captcha/kcaptcha/fonts/palatino.png | Bin .../captcha/kcaptcha/fonts/perpetua.png | Bin .../captcha/kcaptcha/fonts/rockwell.png | Bin .../includes/captcha/kcaptcha/fonts/times.png | Bin .../captcha/kcaptcha/fonts/warnock.png | Bin .../{ => library}/includes/class.correct.php | 0 .../includes/class.reflection.php | 0 .../{ => library}/includes/class.sitemap.php | 16 +++--- upload/{ => library}/includes/class.utf8.php | 0 .../db => library/includes/cron}/.htaccess | 0 .../includes/cron/cron_check.php | 0 .../{ => library}/includes/cron/cron_init.php | 0 .../{ => library}/includes/cron/cron_run.php | 0 .../includes/cron/jobs}/.htaccess | 0 .../includes/cron/jobs/attach_maintenance.php | 0 .../includes/cron/jobs/bb_maintenance.php | 0 .../includes/cron/jobs/cache_gc.php | 0 .../includes/cron/jobs/captcha_gen_gc.php | 0 .../includes/cron/jobs/clean_dlstat.php | 0 .../includes/cron/jobs/clean_log.php | 0 .../cron/jobs/clean_search_results.php | 0 .../cron/jobs/ds_update_cat_forums.php | 0 .../includes/cron/jobs/ds_update_stats.php | 0 .../includes/cron/jobs/flash_topic_view.php | 0 .../includes/cron/jobs/prune_forums.php | 0 .../cron/jobs/prune_inactive_users.php | 0 .../includes/cron/jobs/prune_topic_moved.php | 0 .../includes/cron/jobs/sessions_cleanup.php | 0 .../includes/cron/jobs/sitemap.php | 0 .../cron/jobs/tr_cleanup_and_dlstat.php | 0 .../includes/cron/jobs/tr_complete_count.php | 0 .../includes/cron/jobs/tr_maintenance.php | 0 .../includes/cron/jobs/tr_make_snapshot.php | 0 .../cron/jobs/tr_update_seeder_last_seen.php | 0 .../includes/cron/jobs/update_forums_atom.php | 0 .../includes/datastore}/.htaccess | 0 .../datastore/build_attach_extensions.php | 0 .../includes/datastore/build_cat_forums.php | 0 .../includes/datastore/build_moderators.php | 0 .../includes/datastore/build_ranks.php | 0 .../includes/datastore/build_smilies.php | 0 .../includes/datastore/build_stats.php | 0 .../en => library/includes/db}/.htaccess | 0 upload/{ => library}/includes/db/mysql.php | 0 .../{ => library}/includes/emailer.class.php | 0 upload/{ => library}/includes/functions.php | 0 .../includes/functions_admin.php | 0 .../includes/functions_admin_cron.php | 0 .../includes/functions_admin_torrent.php | 0 .../{ => library}/includes/functions_atom.php | 0 .../{ => library}/includes/functions_dev.php | 0 .../includes/functions_group.php | 0 .../{ => library}/includes/functions_post.php | 0 .../includes/functions_selects.php | 0 .../includes/functions_torrent.php | 0 .../includes/functions_upload.php | 0 .../includes/functions_validate.php | 0 upload/{ => library}/includes/init_bb.php | 0 .../includes/online_userlist.php | 0 upload/{ => library}/includes/page_footer.php | 0 .../includes/page_footer_dev.php | 0 upload/{ => library}/includes/page_header.php | 0 upload/{ => library}/includes/posting_tpl.php | 0 upload/{ => library}/includes/sessions.php | 0 upload/{ => library}/includes/smtp.php | 0 upload/{ => library}/includes/sql_parse.php | 0 upload/{ => library}/includes/template.php | 0 .../includes/torrent_announce_urls.php | 0 .../includes/torrent_show_dl_list.php | 0 .../email => library/includes/ucp}/.htaccess | 0 .../{ => library}/includes/ucp/activate.php | 0 upload/{ => library}/includes/ucp/bonus.php | 0 upload/{ => library}/includes/ucp/email.php | 0 .../{ => library}/includes/ucp/register.php | 0 .../{ => library}/includes/ucp/sendpasswd.php | 0 .../includes/ucp/topic_watch.php | 0 .../includes/ucp/viewprofile.php | 0 .../includes/ucp/viewtorrent.php | 0 .../en/html => library/language}/.htaccess | 0 .../ru => library/language/en}/.htaccess | 0 .../language/en}/email/.htaccess | 0 .../language/en/email/admin_send_email.tpl | 0 .../{ => library}/language/en/email/blank.tpl | 0 .../language/en/email/group_added.tpl | 0 .../language/en/email/group_approved.tpl | 0 .../language/en/email/group_request.tpl | 0 .../language/en/email/privmsg_notify.tpl | 0 .../language/en/email/profile_send_email.tpl | 0 .../language/en/email/topic_notify.tpl | 0 .../language/en/email/user_activate.tpl | 0 .../en/email/user_activate_passwd.tpl | 0 .../language/en/email/user_welcome.tpl | 0 .../en/email/user_welcome_inactive.tpl | 0 .../ru => library/language/en}/html/.htaccess | 0 .../language/en/html/advert.html | 0 .../language/en/html/copyright_holders.html | 0 .../language/en/html/not_found.html | 0 .../language/en/html/sidebar1.html | 0 .../language/en/html/sidebar2.html | 0 .../language/en/html/user_agreement.html | 0 upload/{ => library}/language/en/main.php | 0 .../language/en/search_stopwords.txt | 0 .../language/en/search_synonyms.txt | 0 .../language/en/translit_table.php | 0 .../uk => library/language/ru}/.htaccess | 0 .../language/ru}/email/.htaccess | 0 .../language/ru/email/admin_send_email.tpl | 0 .../{ => library}/language/ru/email/blank.tpl | 0 .../language/ru/email/group_added.tpl | 0 .../language/ru/email/group_approved.tpl | 0 .../language/ru/email/group_request.tpl | 0 .../language/ru/email/privmsg_notify.tpl | 0 .../language/ru/email/profile_send_email.tpl | 0 .../language/ru/email/topic_notify.tpl | 0 .../language/ru/email/user_activate.tpl | 0 .../ru/email/user_activate_passwd.tpl | 0 .../language/ru/email/user_welcome.tpl | 0 .../ru/email/user_welcome_inactive.tpl | 0 .../uk => library/language/ru}/html/.htaccess | 0 .../language/ru/html/advert.html | 0 .../language/ru/html/copyright_holders.html | 0 .../language/ru/html/not_found.html | 0 .../language/ru/html/sidebar1.html | 0 .../language/ru/html/sidebar2.html | 0 .../language/ru/html/user_agreement.html | 0 upload/{ => library}/language/ru/main.php | 0 .../language/ru/search_stopwords.txt | 0 .../language/ru/search_synonyms.txt | 0 .../language/ru/translit_table.php | 0 upload/{log => library/language/uk}/.htaccess | 0 .../language/uk/email}/.htaccess | 0 .../language/uk/email/admin_send_email.tpl | 0 .../{ => library}/language/uk/email/blank.tpl | 0 .../language/uk/email/group_added.tpl | 0 .../language/uk/email/group_approved.tpl | 0 .../language/uk/email/group_request.tpl | 0 .../language/uk/email/privmsg_notify.tpl | 0 .../language/uk/email/profile_send_email.tpl | 0 .../language/uk/email/topic_notify.tpl | 0 .../language/uk/email/user_activate.tpl | 0 .../uk/email/user_activate_passwd.tpl | 0 .../language/uk/email/user_welcome.tpl | 0 .../uk/email/user_welcome_inactive.tpl | 0 .../language/uk/html}/.htaccess | 0 .../language/uk/html/advert.html | 0 .../language/uk/html/copyright_holders.html | 0 .../language/uk/html/not_found.html | 0 .../language/uk/html/sidebar1.html | 0 .../language/uk/html/sidebar2.html | 0 .../language/uk/html/user_agreement.html | 0 upload/{ => library}/language/uk/main.php | 0 .../language/uk/search_stopwords.txt | 0 .../language/uk/search_synonyms.txt | 0 .../language/uk/translit_table.php | 0 upload/{ => styles}/images/bad.gif | Bin upload/{ => styles}/images/dc_magnet.png | Bin upload/{ => styles}/images/dc_magnet_ext.png | Bin upload/{ => styles}/images/folder.gif | Bin upload/{ => styles}/images/good.gif | Bin upload/{ => styles}/images/icon_clip.gif | Bin upload/{ => styles}/images/icon_delete.gif | Bin upload/{ => styles}/images/icon_dn.gif | Bin upload/{ => styles}/images/icon_edit.gif | Bin upload/{ => styles}/images/icon_external.png | Bin upload/{ => styles}/images/icon_run.gif | Bin upload/{ => styles}/images/icon_sync.gif | Bin upload/{ => styles}/images/logo/logo.png | Bin .../{ => styles}/images/logo/logo_summer.png | Bin upload/{ => styles}/images/magnet.png | Bin upload/{ => styles}/images/page.gif | Bin upload/{ => styles}/images/pic_loading.gif | Bin upload/{ => styles}/images/ranks/admin.png | Bin upload/{ => styles}/images/ranks/user.png | Bin upload/{ => styles}/images/smiles/aa.gif | Bin upload/{ => styles}/images/smiles/ab.gif | Bin upload/{ => styles}/images/smiles/ac.gif | Bin upload/{ => styles}/images/smiles/ad.gif | Bin upload/{ => styles}/images/smiles/ae.gif | Bin upload/{ => styles}/images/smiles/af.gif | Bin upload/{ => styles}/images/smiles/ag.gif | Bin upload/{ => styles}/images/smiles/ah.gif | Bin upload/{ => styles}/images/smiles/ai.gif | Bin upload/{ => styles}/images/smiles/aj.gif | Bin upload/{ => styles}/images/smiles/ak.gif | Bin upload/{ => styles}/images/smiles/al.gif | Bin upload/{ => styles}/images/smiles/am.gif | Bin upload/{ => styles}/images/smiles/an.gif | Bin upload/{ => styles}/images/smiles/ao.gif | Bin upload/{ => styles}/images/smiles/ap.gif | Bin upload/{ => styles}/images/smiles/aq.gif | Bin upload/{ => styles}/images/smiles/ar.gif | Bin upload/{ => styles}/images/smiles/as.gif | Bin upload/{ => styles}/images/smiles/at.gif | Bin upload/{ => styles}/images/smiles/au.gif | Bin upload/{ => styles}/images/smiles/av.gif | Bin upload/{ => styles}/images/smiles/aw.gif | Bin upload/{ => styles}/images/smiles/ax.gif | Bin upload/{ => styles}/images/smiles/ay.gif | Bin upload/{ => styles}/images/smiles/az.gif | Bin upload/{ => styles}/images/smiles/ba.gif | Bin upload/{ => styles}/images/smiles/bb.gif | Bin upload/{ => styles}/images/smiles/bc.gif | Bin upload/{ => styles}/images/smiles/bd.gif | Bin upload/{ => styles}/images/smiles/be.gif | Bin upload/{ => styles}/images/smiles/bf.gif | Bin upload/{ => styles}/images/smiles/bg.gif | Bin upload/{ => styles}/images/smiles/bh.gif | Bin upload/{ => styles}/images/smiles/bi.gif | Bin upload/{ => styles}/images/smiles/bj.gif | Bin upload/{ => styles}/images/smiles/bk.gif | Bin upload/{ => styles}/images/smiles/bl.gif | Bin upload/{ => styles}/images/smiles/bm.gif | Bin upload/{ => styles}/images/smiles/bn.gif | Bin upload/{ => styles}/images/smiles/bo.gif | Bin upload/{ => styles}/images/smiles/bp.gif | Bin upload/{ => styles}/images/smiles/bq.gif | Bin upload/{ => styles}/images/smiles/br.gif | Bin upload/{ => styles}/images/smiles/bs.gif | Bin upload/{ => styles}/images/smiles/bt.gif | Bin upload/{ => styles}/images/smiles/bu.gif | Bin upload/{ => styles}/images/smiles/bv.gif | Bin upload/{ => styles}/images/smiles/bw.gif | Bin upload/{ => styles}/images/smiles/bx.gif | Bin upload/{ => styles}/images/smiles/by.gif | Bin upload/{ => styles}/images/smiles/bz.gif | Bin upload/{ => styles}/images/smiles/ca.gif | Bin upload/{ => styles}/images/smiles/cb.gif | Bin upload/{ => styles}/images/smiles/cc.gif | Bin upload/{ => styles}/images/smiles/tr_oops.gif | Bin upload/{ => styles}/images/spacer.gif | Bin upload/{ => styles}/images/tor_gold.gif | Bin upload/{ => styles}/images/tor_silver.gif | Bin upload/{ => styles}/images/user_offline.gif | Bin upload/{ => styles}/images/user_online.gif | Bin .../misc/bootstrap/css/bootstrap-theme.css | 0 .../bootstrap/css/bootstrap-theme.css.map | 0 .../bootstrap/css/bootstrap-theme.min.css | 0 .../misc/bootstrap/css/bootstrap.css | 0 .../misc/bootstrap/css/bootstrap.css.map | 0 .../misc/bootstrap/css/bootstrap.min.css | 0 .../fonts/glyphicons-halflings-regular.eot | Bin .../fonts/glyphicons-halflings-regular.svg | 0 .../fonts/glyphicons-halflings-regular.ttf | Bin .../fonts/glyphicons-halflings-regular.woff | Bin .../misc/bootstrap/js/bootstrap.js | 0 .../misc/bootstrap/js/bootstrap.min.js | 0 upload/{ => styles}/misc/js/bbcode.js | 0 upload/{ => styles}/misc/js/jquery.pack.js | 0 upload/{ => styles}/misc/js/main.js | 0 .../templates/admin/admin_attach_cp.tpl | 0 .../templates/admin/admin_attachments.tpl | 0 .../templates/admin/admin_board.tpl | 0 .../templates/admin/admin_bt_forum_cfg.tpl | 0 .../templates/admin/admin_bt_tracker_cfg.tpl | 0 .../templates/admin/admin_cron.tpl | 0 .../templates/admin/admin_disallow.tpl | 0 .../templates/admin/admin_extensions.tpl | 0 .../templates/admin/admin_forum_prune.tpl | 0 .../templates/admin/admin_forumauth.tpl | 0 .../templates/admin/admin_forumauth_list.tpl | 0 .../templates/admin/admin_forums.tpl | 0 .../templates/admin/admin_groups.tpl | 0 .../templates/admin/admin_log.tpl | 0 .../templates/admin/admin_mass_email.tpl | 0 .../templates/admin/admin_ranks.tpl | 0 .../templates/admin/admin_rebuild_search.tpl | 0 .../templates/admin/admin_sitemap.tpl | 0 .../templates/admin/admin_smilies.tpl | 0 .../templates/admin/admin_terms.tpl | 0 .../templates/admin/admin_ug_auth.tpl | 0 .../templates/admin/admin_user_ban.tpl | 0 .../templates/admin/admin_user_search.tpl | 0 .../templates/admin/admin_words.tpl | 0 upload/{ => styles}/templates/admin/index.tpl | 4 +- .../{ => styles}/templates/default/common.tpl | 0 .../templates/default/css/admin.css | 0 .../templates/default/css/main.css | 0 .../{ => styles}/templates/default/group.tpl | 0 .../templates/default/group_edit.tpl | 0 .../templates/default/images/aerobg.png | Bin .../templates/default/images/arrow1.gif | Bin .../templates/default/images/button.gif | Bin .../templates/default/images/cellpic.gif | Bin .../templates/default/images/cellpic1.gif | Bin .../templates/default/images/def_button.png | Bin .../default/images/def_button_light.png | Bin .../templates/default/images/feed.png | Bin .../templates/default/images/folder.gif | Bin .../default/images/folder_announce.gif | Bin .../default/images/folder_announce_new.gif | Bin .../templates/default/images/folder_big.gif | Bin .../templates/default/images/folder_dl.gif | Bin .../default/images/folder_dl_hot.gif | Bin .../default/images/folder_dl_hot_new.gif | Bin .../default/images/folder_dl_new.gif | Bin .../templates/default/images/folder_hot.gif | Bin .../templates/default/images/folder_lock.gif | Bin .../default/images/folder_lock_new.gif | Bin .../default/images/folder_locked_big.gif | Bin .../templates/default/images/folder_new.gif | Bin .../default/images/folder_new_big.gif | Bin .../default/images/folder_new_hot.gif | Bin .../default/images/folder_sticky.gif | Bin .../default/images/folder_sticky_new.gif | Bin .../default/images/hr200_ltr_gradient.jpg | Bin .../default/images/hr400_ltr_gradient.jpg | Bin .../default/images/icon_birthday.gif | Bin .../templates/default/images/icon_delete.gif | Bin .../templates/default/images/icon_female.gif | Bin .../default/images/icon_latest_reply.gif | Bin .../templates/default/images/icon_male.gif | Bin .../default/images/icon_minipost.gif | Bin .../default/images/icon_minipost_new.gif | Bin .../templates/default/images/icon_minus_1.gif | Bin .../templates/default/images/icon_minus_2.gif | Bin .../templates/default/images/icon_mod.gif | Bin .../default/images/icon_newest_reply.gif | Bin .../default/images/icon_nogender.gif | Bin .../templates/default/images/icon_plus_1.gif | Bin .../templates/default/images/icon_plus_2.gif | Bin .../templates/default/images/img_alert.gif | Bin .../default/images/lang/en/icon_edit.gif | Bin .../default/images/lang/en/icon_email.gif | Bin .../default/images/lang/en/icon_icq_add.gif | Bin .../default/images/lang/en/icon_ip.gif | Bin .../default/images/lang/en/icon_mc.gif | Bin .../default/images/lang/en/icon_pm.gif | Bin .../default/images/lang/en/icon_poll.gif | Bin .../default/images/lang/en/icon_profile.gif | Bin .../default/images/lang/en/icon_quote.gif | Bin .../default/images/lang/en/icon_search.gif | Bin .../default/images/lang/en/icon_www.gif | Bin .../default/images/lang/en/msg_newpost.gif | Bin .../templates/default/images/lang/en/post.gif | Bin .../default/images/lang/en/release.gif | Bin .../default/images/lang/en/reply-locked.gif | Bin .../default/images/lang/en/reply.gif | Bin .../default/images/lang/ru/icon_edit.gif | Bin .../default/images/lang/ru/icon_email.gif | Bin .../default/images/lang/ru/icon_icq_add.gif | Bin .../default/images/lang/ru/icon_ip.gif | Bin .../default/images/lang/ru/icon_mc.gif | Bin .../default/images/lang/ru/icon_pm.gif | Bin .../default/images/lang/ru/icon_poll.gif | Bin .../default/images/lang/ru/icon_profile.gif | Bin .../default/images/lang/ru/icon_quote.gif | Bin .../default/images/lang/ru/icon_search.gif | Bin .../default/images/lang/ru/icon_www.gif | Bin .../default/images/lang/ru/msg_newpost.gif | Bin .../templates/default/images/lang/ru/post.gif | Bin .../default/images/lang/ru/release.gif | Bin .../default/images/lang/ru/reply-locked.gif | Bin .../default/images/lang/ru/reply.gif | Bin .../default/images/lang/uk/icon_edit.gif | Bin .../default/images/lang/uk/icon_email.gif | Bin .../default/images/lang/uk/icon_icq_add.gif | Bin .../default/images/lang/uk/icon_ip.gif | Bin .../default/images/lang/uk/icon_mc.gif | Bin .../default/images/lang/uk/icon_pm.gif | Bin .../default/images/lang/uk/icon_poll.gif | Bin .../default/images/lang/uk/icon_profile.gif | Bin .../default/images/lang/uk/icon_quote.gif | Bin .../default/images/lang/uk/icon_search.gif | Bin .../default/images/lang/uk/icon_www.gif | Bin .../default/images/lang/uk/msg_newpost.gif | Bin .../templates/default/images/lang/uk/post.gif | Bin .../default/images/lang/uk/release.gif | Bin .../default/images/lang/uk/reply-locked.gif | Bin .../default/images/lang/uk/reply.gif | Bin .../templates/default/images/link_help.cur | Bin .../templates/default/images/loading.gif | Bin .../templates/default/images/loading_1.gif | Bin .../templates/default/images/menu_open.gif | Bin .../templates/default/images/menu_open_1.gif | Bin .../templates/default/images/msg_inbox.gif | Bin .../templates/default/images/msg_outbox.gif | Bin .../templates/default/images/msg_savebox.gif | Bin .../templates/default/images/msg_sentbox.gif | Bin .../templates/default/images/progress_bar.gif | Bin .../default/images/progress_bar_full.gif | Bin .../templates/default/images/spacer.gif | Bin .../templates/default/images/tbl_sort_asc.gif | Bin .../templates/default/images/tbl_sort_bg.gif | Bin .../default/images/tbl_sort_desc.gif | Bin .../templates/default/images/topic_delete.gif | Bin .../templates/default/images/topic_dl.gif | Bin .../templates/default/images/topic_lock.gif | Bin .../templates/default/images/topic_move.gif | Bin .../templates/default/images/topic_normal.gif | Bin .../templates/default/images/topic_split.gif | Bin .../templates/default/images/topic_unlock.gif | Bin .../images/treeview/treeview-default-line.gif | Bin .../images/treeview/treeview-default.gif | Bin .../templates/default/images/vote_lcap.gif | Bin .../templates/default/images/vote_rcap.gif | Bin .../templates/default/images/voting_bar.gif | Bin .../templates/default/images/whosonline.gif | Bin .../{ => styles}/templates/default/index.tpl | 0 .../templates/default/index_map.tpl | 0 .../{ => styles}/templates/default/login.tpl | 0 .../templates/default/memberlist.tpl | 0 .../{ => styles}/templates/default/modcp.tpl | 0 .../templates/default/modcp_split.tpl | 0 .../templates/default/page_footer.tpl | 0 .../templates/default/page_header.tpl | 0 .../templates/default/posting.tpl | 0 .../templates/default/posting_attach.tpl | 0 .../templates/default/posting_editor.tpl | 0 .../templates/default/posting_smilies.tpl | 0 .../templates/default/privmsgs.tpl | 0 .../templates/default/privmsgs_read.tpl | 0 .../{ => styles}/templates/default/search.tpl | 0 .../templates/default/search_results.tpl | 0 .../{ => styles}/templates/default/terms.tpl | 0 .../templates/default/torhelp.tpl | 0 .../templates/default/tpl_config.php | 0 .../templates/default/tracker.tpl | 0 .../templates/default/usercp_bonus.tpl | 0 .../templates/default/usercp_email.tpl | 0 .../templates/default/usercp_register.tpl | 0 .../templates/default/usercp_sendpasswd.tpl | 0 .../templates/default/usercp_topic_watch.tpl | 0 .../templates/default/usercp_viewprofile.tpl | 0 .../templates/default/viewforum.tpl | 0 .../templates/default/viewtopic.tpl | 0 .../templates/default/viewtopic_attach.tpl | 0 .../default/viewtopic_attach_guest.tpl | 0 .../templates/default/viewtopic_poll.tpl | 0 .../templates/default/viewtopic_torrent.tpl | 0 upload/{ => styles}/templates/posting_tpl.tpl | 0 508 files changed, 56 insertions(+), 61 deletions(-) rename upload/{ => admin}/stats/tr_stats.php (97%) rename upload/{ => admin}/stats/tracker.php (99%) rename upload/{images => data}/avatars/gallery/bot.gif (100%) rename upload/{images => data}/avatars/gallery/noavatar.png (100%) rename upload/{ => data}/old_files/.htaccess (100%) rename upload/{old_files/thumbs => data/torrent_files}/.htaccess (100%) rename upload/{ajax/html => internal_data/ajax_html}/jumpbox_guest.html (100%) rename upload/{ajax/html => internal_data/ajax_html}/jumpbox_user.html (100%) rename upload/{ => internal_data}/atom/.keep (100%) rename upload/{attach_mod => internal_data/cache}/.htaccess (100%) rename upload/{attach_mod/includes => internal_data/cache/filecache}/.htaccess (100%) rename upload/{images => internal_data}/captcha/.keep (100%) rename upload/{cache => internal_data/log}/.htaccess (100%) rename upload/{cache/filecache => internal_data/log/cron}/.htaccess (100%) rename upload/{ => internal_data}/sitemap/.keep (100%) rename upload/{ => internal_data}/triggers/$on (100%) rename upload/{includes => internal_data/triggers}/.htaccess (100%) rename upload/{ => internal_data}/triggers/cron_allowed (100%) rename upload/{ => library}/ajax/avatar.php (100%) rename upload/{ => library}/ajax/change_tor_status.php (100%) rename upload/{ => library}/ajax/change_torrent.php (100%) rename upload/{ => library}/ajax/change_user_opt.php (100%) rename upload/{ => library}/ajax/change_user_rank.php (100%) rename upload/{ => library}/ajax/edit_group_profile.php (100%) rename upload/{ => library}/ajax/edit_user_profile.php (100%) rename upload/{ => library}/ajax/gen_passkey.php (100%) rename upload/{ => library}/ajax/group_membership.php (100%) rename upload/{ => library}/ajax/index_data.php (100%) rename upload/{ => library}/ajax/manage_admin.php (100%) rename upload/{ => library}/ajax/manage_user.php (100%) rename upload/{ => library}/ajax/mod_action.php (100%) rename upload/{ => library}/ajax/post_mod_comment.php (100%) rename upload/{ => library}/ajax/posts.php (100%) rename upload/{ => library}/ajax/sitemap.php (93%) rename upload/{ => library}/ajax/topic_tpl.php (100%) rename upload/{ => library}/ajax/user_register.php (100%) rename upload/{ => library}/ajax/view_post.php (100%) rename upload/{ => library}/ajax/view_torrent.php (100%) rename upload/{includes/captcha => library/attach_mod}/.htaccess (100%) rename upload/{ => library}/attach_mod/attachment_mod.php (100%) rename upload/{ => library}/attach_mod/displaying.php (100%) rename upload/{ => library}/attach_mod/displaying_torrent.php (100%) rename upload/{includes/cron => library/attach_mod/includes}/.htaccess (100%) rename upload/{ => library}/attach_mod/includes/functions_admin.php (100%) rename upload/{ => library}/attach_mod/includes/functions_attach.php (100%) rename upload/{ => library}/attach_mod/includes/functions_delete.php (100%) rename upload/{ => library}/attach_mod/includes/functions_filetypes.php (100%) rename upload/{ => library}/attach_mod/includes/functions_includes.php (100%) rename upload/{ => library}/attach_mod/includes/functions_selects.php (100%) rename upload/{ => library}/attach_mod/includes/functions_thumbs.php (100%) rename upload/{ => library}/attach_mod/posting_attachments.php (100%) rename upload/{ => library}/config.php (93%) rename upload/{includes/cron/jobs => library/includes}/.htaccess (100%) rename upload/{ => library}/includes/api.sphinx.php (100%) mode change 100755 => 100644 rename upload/{ => library}/includes/bbcode.php (100%) rename upload/{includes/datastore => library/includes/captcha}/.htaccess (100%) rename upload/{ => library}/includes/captcha/captcha.php (100%) rename upload/{ => library}/includes/captcha/kcaptcha/fonts/antiqua.png (100%) rename upload/{ => library}/includes/captcha/kcaptcha/fonts/baskerville.png (100%) rename upload/{ => library}/includes/captcha/kcaptcha/fonts/batang.png (100%) rename upload/{ => library}/includes/captcha/kcaptcha/fonts/bookman.png (100%) rename upload/{ => library}/includes/captcha/kcaptcha/fonts/calisto.png (100%) rename upload/{ => library}/includes/captcha/kcaptcha/fonts/cambria.png (100%) rename upload/{ => library}/includes/captcha/kcaptcha/fonts/centaur.png (100%) rename upload/{ => library}/includes/captcha/kcaptcha/fonts/century.png (100%) rename upload/{ => library}/includes/captcha/kcaptcha/fonts/chaparral.png (100%) rename upload/{ => library}/includes/captcha/kcaptcha/fonts/constantia.png (100%) rename upload/{ => library}/includes/captcha/kcaptcha/fonts/footlight.png (100%) rename upload/{ => library}/includes/captcha/kcaptcha/fonts/garamond.png (100%) rename upload/{ => library}/includes/captcha/kcaptcha/fonts/georgia.png (100%) rename upload/{ => library}/includes/captcha/kcaptcha/fonts/goudy_old.png (100%) rename upload/{ => library}/includes/captcha/kcaptcha/fonts/kozuka.png (100%) rename upload/{ => library}/includes/captcha/kcaptcha/fonts/lucida.png (100%) rename upload/{ => library}/includes/captcha/kcaptcha/fonts/minion.png (100%) rename upload/{ => library}/includes/captcha/kcaptcha/fonts/palatino.png (100%) rename upload/{ => library}/includes/captcha/kcaptcha/fonts/perpetua.png (100%) rename upload/{ => library}/includes/captcha/kcaptcha/fonts/rockwell.png (100%) rename upload/{ => library}/includes/captcha/kcaptcha/fonts/times.png (100%) rename upload/{ => library}/includes/captcha/kcaptcha/fonts/warnock.png (100%) rename upload/{ => library}/includes/class.correct.php (100%) rename upload/{ => library}/includes/class.reflection.php (100%) rename upload/{ => library}/includes/class.sitemap.php (92%) rename upload/{ => library}/includes/class.utf8.php (100%) rename upload/{includes/db => library/includes/cron}/.htaccess (100%) rename upload/{ => library}/includes/cron/cron_check.php (100%) rename upload/{ => library}/includes/cron/cron_init.php (100%) rename upload/{ => library}/includes/cron/cron_run.php (100%) rename upload/{includes/ucp => library/includes/cron/jobs}/.htaccess (100%) rename upload/{ => library}/includes/cron/jobs/attach_maintenance.php (100%) rename upload/{ => library}/includes/cron/jobs/bb_maintenance.php (100%) rename upload/{ => library}/includes/cron/jobs/cache_gc.php (100%) rename upload/{ => library}/includes/cron/jobs/captcha_gen_gc.php (100%) rename upload/{ => library}/includes/cron/jobs/clean_dlstat.php (100%) rename upload/{ => library}/includes/cron/jobs/clean_log.php (100%) rename upload/{ => library}/includes/cron/jobs/clean_search_results.php (100%) rename upload/{ => library}/includes/cron/jobs/ds_update_cat_forums.php (100%) rename upload/{ => library}/includes/cron/jobs/ds_update_stats.php (100%) rename upload/{ => library}/includes/cron/jobs/flash_topic_view.php (100%) rename upload/{ => library}/includes/cron/jobs/prune_forums.php (100%) rename upload/{ => library}/includes/cron/jobs/prune_inactive_users.php (100%) rename upload/{ => library}/includes/cron/jobs/prune_topic_moved.php (100%) rename upload/{ => library}/includes/cron/jobs/sessions_cleanup.php (100%) rename upload/{ => library}/includes/cron/jobs/sitemap.php (100%) rename upload/{ => library}/includes/cron/jobs/tr_cleanup_and_dlstat.php (100%) rename upload/{ => library}/includes/cron/jobs/tr_complete_count.php (100%) rename upload/{ => library}/includes/cron/jobs/tr_maintenance.php (100%) rename upload/{ => library}/includes/cron/jobs/tr_make_snapshot.php (100%) rename upload/{ => library}/includes/cron/jobs/tr_update_seeder_last_seen.php (100%) rename upload/{ => library}/includes/cron/jobs/update_forums_atom.php (100%) rename upload/{language => library/includes/datastore}/.htaccess (100%) rename upload/{ => library}/includes/datastore/build_attach_extensions.php (100%) rename upload/{ => library}/includes/datastore/build_cat_forums.php (100%) rename upload/{ => library}/includes/datastore/build_moderators.php (100%) rename upload/{ => library}/includes/datastore/build_ranks.php (100%) rename upload/{ => library}/includes/datastore/build_smilies.php (100%) rename upload/{ => library}/includes/datastore/build_stats.php (100%) rename upload/{language/en => library/includes/db}/.htaccess (100%) rename upload/{ => library}/includes/db/mysql.php (100%) rename upload/{ => library}/includes/emailer.class.php (100%) rename upload/{ => library}/includes/functions.php (100%) rename upload/{ => library}/includes/functions_admin.php (100%) rename upload/{ => library}/includes/functions_admin_cron.php (100%) rename upload/{ => library}/includes/functions_admin_torrent.php (100%) rename upload/{ => library}/includes/functions_atom.php (100%) rename upload/{ => library}/includes/functions_dev.php (100%) rename upload/{ => library}/includes/functions_group.php (100%) rename upload/{ => library}/includes/functions_post.php (100%) rename upload/{ => library}/includes/functions_selects.php (100%) rename upload/{ => library}/includes/functions_torrent.php (100%) rename upload/{ => library}/includes/functions_upload.php (100%) rename upload/{ => library}/includes/functions_validate.php (100%) rename upload/{ => library}/includes/init_bb.php (100%) rename upload/{ => library}/includes/online_userlist.php (100%) rename upload/{ => library}/includes/page_footer.php (100%) rename upload/{ => library}/includes/page_footer_dev.php (100%) rename upload/{ => library}/includes/page_header.php (100%) rename upload/{ => library}/includes/posting_tpl.php (100%) rename upload/{ => library}/includes/sessions.php (100%) rename upload/{ => library}/includes/smtp.php (100%) rename upload/{ => library}/includes/sql_parse.php (100%) rename upload/{ => library}/includes/template.php (100%) rename upload/{ => library}/includes/torrent_announce_urls.php (100%) rename upload/{ => library}/includes/torrent_show_dl_list.php (100%) rename upload/{language/en/email => library/includes/ucp}/.htaccess (100%) rename upload/{ => library}/includes/ucp/activate.php (100%) rename upload/{ => library}/includes/ucp/bonus.php (100%) rename upload/{ => library}/includes/ucp/email.php (100%) rename upload/{ => library}/includes/ucp/register.php (100%) rename upload/{ => library}/includes/ucp/sendpasswd.php (100%) rename upload/{ => library}/includes/ucp/topic_watch.php (100%) rename upload/{ => library}/includes/ucp/viewprofile.php (100%) rename upload/{ => library}/includes/ucp/viewtorrent.php (100%) rename upload/{language/en/html => library/language}/.htaccess (100%) rename upload/{language/ru => library/language/en}/.htaccess (100%) rename upload/{language/ru => library/language/en}/email/.htaccess (100%) rename upload/{ => library}/language/en/email/admin_send_email.tpl (100%) rename upload/{ => library}/language/en/email/blank.tpl (100%) rename upload/{ => library}/language/en/email/group_added.tpl (100%) rename upload/{ => library}/language/en/email/group_approved.tpl (100%) rename upload/{ => library}/language/en/email/group_request.tpl (100%) rename upload/{ => library}/language/en/email/privmsg_notify.tpl (100%) rename upload/{ => library}/language/en/email/profile_send_email.tpl (100%) rename upload/{ => library}/language/en/email/topic_notify.tpl (100%) rename upload/{ => library}/language/en/email/user_activate.tpl (100%) rename upload/{ => library}/language/en/email/user_activate_passwd.tpl (100%) rename upload/{ => library}/language/en/email/user_welcome.tpl (100%) rename upload/{ => library}/language/en/email/user_welcome_inactive.tpl (100%) rename upload/{language/ru => library/language/en}/html/.htaccess (100%) rename upload/{ => library}/language/en/html/advert.html (100%) rename upload/{ => library}/language/en/html/copyright_holders.html (100%) rename upload/{ => library}/language/en/html/not_found.html (100%) rename upload/{ => library}/language/en/html/sidebar1.html (100%) rename upload/{ => library}/language/en/html/sidebar2.html (100%) rename upload/{ => library}/language/en/html/user_agreement.html (100%) rename upload/{ => library}/language/en/main.php (100%) rename upload/{ => library}/language/en/search_stopwords.txt (100%) rename upload/{ => library}/language/en/search_synonyms.txt (100%) rename upload/{ => library}/language/en/translit_table.php (100%) rename upload/{language/uk => library/language/ru}/.htaccess (100%) rename upload/{language/uk => library/language/ru}/email/.htaccess (100%) rename upload/{ => library}/language/ru/email/admin_send_email.tpl (100%) rename upload/{ => library}/language/ru/email/blank.tpl (100%) rename upload/{ => library}/language/ru/email/group_added.tpl (100%) rename upload/{ => library}/language/ru/email/group_approved.tpl (100%) rename upload/{ => library}/language/ru/email/group_request.tpl (100%) rename upload/{ => library}/language/ru/email/privmsg_notify.tpl (100%) rename upload/{ => library}/language/ru/email/profile_send_email.tpl (100%) rename upload/{ => library}/language/ru/email/topic_notify.tpl (100%) rename upload/{ => library}/language/ru/email/user_activate.tpl (100%) rename upload/{ => library}/language/ru/email/user_activate_passwd.tpl (100%) rename upload/{ => library}/language/ru/email/user_welcome.tpl (100%) rename upload/{ => library}/language/ru/email/user_welcome_inactive.tpl (100%) rename upload/{language/uk => library/language/ru}/html/.htaccess (100%) rename upload/{ => library}/language/ru/html/advert.html (100%) rename upload/{ => library}/language/ru/html/copyright_holders.html (100%) rename upload/{ => library}/language/ru/html/not_found.html (100%) rename upload/{ => library}/language/ru/html/sidebar1.html (100%) rename upload/{ => library}/language/ru/html/sidebar2.html (100%) rename upload/{ => library}/language/ru/html/user_agreement.html (100%) rename upload/{ => library}/language/ru/main.php (100%) rename upload/{ => library}/language/ru/search_stopwords.txt (100%) rename upload/{ => library}/language/ru/search_synonyms.txt (100%) rename upload/{ => library}/language/ru/translit_table.php (100%) rename upload/{log => library/language/uk}/.htaccess (100%) rename upload/{log/cron => library/language/uk/email}/.htaccess (100%) rename upload/{ => library}/language/uk/email/admin_send_email.tpl (100%) rename upload/{ => library}/language/uk/email/blank.tpl (100%) rename upload/{ => library}/language/uk/email/group_added.tpl (100%) rename upload/{ => library}/language/uk/email/group_approved.tpl (100%) rename upload/{ => library}/language/uk/email/group_request.tpl (100%) rename upload/{ => library}/language/uk/email/privmsg_notify.tpl (100%) rename upload/{ => library}/language/uk/email/profile_send_email.tpl (100%) rename upload/{ => library}/language/uk/email/topic_notify.tpl (100%) rename upload/{ => library}/language/uk/email/user_activate.tpl (100%) rename upload/{ => library}/language/uk/email/user_activate_passwd.tpl (100%) rename upload/{ => library}/language/uk/email/user_welcome.tpl (100%) rename upload/{ => library}/language/uk/email/user_welcome_inactive.tpl (100%) rename upload/{triggers => library/language/uk/html}/.htaccess (100%) rename upload/{ => library}/language/uk/html/advert.html (100%) rename upload/{ => library}/language/uk/html/copyright_holders.html (100%) rename upload/{ => library}/language/uk/html/not_found.html (100%) rename upload/{ => library}/language/uk/html/sidebar1.html (100%) rename upload/{ => library}/language/uk/html/sidebar2.html (100%) rename upload/{ => library}/language/uk/html/user_agreement.html (100%) rename upload/{ => library}/language/uk/main.php (100%) rename upload/{ => library}/language/uk/search_stopwords.txt (100%) rename upload/{ => library}/language/uk/search_synonyms.txt (100%) rename upload/{ => library}/language/uk/translit_table.php (100%) rename upload/{ => styles}/images/bad.gif (100%) rename upload/{ => styles}/images/dc_magnet.png (100%) rename upload/{ => styles}/images/dc_magnet_ext.png (100%) rename upload/{ => styles}/images/folder.gif (100%) rename upload/{ => styles}/images/good.gif (100%) rename upload/{ => styles}/images/icon_clip.gif (100%) rename upload/{ => styles}/images/icon_delete.gif (100%) rename upload/{ => styles}/images/icon_dn.gif (100%) rename upload/{ => styles}/images/icon_edit.gif (100%) rename upload/{ => styles}/images/icon_external.png (100%) rename upload/{ => styles}/images/icon_run.gif (100%) rename upload/{ => styles}/images/icon_sync.gif (100%) rename upload/{ => styles}/images/logo/logo.png (100%) rename upload/{ => styles}/images/logo/logo_summer.png (100%) rename upload/{ => styles}/images/magnet.png (100%) rename upload/{ => styles}/images/page.gif (100%) rename upload/{ => styles}/images/pic_loading.gif (100%) rename upload/{ => styles}/images/ranks/admin.png (100%) rename upload/{ => styles}/images/ranks/user.png (100%) rename upload/{ => styles}/images/smiles/aa.gif (100%) rename upload/{ => styles}/images/smiles/ab.gif (100%) rename upload/{ => styles}/images/smiles/ac.gif (100%) rename upload/{ => styles}/images/smiles/ad.gif (100%) rename upload/{ => styles}/images/smiles/ae.gif (100%) rename upload/{ => styles}/images/smiles/af.gif (100%) rename upload/{ => styles}/images/smiles/ag.gif (100%) rename upload/{ => styles}/images/smiles/ah.gif (100%) rename upload/{ => styles}/images/smiles/ai.gif (100%) rename upload/{ => styles}/images/smiles/aj.gif (100%) rename upload/{ => styles}/images/smiles/ak.gif (100%) rename upload/{ => styles}/images/smiles/al.gif (100%) rename upload/{ => styles}/images/smiles/am.gif (100%) rename upload/{ => styles}/images/smiles/an.gif (100%) rename upload/{ => styles}/images/smiles/ao.gif (100%) rename upload/{ => styles}/images/smiles/ap.gif (100%) rename upload/{ => styles}/images/smiles/aq.gif (100%) rename upload/{ => styles}/images/smiles/ar.gif (100%) rename upload/{ => styles}/images/smiles/as.gif (100%) rename upload/{ => styles}/images/smiles/at.gif (100%) rename upload/{ => styles}/images/smiles/au.gif (100%) rename upload/{ => styles}/images/smiles/av.gif (100%) rename upload/{ => styles}/images/smiles/aw.gif (100%) rename upload/{ => styles}/images/smiles/ax.gif (100%) rename upload/{ => styles}/images/smiles/ay.gif (100%) rename upload/{ => styles}/images/smiles/az.gif (100%) rename upload/{ => styles}/images/smiles/ba.gif (100%) rename upload/{ => styles}/images/smiles/bb.gif (100%) rename upload/{ => styles}/images/smiles/bc.gif (100%) rename upload/{ => styles}/images/smiles/bd.gif (100%) rename upload/{ => styles}/images/smiles/be.gif (100%) rename upload/{ => styles}/images/smiles/bf.gif (100%) rename upload/{ => styles}/images/smiles/bg.gif (100%) rename upload/{ => styles}/images/smiles/bh.gif (100%) rename upload/{ => styles}/images/smiles/bi.gif (100%) rename upload/{ => styles}/images/smiles/bj.gif (100%) rename upload/{ => styles}/images/smiles/bk.gif (100%) rename upload/{ => styles}/images/smiles/bl.gif (100%) rename upload/{ => styles}/images/smiles/bm.gif (100%) rename upload/{ => styles}/images/smiles/bn.gif (100%) rename upload/{ => styles}/images/smiles/bo.gif (100%) rename upload/{ => styles}/images/smiles/bp.gif (100%) rename upload/{ => styles}/images/smiles/bq.gif (100%) rename upload/{ => styles}/images/smiles/br.gif (100%) rename upload/{ => styles}/images/smiles/bs.gif (100%) rename upload/{ => styles}/images/smiles/bt.gif (100%) rename upload/{ => styles}/images/smiles/bu.gif (100%) rename upload/{ => styles}/images/smiles/bv.gif (100%) rename upload/{ => styles}/images/smiles/bw.gif (100%) rename upload/{ => styles}/images/smiles/bx.gif (100%) rename upload/{ => styles}/images/smiles/by.gif (100%) rename upload/{ => styles}/images/smiles/bz.gif (100%) rename upload/{ => styles}/images/smiles/ca.gif (100%) rename upload/{ => styles}/images/smiles/cb.gif (100%) rename upload/{ => styles}/images/smiles/cc.gif (100%) rename upload/{ => styles}/images/smiles/tr_oops.gif (100%) rename upload/{ => styles}/images/spacer.gif (100%) rename upload/{ => styles}/images/tor_gold.gif (100%) rename upload/{ => styles}/images/tor_silver.gif (100%) rename upload/{ => styles}/images/user_offline.gif (100%) rename upload/{ => styles}/images/user_online.gif (100%) rename upload/{ => styles}/misc/bootstrap/css/bootstrap-theme.css (100%) rename upload/{ => styles}/misc/bootstrap/css/bootstrap-theme.css.map (100%) rename upload/{ => styles}/misc/bootstrap/css/bootstrap-theme.min.css (100%) rename upload/{ => styles}/misc/bootstrap/css/bootstrap.css (100%) rename upload/{ => styles}/misc/bootstrap/css/bootstrap.css.map (100%) rename upload/{ => styles}/misc/bootstrap/css/bootstrap.min.css (100%) rename upload/{ => styles}/misc/bootstrap/fonts/glyphicons-halflings-regular.eot (100%) rename upload/{ => styles}/misc/bootstrap/fonts/glyphicons-halflings-regular.svg (100%) rename upload/{ => styles}/misc/bootstrap/fonts/glyphicons-halflings-regular.ttf (100%) rename upload/{ => styles}/misc/bootstrap/fonts/glyphicons-halflings-regular.woff (100%) rename upload/{ => styles}/misc/bootstrap/js/bootstrap.js (100%) rename upload/{ => styles}/misc/bootstrap/js/bootstrap.min.js (100%) rename upload/{ => styles}/misc/js/bbcode.js (100%) rename upload/{ => styles}/misc/js/jquery.pack.js (100%) rename upload/{ => styles}/misc/js/main.js (100%) rename upload/{ => styles}/templates/admin/admin_attach_cp.tpl (100%) rename upload/{ => styles}/templates/admin/admin_attachments.tpl (100%) rename upload/{ => styles}/templates/admin/admin_board.tpl (100%) rename upload/{ => styles}/templates/admin/admin_bt_forum_cfg.tpl (100%) rename upload/{ => styles}/templates/admin/admin_bt_tracker_cfg.tpl (100%) rename upload/{ => styles}/templates/admin/admin_cron.tpl (100%) rename upload/{ => styles}/templates/admin/admin_disallow.tpl (100%) rename upload/{ => styles}/templates/admin/admin_extensions.tpl (100%) rename upload/{ => styles}/templates/admin/admin_forum_prune.tpl (100%) rename upload/{ => styles}/templates/admin/admin_forumauth.tpl (100%) rename upload/{ => styles}/templates/admin/admin_forumauth_list.tpl (100%) rename upload/{ => styles}/templates/admin/admin_forums.tpl (100%) rename upload/{ => styles}/templates/admin/admin_groups.tpl (100%) rename upload/{ => styles}/templates/admin/admin_log.tpl (100%) rename upload/{ => styles}/templates/admin/admin_mass_email.tpl (100%) rename upload/{ => styles}/templates/admin/admin_ranks.tpl (100%) rename upload/{ => styles}/templates/admin/admin_rebuild_search.tpl (100%) rename upload/{ => styles}/templates/admin/admin_sitemap.tpl (100%) rename upload/{ => styles}/templates/admin/admin_smilies.tpl (100%) rename upload/{ => styles}/templates/admin/admin_terms.tpl (100%) rename upload/{ => styles}/templates/admin/admin_ug_auth.tpl (100%) rename upload/{ => styles}/templates/admin/admin_user_ban.tpl (100%) rename upload/{ => styles}/templates/admin/admin_user_search.tpl (100%) rename upload/{ => styles}/templates/admin/admin_words.tpl (100%) rename upload/{ => styles}/templates/admin/index.tpl (98%) rename upload/{ => styles}/templates/default/common.tpl (100%) rename upload/{ => styles}/templates/default/css/admin.css (100%) rename upload/{ => styles}/templates/default/css/main.css (100%) rename upload/{ => styles}/templates/default/group.tpl (100%) rename upload/{ => styles}/templates/default/group_edit.tpl (100%) rename upload/{ => styles}/templates/default/images/aerobg.png (100%) rename upload/{ => styles}/templates/default/images/arrow1.gif (100%) rename upload/{ => styles}/templates/default/images/button.gif (100%) rename upload/{ => styles}/templates/default/images/cellpic.gif (100%) rename upload/{ => styles}/templates/default/images/cellpic1.gif (100%) rename upload/{ => styles}/templates/default/images/def_button.png (100%) rename upload/{ => styles}/templates/default/images/def_button_light.png (100%) rename upload/{ => styles}/templates/default/images/feed.png (100%) rename upload/{ => styles}/templates/default/images/folder.gif (100%) rename upload/{ => styles}/templates/default/images/folder_announce.gif (100%) rename upload/{ => styles}/templates/default/images/folder_announce_new.gif (100%) rename upload/{ => styles}/templates/default/images/folder_big.gif (100%) rename upload/{ => styles}/templates/default/images/folder_dl.gif (100%) rename upload/{ => styles}/templates/default/images/folder_dl_hot.gif (100%) rename upload/{ => styles}/templates/default/images/folder_dl_hot_new.gif (100%) rename upload/{ => styles}/templates/default/images/folder_dl_new.gif (100%) rename upload/{ => styles}/templates/default/images/folder_hot.gif (100%) rename upload/{ => styles}/templates/default/images/folder_lock.gif (100%) rename upload/{ => styles}/templates/default/images/folder_lock_new.gif (100%) rename upload/{ => styles}/templates/default/images/folder_locked_big.gif (100%) rename upload/{ => styles}/templates/default/images/folder_new.gif (100%) rename upload/{ => styles}/templates/default/images/folder_new_big.gif (100%) rename upload/{ => styles}/templates/default/images/folder_new_hot.gif (100%) rename upload/{ => styles}/templates/default/images/folder_sticky.gif (100%) rename upload/{ => styles}/templates/default/images/folder_sticky_new.gif (100%) rename upload/{ => styles}/templates/default/images/hr200_ltr_gradient.jpg (100%) rename upload/{ => styles}/templates/default/images/hr400_ltr_gradient.jpg (100%) rename upload/{ => styles}/templates/default/images/icon_birthday.gif (100%) rename upload/{ => styles}/templates/default/images/icon_delete.gif (100%) rename upload/{ => styles}/templates/default/images/icon_female.gif (100%) rename upload/{ => styles}/templates/default/images/icon_latest_reply.gif (100%) rename upload/{ => styles}/templates/default/images/icon_male.gif (100%) rename upload/{ => styles}/templates/default/images/icon_minipost.gif (100%) rename upload/{ => styles}/templates/default/images/icon_minipost_new.gif (100%) rename upload/{ => styles}/templates/default/images/icon_minus_1.gif (100%) rename upload/{ => styles}/templates/default/images/icon_minus_2.gif (100%) rename upload/{ => styles}/templates/default/images/icon_mod.gif (100%) rename upload/{ => styles}/templates/default/images/icon_newest_reply.gif (100%) rename upload/{ => styles}/templates/default/images/icon_nogender.gif (100%) rename upload/{ => styles}/templates/default/images/icon_plus_1.gif (100%) rename upload/{ => styles}/templates/default/images/icon_plus_2.gif (100%) rename upload/{ => styles}/templates/default/images/img_alert.gif (100%) rename upload/{ => styles}/templates/default/images/lang/en/icon_edit.gif (100%) rename upload/{ => styles}/templates/default/images/lang/en/icon_email.gif (100%) rename upload/{ => styles}/templates/default/images/lang/en/icon_icq_add.gif (100%) rename upload/{ => styles}/templates/default/images/lang/en/icon_ip.gif (100%) rename upload/{ => styles}/templates/default/images/lang/en/icon_mc.gif (100%) rename upload/{ => styles}/templates/default/images/lang/en/icon_pm.gif (100%) rename upload/{ => styles}/templates/default/images/lang/en/icon_poll.gif (100%) rename upload/{ => styles}/templates/default/images/lang/en/icon_profile.gif (100%) rename upload/{ => styles}/templates/default/images/lang/en/icon_quote.gif (100%) rename upload/{ => styles}/templates/default/images/lang/en/icon_search.gif (100%) rename upload/{ => styles}/templates/default/images/lang/en/icon_www.gif (100%) rename upload/{ => styles}/templates/default/images/lang/en/msg_newpost.gif (100%) rename upload/{ => styles}/templates/default/images/lang/en/post.gif (100%) rename upload/{ => styles}/templates/default/images/lang/en/release.gif (100%) rename upload/{ => styles}/templates/default/images/lang/en/reply-locked.gif (100%) rename upload/{ => styles}/templates/default/images/lang/en/reply.gif (100%) rename upload/{ => styles}/templates/default/images/lang/ru/icon_edit.gif (100%) rename upload/{ => styles}/templates/default/images/lang/ru/icon_email.gif (100%) rename upload/{ => styles}/templates/default/images/lang/ru/icon_icq_add.gif (100%) rename upload/{ => styles}/templates/default/images/lang/ru/icon_ip.gif (100%) rename upload/{ => styles}/templates/default/images/lang/ru/icon_mc.gif (100%) rename upload/{ => styles}/templates/default/images/lang/ru/icon_pm.gif (100%) rename upload/{ => styles}/templates/default/images/lang/ru/icon_poll.gif (100%) rename upload/{ => styles}/templates/default/images/lang/ru/icon_profile.gif (100%) rename upload/{ => styles}/templates/default/images/lang/ru/icon_quote.gif (100%) rename upload/{ => styles}/templates/default/images/lang/ru/icon_search.gif (100%) rename upload/{ => styles}/templates/default/images/lang/ru/icon_www.gif (100%) rename upload/{ => styles}/templates/default/images/lang/ru/msg_newpost.gif (100%) rename upload/{ => styles}/templates/default/images/lang/ru/post.gif (100%) rename upload/{ => styles}/templates/default/images/lang/ru/release.gif (100%) rename upload/{ => styles}/templates/default/images/lang/ru/reply-locked.gif (100%) rename upload/{ => styles}/templates/default/images/lang/ru/reply.gif (100%) rename upload/{ => styles}/templates/default/images/lang/uk/icon_edit.gif (100%) rename upload/{ => styles}/templates/default/images/lang/uk/icon_email.gif (100%) rename upload/{ => styles}/templates/default/images/lang/uk/icon_icq_add.gif (100%) rename upload/{ => styles}/templates/default/images/lang/uk/icon_ip.gif (100%) rename upload/{ => styles}/templates/default/images/lang/uk/icon_mc.gif (100%) rename upload/{ => styles}/templates/default/images/lang/uk/icon_pm.gif (100%) rename upload/{ => styles}/templates/default/images/lang/uk/icon_poll.gif (100%) rename upload/{ => styles}/templates/default/images/lang/uk/icon_profile.gif (100%) rename upload/{ => styles}/templates/default/images/lang/uk/icon_quote.gif (100%) rename upload/{ => styles}/templates/default/images/lang/uk/icon_search.gif (100%) rename upload/{ => styles}/templates/default/images/lang/uk/icon_www.gif (100%) rename upload/{ => styles}/templates/default/images/lang/uk/msg_newpost.gif (100%) rename upload/{ => styles}/templates/default/images/lang/uk/post.gif (100%) rename upload/{ => styles}/templates/default/images/lang/uk/release.gif (100%) rename upload/{ => styles}/templates/default/images/lang/uk/reply-locked.gif (100%) rename upload/{ => styles}/templates/default/images/lang/uk/reply.gif (100%) rename upload/{ => styles}/templates/default/images/link_help.cur (100%) rename upload/{ => styles}/templates/default/images/loading.gif (100%) rename upload/{ => styles}/templates/default/images/loading_1.gif (100%) rename upload/{ => styles}/templates/default/images/menu_open.gif (100%) rename upload/{ => styles}/templates/default/images/menu_open_1.gif (100%) rename upload/{ => styles}/templates/default/images/msg_inbox.gif (100%) rename upload/{ => styles}/templates/default/images/msg_outbox.gif (100%) rename upload/{ => styles}/templates/default/images/msg_savebox.gif (100%) rename upload/{ => styles}/templates/default/images/msg_sentbox.gif (100%) rename upload/{ => styles}/templates/default/images/progress_bar.gif (100%) rename upload/{ => styles}/templates/default/images/progress_bar_full.gif (100%) rename upload/{ => styles}/templates/default/images/spacer.gif (100%) rename upload/{ => styles}/templates/default/images/tbl_sort_asc.gif (100%) rename upload/{ => styles}/templates/default/images/tbl_sort_bg.gif (100%) rename upload/{ => styles}/templates/default/images/tbl_sort_desc.gif (100%) rename upload/{ => styles}/templates/default/images/topic_delete.gif (100%) rename upload/{ => styles}/templates/default/images/topic_dl.gif (100%) rename upload/{ => styles}/templates/default/images/topic_lock.gif (100%) rename upload/{ => styles}/templates/default/images/topic_move.gif (100%) rename upload/{ => styles}/templates/default/images/topic_normal.gif (100%) rename upload/{ => styles}/templates/default/images/topic_split.gif (100%) rename upload/{ => styles}/templates/default/images/topic_unlock.gif (100%) rename upload/{ => styles}/templates/default/images/treeview/treeview-default-line.gif (100%) rename upload/{ => styles}/templates/default/images/treeview/treeview-default.gif (100%) rename upload/{ => styles}/templates/default/images/vote_lcap.gif (100%) rename upload/{ => styles}/templates/default/images/vote_rcap.gif (100%) rename upload/{ => styles}/templates/default/images/voting_bar.gif (100%) rename upload/{ => styles}/templates/default/images/whosonline.gif (100%) rename upload/{ => styles}/templates/default/index.tpl (100%) rename upload/{ => styles}/templates/default/index_map.tpl (100%) rename upload/{ => styles}/templates/default/login.tpl (100%) rename upload/{ => styles}/templates/default/memberlist.tpl (100%) rename upload/{ => styles}/templates/default/modcp.tpl (100%) rename upload/{ => styles}/templates/default/modcp_split.tpl (100%) rename upload/{ => styles}/templates/default/page_footer.tpl (100%) rename upload/{ => styles}/templates/default/page_header.tpl (100%) rename upload/{ => styles}/templates/default/posting.tpl (100%) rename upload/{ => styles}/templates/default/posting_attach.tpl (100%) rename upload/{ => styles}/templates/default/posting_editor.tpl (100%) rename upload/{ => styles}/templates/default/posting_smilies.tpl (100%) rename upload/{ => styles}/templates/default/privmsgs.tpl (100%) rename upload/{ => styles}/templates/default/privmsgs_read.tpl (100%) rename upload/{ => styles}/templates/default/search.tpl (100%) rename upload/{ => styles}/templates/default/search_results.tpl (100%) rename upload/{ => styles}/templates/default/terms.tpl (100%) rename upload/{ => styles}/templates/default/torhelp.tpl (100%) rename upload/{ => styles}/templates/default/tpl_config.php (100%) rename upload/{ => styles}/templates/default/tracker.tpl (100%) rename upload/{ => styles}/templates/default/usercp_bonus.tpl (100%) rename upload/{ => styles}/templates/default/usercp_email.tpl (100%) rename upload/{ => styles}/templates/default/usercp_register.tpl (100%) rename upload/{ => styles}/templates/default/usercp_sendpasswd.tpl (100%) rename upload/{ => styles}/templates/default/usercp_topic_watch.tpl (100%) rename upload/{ => styles}/templates/default/usercp_viewprofile.tpl (100%) rename upload/{ => styles}/templates/default/viewforum.tpl (100%) rename upload/{ => styles}/templates/default/viewtopic.tpl (100%) rename upload/{ => styles}/templates/default/viewtopic_attach.tpl (100%) rename upload/{ => styles}/templates/default/viewtopic_attach_guest.tpl (100%) rename upload/{ => styles}/templates/default/viewtopic_poll.tpl (100%) rename upload/{ => styles}/templates/default/viewtopic_torrent.tpl (100%) rename upload/{ => styles}/templates/posting_tpl.tpl (100%) diff --git a/README.md b/README.md index 5dfdbaf96..876eae050 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ TorrentPier II - движок торрент-трекера, написанны 1. Распаковываем на сервер содержимое папки **upload** 2. Создаем базу данных, в которую при помощи phpmyadmin (или любого другого удобного инструмента) импортируем дамп, расположенный в папке **install/sql/mysql.sql** -3. Правим файл конфигурации **config.php**, загруженный на сервер: +3. Правим файл конфигурации **library/config.php**, загруженный на сервер: > ***'db1' => array('localhost', 'dbase', 'user', 'pass', $charset, $pconnect)*** В данной строке изменяем данные входа в базу данных ***$domain_name = 'torrentpier.me';*** @@ -25,20 +25,20 @@ TorrentPier II - движок торрент-трекера, написанны ## Права доступа на папки и файлы Исходя из настроек вашего сервера, устанавливаем рекомендуемые права доступа (chmod) на указанные папки **777**, а на файлы внутри этих папок (кроме файлов **.htaccess** и **.keep**) **666**: -- ajax/html -- atom -- cache -- cache/filecache -- images -- images/avatars -- images/captcha -- images/ranks -- images/smiles -- log -- old_files -- old_files/thumbs -- sitemap -- triggers +- data/avatars +- data/old_files +- data/torrent_files +- internal_data/ajax_html +- internal_data/atom +- internal_data/cache +- internal_data/cache/filecache +- internal_data/captcha +- internal_data/log +- internal_data/sitemap +- internal_data/triggers +- styles/images +- styles/images/ranks +- styles/images/smiles ## Необходимые настройки php diff --git a/install/sql/mysql.sql b/install/sql/mysql.sql index 2bb84d7d9..65c31c7a3 100644 --- a/install/sql/mysql.sql +++ b/install/sql/mysql.sql @@ -101,7 +101,7 @@ CREATE TABLE IF NOT EXISTS `bb_attachments_config` ( -- Дамп данных таблицы `bb_attachments_config` -- -INSERT INTO `bb_attachments_config` VALUES ('upload_dir', 'old_files'); +INSERT INTO `bb_attachments_config` VALUES ('upload_dir', 'data/old_files'); INSERT INTO `bb_attachments_config` VALUES ('upload_img', 'images/icon_clip.gif'); INSERT INTO `bb_attachments_config` VALUES ('topic_icon', 'images/icon_clip.gif'); INSERT INTO `bb_attachments_config` VALUES ('display_order', '0'); diff --git a/upload/stats/tr_stats.php b/upload/admin/stats/tr_stats.php similarity index 97% rename from upload/stats/tr_stats.php rename to upload/admin/stats/tr_stats.php index 319061eb8..4655acff6 100644 --- a/upload/stats/tr_stats.php +++ b/upload/admin/stats/tr_stats.php @@ -1,7 +1,7 @@ session_start(); diff --git a/upload/stats/tracker.php b/upload/admin/stats/tracker.php similarity index 99% rename from upload/stats/tracker.php rename to upload/admin/stats/tracker.php index f5f8012b2..69d9922d8 100644 --- a/upload/stats/tracker.php +++ b/upload/admin/stats/tracker.php @@ -1,7 +1,7 @@ session_start(); diff --git a/upload/bt/includes/init_tr.php b/upload/bt/includes/init_tr.php index 3fbf8c3ef..f3f1b8298 100644 --- a/upload/bt/includes/init_tr.php +++ b/upload/bt/includes/init_tr.php @@ -453,7 +453,7 @@ class sql_db { if ($trace['file'] !== __FILE__) { - $source = str_replace(BB_PATH . DIRECTORY_SEPARATOR, '', $trace['file']) .'('. $trace['line'] .')'; + $source = str_replace(BB_PATH, '', $trace['file']) .'('. $trace['line'] .')'; break; } } diff --git a/upload/common.php b/upload/common.php index b30bd090d..0062edf4e 100644 --- a/upload/common.php +++ b/upload/common.php @@ -17,7 +17,7 @@ if (!defined('IN_FORUM') && !defined('IN_TRACKER')) define('IN_FORUM', true); header('X-Frame-Options: SAMEORIGIN'); // Get initial config -require(BB_ROOT .'config.php'); +require(BB_ROOT .'library/config.php'); $server_protocol = ($bb_cfg['cookie_secure']) ? 'https://' : 'http://'; $server_port = ($bb_cfg['server_port'] != 80) ? ':'. $bb_cfg['server_port'] : ''; diff --git a/upload/images/avatars/gallery/bot.gif b/upload/data/avatars/gallery/bot.gif similarity index 100% rename from upload/images/avatars/gallery/bot.gif rename to upload/data/avatars/gallery/bot.gif diff --git a/upload/images/avatars/gallery/noavatar.png b/upload/data/avatars/gallery/noavatar.png similarity index 100% rename from upload/images/avatars/gallery/noavatar.png rename to upload/data/avatars/gallery/noavatar.png diff --git a/upload/old_files/.htaccess b/upload/data/old_files/.htaccess similarity index 100% rename from upload/old_files/.htaccess rename to upload/data/old_files/.htaccess diff --git a/upload/old_files/thumbs/.htaccess b/upload/data/torrent_files/.htaccess similarity index 100% rename from upload/old_files/thumbs/.htaccess rename to upload/data/torrent_files/.htaccess diff --git a/upload/ajax/html/jumpbox_guest.html b/upload/internal_data/ajax_html/jumpbox_guest.html similarity index 100% rename from upload/ajax/html/jumpbox_guest.html rename to upload/internal_data/ajax_html/jumpbox_guest.html diff --git a/upload/ajax/html/jumpbox_user.html b/upload/internal_data/ajax_html/jumpbox_user.html similarity index 100% rename from upload/ajax/html/jumpbox_user.html rename to upload/internal_data/ajax_html/jumpbox_user.html diff --git a/upload/atom/.keep b/upload/internal_data/atom/.keep similarity index 100% rename from upload/atom/.keep rename to upload/internal_data/atom/.keep diff --git a/upload/attach_mod/.htaccess b/upload/internal_data/cache/.htaccess similarity index 100% rename from upload/attach_mod/.htaccess rename to upload/internal_data/cache/.htaccess diff --git a/upload/attach_mod/includes/.htaccess b/upload/internal_data/cache/filecache/.htaccess similarity index 100% rename from upload/attach_mod/includes/.htaccess rename to upload/internal_data/cache/filecache/.htaccess diff --git a/upload/images/captcha/.keep b/upload/internal_data/captcha/.keep similarity index 100% rename from upload/images/captcha/.keep rename to upload/internal_data/captcha/.keep diff --git a/upload/cache/.htaccess b/upload/internal_data/log/.htaccess similarity index 100% rename from upload/cache/.htaccess rename to upload/internal_data/log/.htaccess diff --git a/upload/cache/filecache/.htaccess b/upload/internal_data/log/cron/.htaccess similarity index 100% rename from upload/cache/filecache/.htaccess rename to upload/internal_data/log/cron/.htaccess diff --git a/upload/sitemap/.keep b/upload/internal_data/sitemap/.keep similarity index 100% rename from upload/sitemap/.keep rename to upload/internal_data/sitemap/.keep diff --git a/upload/triggers/$on b/upload/internal_data/triggers/$on similarity index 100% rename from upload/triggers/$on rename to upload/internal_data/triggers/$on diff --git a/upload/includes/.htaccess b/upload/internal_data/triggers/.htaccess similarity index 100% rename from upload/includes/.htaccess rename to upload/internal_data/triggers/.htaccess diff --git a/upload/triggers/cron_allowed b/upload/internal_data/triggers/cron_allowed similarity index 100% rename from upload/triggers/cron_allowed rename to upload/internal_data/triggers/cron_allowed diff --git a/upload/ajax/avatar.php b/upload/library/ajax/avatar.php similarity index 100% rename from upload/ajax/avatar.php rename to upload/library/ajax/avatar.php diff --git a/upload/ajax/change_tor_status.php b/upload/library/ajax/change_tor_status.php similarity index 100% rename from upload/ajax/change_tor_status.php rename to upload/library/ajax/change_tor_status.php diff --git a/upload/ajax/change_torrent.php b/upload/library/ajax/change_torrent.php similarity index 100% rename from upload/ajax/change_torrent.php rename to upload/library/ajax/change_torrent.php diff --git a/upload/ajax/change_user_opt.php b/upload/library/ajax/change_user_opt.php similarity index 100% rename from upload/ajax/change_user_opt.php rename to upload/library/ajax/change_user_opt.php diff --git a/upload/ajax/change_user_rank.php b/upload/library/ajax/change_user_rank.php similarity index 100% rename from upload/ajax/change_user_rank.php rename to upload/library/ajax/change_user_rank.php diff --git a/upload/ajax/edit_group_profile.php b/upload/library/ajax/edit_group_profile.php similarity index 100% rename from upload/ajax/edit_group_profile.php rename to upload/library/ajax/edit_group_profile.php diff --git a/upload/ajax/edit_user_profile.php b/upload/library/ajax/edit_user_profile.php similarity index 100% rename from upload/ajax/edit_user_profile.php rename to upload/library/ajax/edit_user_profile.php diff --git a/upload/ajax/gen_passkey.php b/upload/library/ajax/gen_passkey.php similarity index 100% rename from upload/ajax/gen_passkey.php rename to upload/library/ajax/gen_passkey.php diff --git a/upload/ajax/group_membership.php b/upload/library/ajax/group_membership.php similarity index 100% rename from upload/ajax/group_membership.php rename to upload/library/ajax/group_membership.php diff --git a/upload/ajax/index_data.php b/upload/library/ajax/index_data.php similarity index 100% rename from upload/ajax/index_data.php rename to upload/library/ajax/index_data.php diff --git a/upload/ajax/manage_admin.php b/upload/library/ajax/manage_admin.php similarity index 100% rename from upload/ajax/manage_admin.php rename to upload/library/ajax/manage_admin.php diff --git a/upload/ajax/manage_user.php b/upload/library/ajax/manage_user.php similarity index 100% rename from upload/ajax/manage_user.php rename to upload/library/ajax/manage_user.php diff --git a/upload/ajax/mod_action.php b/upload/library/ajax/mod_action.php similarity index 100% rename from upload/ajax/mod_action.php rename to upload/library/ajax/mod_action.php diff --git a/upload/ajax/post_mod_comment.php b/upload/library/ajax/post_mod_comment.php similarity index 100% rename from upload/ajax/post_mod_comment.php rename to upload/library/ajax/post_mod_comment.php diff --git a/upload/ajax/posts.php b/upload/library/ajax/posts.php similarity index 100% rename from upload/ajax/posts.php rename to upload/library/ajax/posts.php diff --git a/upload/ajax/sitemap.php b/upload/library/ajax/sitemap.php similarity index 93% rename from upload/ajax/sitemap.php rename to upload/library/ajax/sitemap.php index 185944a0b..0c2fcea90 100644 --- a/upload/ajax/sitemap.php +++ b/upload/library/ajax/sitemap.php @@ -12,7 +12,7 @@ switch ($mode) { case 'create': $map->create(); - if (@file_exists(BB_ROOT. "/sitemap/sitemap.xml")) + if (@file_exists(SITEMAP_DIR. 'sitemap.xml')) { $html .= $lang['SITEMAP_CREATED'].': '.bb_date(TIMENOW, $bb_cfg['post_date_format']).' '.$lang['SITEMAP_AVAILABLE'].': '.make_url('/sitemap/sitemap.xml').''; } else { @@ -21,12 +21,9 @@ switch ($mode) break; case 'search_update': - if (!@file_exists(BB_ROOT. "/sitemap/sitemap.xml")) - { - $map->create(); - } + if (!@file_exists(SITEMAP_DIR. 'sitemap.xml')) $map->create(); - $map_link = make_url('/sitemap/sitemap.xml'); + $map_link = make_url(SITEMAP_DIR. 'sitemap.xml'); if (strpos($map->send_url("http://google.com/webmasters/sitemaps/ping?sitemap=", $map_link), "successfully added") !== false) { $html .= '
'.$lang['SITEMAP_NOTIFY_SEARCH'].' Google: '.$lang['SITEMAP_SENT'].''; diff --git a/upload/ajax/topic_tpl.php b/upload/library/ajax/topic_tpl.php similarity index 100% rename from upload/ajax/topic_tpl.php rename to upload/library/ajax/topic_tpl.php diff --git a/upload/ajax/user_register.php b/upload/library/ajax/user_register.php similarity index 100% rename from upload/ajax/user_register.php rename to upload/library/ajax/user_register.php diff --git a/upload/ajax/view_post.php b/upload/library/ajax/view_post.php similarity index 100% rename from upload/ajax/view_post.php rename to upload/library/ajax/view_post.php diff --git a/upload/ajax/view_torrent.php b/upload/library/ajax/view_torrent.php similarity index 100% rename from upload/ajax/view_torrent.php rename to upload/library/ajax/view_torrent.php diff --git a/upload/includes/captcha/.htaccess b/upload/library/attach_mod/.htaccess similarity index 100% rename from upload/includes/captcha/.htaccess rename to upload/library/attach_mod/.htaccess diff --git a/upload/attach_mod/attachment_mod.php b/upload/library/attach_mod/attachment_mod.php similarity index 100% rename from upload/attach_mod/attachment_mod.php rename to upload/library/attach_mod/attachment_mod.php diff --git a/upload/attach_mod/displaying.php b/upload/library/attach_mod/displaying.php similarity index 100% rename from upload/attach_mod/displaying.php rename to upload/library/attach_mod/displaying.php diff --git a/upload/attach_mod/displaying_torrent.php b/upload/library/attach_mod/displaying_torrent.php similarity index 100% rename from upload/attach_mod/displaying_torrent.php rename to upload/library/attach_mod/displaying_torrent.php diff --git a/upload/includes/cron/.htaccess b/upload/library/attach_mod/includes/.htaccess similarity index 100% rename from upload/includes/cron/.htaccess rename to upload/library/attach_mod/includes/.htaccess diff --git a/upload/attach_mod/includes/functions_admin.php b/upload/library/attach_mod/includes/functions_admin.php similarity index 100% rename from upload/attach_mod/includes/functions_admin.php rename to upload/library/attach_mod/includes/functions_admin.php diff --git a/upload/attach_mod/includes/functions_attach.php b/upload/library/attach_mod/includes/functions_attach.php similarity index 100% rename from upload/attach_mod/includes/functions_attach.php rename to upload/library/attach_mod/includes/functions_attach.php diff --git a/upload/attach_mod/includes/functions_delete.php b/upload/library/attach_mod/includes/functions_delete.php similarity index 100% rename from upload/attach_mod/includes/functions_delete.php rename to upload/library/attach_mod/includes/functions_delete.php diff --git a/upload/attach_mod/includes/functions_filetypes.php b/upload/library/attach_mod/includes/functions_filetypes.php similarity index 100% rename from upload/attach_mod/includes/functions_filetypes.php rename to upload/library/attach_mod/includes/functions_filetypes.php diff --git a/upload/attach_mod/includes/functions_includes.php b/upload/library/attach_mod/includes/functions_includes.php similarity index 100% rename from upload/attach_mod/includes/functions_includes.php rename to upload/library/attach_mod/includes/functions_includes.php diff --git a/upload/attach_mod/includes/functions_selects.php b/upload/library/attach_mod/includes/functions_selects.php similarity index 100% rename from upload/attach_mod/includes/functions_selects.php rename to upload/library/attach_mod/includes/functions_selects.php diff --git a/upload/attach_mod/includes/functions_thumbs.php b/upload/library/attach_mod/includes/functions_thumbs.php similarity index 100% rename from upload/attach_mod/includes/functions_thumbs.php rename to upload/library/attach_mod/includes/functions_thumbs.php diff --git a/upload/attach_mod/posting_attachments.php b/upload/library/attach_mod/posting_attachments.php similarity index 100% rename from upload/attach_mod/posting_attachments.php rename to upload/library/attach_mod/posting_attachments.php diff --git a/upload/config.php b/upload/library/config.php similarity index 93% rename from upload/config.php rename to upload/library/config.php index bcc03d31e..0f5eb2bac 100644 --- a/upload/config.php +++ b/upload/library/config.php @@ -30,7 +30,6 @@ * Sessions * Registration * Email - * AJAX * Debug * Special users (dbg_users, unlimited_users, super_admins) * LOG @@ -105,7 +104,7 @@ $bb_cfg['db_alias'] = array( // Cache $bb_cfg['cache']['pconnect'] = true; -$bb_cfg['cache']['db_dir'] = realpath(BB_ROOT) .'/cache/filecache/'; +$bb_cfg['cache']['db_dir'] = realpath(BB_ROOT) .'/internal_data/cache/filecache/'; $bb_cfg['cache']['prefix'] = 'tp_'; // Префикс кеша 'tp_2' $bb_cfg['cache']['memcache'] = array( 'host' => '127.0.0.1', @@ -239,18 +238,21 @@ $page_cfg['show_torhelp'] = array( ); // Path (trailing slash '/' at the end: XX_PATH - without, XX_DIR - with) -define('DIR_SEPR', DIRECTORY_SEPARATOR); - -define('BB_PATH', realpath(BB_ROOT) ); // absolute pathname to the forum root -define('ADMIN_DIR', BB_PATH .'/admin/' ); -define('ATTACH_DIR', BB_PATH .'/attach_mod/'); -define('CACHE_DIR', BB_PATH .'/cache/' ); -define('CFG_DIR', BB_PATH .'/config/' ); -define('INC_DIR', BB_PATH .'/includes/' ); -define('LANG_ROOT_DIR', BB_PATH .'/language/' ); -define('LOG_DIR', BB_PATH .'/log/' ); -define('TEMPLATES_DIR', BB_PATH .'/templates/' ); -define('TRIGGERS_DIR', BB_PATH .'/triggers/' ); +define('BB_PATH', realpath(BB_ROOT) ); +define('ADMIN_DIR', BB_PATH .'/admin/' ); +define('DATA_DIR', BB_PATH .'/data/' ); +define('INT_DATA_DIR', BB_PATH .'/internal_data/' ); +define('AJAX_HTML_DIR', BB_ROOT .'/internal_data/ajax_html/'); +define('CACHE_DIR', BB_PATH .'/internal_data/cache/' ); +define('LOG_DIR', BB_PATH .'/internal_data/log/' ); +define('SITEMAP_DIR', BB_PATH .'/internal_data/sitemap/' ); +define('TRIGGERS_DIR', BB_PATH .'/internal_data/triggers/' ); +define('AJAX_DIR', BB_ROOT .'/library/ajax/' ); +define('ATTACH_DIR', BB_PATH .'/library/attach_mod/' ); +define('CFG_DIR', BB_PATH .'/library/config/' ); +define('INC_DIR', BB_PATH .'/library/includes/' ); +define('LANG_ROOT_DIR', BB_PATH .'/library/language/' ); +define('TEMPLATES_DIR', BB_PATH .'/styles/templates/' ); // URL's $bb_cfg['ajax_url'] = 'ajax.php'; # "http://{$_SERVER['SERVER_NAME']}/ajax.php" @@ -361,10 +363,6 @@ $bb_cfg['tech_admin_email'] = 'admin@' . $domain_name; // email for send $bb_cfg['abuse_email'] = 'abuse@' . $domain_name; $bb_cfg['adv_email'] = 'adv@' . $domain_name; -// AJAX -define('AJAX_HTML_DIR', BB_ROOT .'ajax/html/'); -define('AJAX_DIR', BB_ROOT .'ajax/'); - // Debug define('DBG_LOG', false); // enable forum debug (off on production) define('DBG_TRACKER', false); // enable tracker debug (off on production) @@ -505,7 +503,7 @@ $bb_cfg['user_not_active_days_keep'] = 180; // inactive users but only wi $bb_cfg['group_members_per_page'] = 50; // Tidy -$bb_cfg['tidy_post'] = (!extension_loaded('tidy')) ? false : true; +$bb_cfg['tidy_post'] = (!in_array('tidy', get_loaded_extensions())) ? false : true; // Ads $bb_cfg['show_ads'] = false; @@ -553,7 +551,7 @@ $bb_cfg['avatars'] = array( 'max_height' => 100, // высота аватара в px 'max_width' => 100, // ширина аватара в px 'no_avatar' => 'gallery/noavatar.png', // дефолтная аватара - 'upload_path' => BB_ROOT . 'images/avatars/', // путь к директории с аватарами + 'upload_path' => DATA_DIR . 'avatars/', // путь к директории с аватарами 'up_allowed' => true, // разрешить загрузку аватар ); @@ -564,7 +562,7 @@ $bb_cfg['group_avatars'] = array( 'max_height' => 300, // высота аватара в px 'max_width' => 300, // ширина аватара в px 'no_avatar' => 'gallery/noavatar.png', // дефолтная аватара - 'upload_path' => BB_ROOT . 'images/avatars/', // путь к директории с аватарами + 'upload_path' => DATA_DIR . 'avatars/', // путь к директории с аватарами 'up_allowed' => true, // разрешить загрузку аватар ); @@ -608,14 +606,14 @@ $bb_cfg['advert_url'] = 'info.php?show=advert'; $bb_cfg['captcha'] = array( 'disabled' => false, 'secret_key' => 'secret_key', - 'img_url' => './images/captcha/', # with '/' - 'img_path' => BB_PATH .'/images/captcha/', # with '/' + 'img_url' => './internal_data/captcha/', # with '/' + 'img_path' => INT_DATA_DIR .'captcha/', # with '/' ); // Atom feed $bb_cfg['atom'] = array( - 'path' => BB_PATH .'/atom', # without '/' - 'url' => './atom', # without '/' + 'path' => INT_DATA_DIR .'atom', # without '/' + 'url' => './internal_data/atom', # without '/' ); // Nofollow diff --git a/upload/includes/cron/jobs/.htaccess b/upload/library/includes/.htaccess similarity index 100% rename from upload/includes/cron/jobs/.htaccess rename to upload/library/includes/.htaccess diff --git a/upload/includes/api.sphinx.php b/upload/library/includes/api.sphinx.php old mode 100755 new mode 100644 similarity index 100% rename from upload/includes/api.sphinx.php rename to upload/library/includes/api.sphinx.php diff --git a/upload/includes/bbcode.php b/upload/library/includes/bbcode.php similarity index 100% rename from upload/includes/bbcode.php rename to upload/library/includes/bbcode.php diff --git a/upload/includes/datastore/.htaccess b/upload/library/includes/captcha/.htaccess similarity index 100% rename from upload/includes/datastore/.htaccess rename to upload/library/includes/captcha/.htaccess diff --git a/upload/includes/captcha/captcha.php b/upload/library/includes/captcha/captcha.php similarity index 100% rename from upload/includes/captcha/captcha.php rename to upload/library/includes/captcha/captcha.php diff --git a/upload/includes/captcha/kcaptcha/fonts/antiqua.png b/upload/library/includes/captcha/kcaptcha/fonts/antiqua.png similarity index 100% rename from upload/includes/captcha/kcaptcha/fonts/antiqua.png rename to upload/library/includes/captcha/kcaptcha/fonts/antiqua.png diff --git a/upload/includes/captcha/kcaptcha/fonts/baskerville.png b/upload/library/includes/captcha/kcaptcha/fonts/baskerville.png similarity index 100% rename from upload/includes/captcha/kcaptcha/fonts/baskerville.png rename to upload/library/includes/captcha/kcaptcha/fonts/baskerville.png diff --git a/upload/includes/captcha/kcaptcha/fonts/batang.png b/upload/library/includes/captcha/kcaptcha/fonts/batang.png similarity index 100% rename from upload/includes/captcha/kcaptcha/fonts/batang.png rename to upload/library/includes/captcha/kcaptcha/fonts/batang.png diff --git a/upload/includes/captcha/kcaptcha/fonts/bookman.png b/upload/library/includes/captcha/kcaptcha/fonts/bookman.png similarity index 100% rename from upload/includes/captcha/kcaptcha/fonts/bookman.png rename to upload/library/includes/captcha/kcaptcha/fonts/bookman.png diff --git a/upload/includes/captcha/kcaptcha/fonts/calisto.png b/upload/library/includes/captcha/kcaptcha/fonts/calisto.png similarity index 100% rename from upload/includes/captcha/kcaptcha/fonts/calisto.png rename to upload/library/includes/captcha/kcaptcha/fonts/calisto.png diff --git a/upload/includes/captcha/kcaptcha/fonts/cambria.png b/upload/library/includes/captcha/kcaptcha/fonts/cambria.png similarity index 100% rename from upload/includes/captcha/kcaptcha/fonts/cambria.png rename to upload/library/includes/captcha/kcaptcha/fonts/cambria.png diff --git a/upload/includes/captcha/kcaptcha/fonts/centaur.png b/upload/library/includes/captcha/kcaptcha/fonts/centaur.png similarity index 100% rename from upload/includes/captcha/kcaptcha/fonts/centaur.png rename to upload/library/includes/captcha/kcaptcha/fonts/centaur.png diff --git a/upload/includes/captcha/kcaptcha/fonts/century.png b/upload/library/includes/captcha/kcaptcha/fonts/century.png similarity index 100% rename from upload/includes/captcha/kcaptcha/fonts/century.png rename to upload/library/includes/captcha/kcaptcha/fonts/century.png diff --git a/upload/includes/captcha/kcaptcha/fonts/chaparral.png b/upload/library/includes/captcha/kcaptcha/fonts/chaparral.png similarity index 100% rename from upload/includes/captcha/kcaptcha/fonts/chaparral.png rename to upload/library/includes/captcha/kcaptcha/fonts/chaparral.png diff --git a/upload/includes/captcha/kcaptcha/fonts/constantia.png b/upload/library/includes/captcha/kcaptcha/fonts/constantia.png similarity index 100% rename from upload/includes/captcha/kcaptcha/fonts/constantia.png rename to upload/library/includes/captcha/kcaptcha/fonts/constantia.png diff --git a/upload/includes/captcha/kcaptcha/fonts/footlight.png b/upload/library/includes/captcha/kcaptcha/fonts/footlight.png similarity index 100% rename from upload/includes/captcha/kcaptcha/fonts/footlight.png rename to upload/library/includes/captcha/kcaptcha/fonts/footlight.png diff --git a/upload/includes/captcha/kcaptcha/fonts/garamond.png b/upload/library/includes/captcha/kcaptcha/fonts/garamond.png similarity index 100% rename from upload/includes/captcha/kcaptcha/fonts/garamond.png rename to upload/library/includes/captcha/kcaptcha/fonts/garamond.png diff --git a/upload/includes/captcha/kcaptcha/fonts/georgia.png b/upload/library/includes/captcha/kcaptcha/fonts/georgia.png similarity index 100% rename from upload/includes/captcha/kcaptcha/fonts/georgia.png rename to upload/library/includes/captcha/kcaptcha/fonts/georgia.png diff --git a/upload/includes/captcha/kcaptcha/fonts/goudy_old.png b/upload/library/includes/captcha/kcaptcha/fonts/goudy_old.png similarity index 100% rename from upload/includes/captcha/kcaptcha/fonts/goudy_old.png rename to upload/library/includes/captcha/kcaptcha/fonts/goudy_old.png diff --git a/upload/includes/captcha/kcaptcha/fonts/kozuka.png b/upload/library/includes/captcha/kcaptcha/fonts/kozuka.png similarity index 100% rename from upload/includes/captcha/kcaptcha/fonts/kozuka.png rename to upload/library/includes/captcha/kcaptcha/fonts/kozuka.png diff --git a/upload/includes/captcha/kcaptcha/fonts/lucida.png b/upload/library/includes/captcha/kcaptcha/fonts/lucida.png similarity index 100% rename from upload/includes/captcha/kcaptcha/fonts/lucida.png rename to upload/library/includes/captcha/kcaptcha/fonts/lucida.png diff --git a/upload/includes/captcha/kcaptcha/fonts/minion.png b/upload/library/includes/captcha/kcaptcha/fonts/minion.png similarity index 100% rename from upload/includes/captcha/kcaptcha/fonts/minion.png rename to upload/library/includes/captcha/kcaptcha/fonts/minion.png diff --git a/upload/includes/captcha/kcaptcha/fonts/palatino.png b/upload/library/includes/captcha/kcaptcha/fonts/palatino.png similarity index 100% rename from upload/includes/captcha/kcaptcha/fonts/palatino.png rename to upload/library/includes/captcha/kcaptcha/fonts/palatino.png diff --git a/upload/includes/captcha/kcaptcha/fonts/perpetua.png b/upload/library/includes/captcha/kcaptcha/fonts/perpetua.png similarity index 100% rename from upload/includes/captcha/kcaptcha/fonts/perpetua.png rename to upload/library/includes/captcha/kcaptcha/fonts/perpetua.png diff --git a/upload/includes/captcha/kcaptcha/fonts/rockwell.png b/upload/library/includes/captcha/kcaptcha/fonts/rockwell.png similarity index 100% rename from upload/includes/captcha/kcaptcha/fonts/rockwell.png rename to upload/library/includes/captcha/kcaptcha/fonts/rockwell.png diff --git a/upload/includes/captcha/kcaptcha/fonts/times.png b/upload/library/includes/captcha/kcaptcha/fonts/times.png similarity index 100% rename from upload/includes/captcha/kcaptcha/fonts/times.png rename to upload/library/includes/captcha/kcaptcha/fonts/times.png diff --git a/upload/includes/captcha/kcaptcha/fonts/warnock.png b/upload/library/includes/captcha/kcaptcha/fonts/warnock.png similarity index 100% rename from upload/includes/captcha/kcaptcha/fonts/warnock.png rename to upload/library/includes/captcha/kcaptcha/fonts/warnock.png diff --git a/upload/includes/class.correct.php b/upload/library/includes/class.correct.php similarity index 100% rename from upload/includes/class.correct.php rename to upload/library/includes/class.correct.php diff --git a/upload/includes/class.reflection.php b/upload/library/includes/class.reflection.php similarity index 100% rename from upload/includes/class.reflection.php rename to upload/library/includes/class.reflection.php diff --git a/upload/includes/class.sitemap.php b/upload/library/includes/class.sitemap.php similarity index 92% rename from upload/includes/class.sitemap.php rename to upload/library/includes/class.sitemap.php index 8e39a2e28..9d70eab3e 100644 --- a/upload/includes/class.sitemap.php +++ b/upload/library/includes/class.sitemap.php @@ -181,33 +181,33 @@ class sitemap $pages_count = @ceil($row['count'] / 40000); $sitemap = $this->build_index($pages_count); - $handler = fopen(BB_ROOT. "/sitemap/sitemap.xml", "wb+"); + $handler = fopen(SITEMAP_DIR. "sitemap.xml", "wb+"); fwrite($handler, $sitemap); fclose($handler); - @chmod(BB_ROOT. "/sitemap/sitemap.xml", 0666); + @chmod(SITEMAP_DIR. "sitemap.xml", 0666); $sitemap = $this->build_stat(); - $handler = fopen(BB_ROOT. "/sitemap/sitemap1.xml", "wb+"); + $handler = fopen(SITEMAP_DIR. "sitemap1.xml", "wb+"); fwrite($handler, $sitemap); fclose($handler); - @chmod(BB_ROOT. "/sitemap/sitemap.xml", 0666); + @chmod(SITEMAP_DIR. "sitemap.xml", 0666); for ($i = 0; $i < $pages_count; $i++) { $t = $i + 2; $n = $i + 1; $sitemap = $this->build_map_topic($n); - $handler = fopen(BB_ROOT. "/sitemap/sitemap{$t}.xml", "wb+"); + $handler = fopen(SITEMAP_DIR. "sitemap{$t}.xml", "wb+"); fwrite($handler, $sitemap); fclose($handler); - @chmod(BB_ROOT. "/sitemap/sitemap{$t}.xml", 0666); + @chmod(SITEMAP_DIR. "sitemap{$t}.xml", 0666); } } else { $sitemap = $this->build_map(); - $handler = fopen(BB_ROOT. "/sitemap/sitemap.xml", "wb+"); + $handler = fopen(SITEMAP_DIR. "sitemap.xml", "wb+"); fwrite($handler, $sitemap); fclose($handler); - @chmod(BB_ROOT. "/sitemap/sitemap.xml", 0666); + @chmod(SITEMAP_DIR. "sitemap.xml", 0666); } $params['sitemap_time'] = TIMENOW; diff --git a/upload/includes/class.utf8.php b/upload/library/includes/class.utf8.php similarity index 100% rename from upload/includes/class.utf8.php rename to upload/library/includes/class.utf8.php diff --git a/upload/includes/db/.htaccess b/upload/library/includes/cron/.htaccess similarity index 100% rename from upload/includes/db/.htaccess rename to upload/library/includes/cron/.htaccess diff --git a/upload/includes/cron/cron_check.php b/upload/library/includes/cron/cron_check.php similarity index 100% rename from upload/includes/cron/cron_check.php rename to upload/library/includes/cron/cron_check.php diff --git a/upload/includes/cron/cron_init.php b/upload/library/includes/cron/cron_init.php similarity index 100% rename from upload/includes/cron/cron_init.php rename to upload/library/includes/cron/cron_init.php diff --git a/upload/includes/cron/cron_run.php b/upload/library/includes/cron/cron_run.php similarity index 100% rename from upload/includes/cron/cron_run.php rename to upload/library/includes/cron/cron_run.php diff --git a/upload/includes/ucp/.htaccess b/upload/library/includes/cron/jobs/.htaccess similarity index 100% rename from upload/includes/ucp/.htaccess rename to upload/library/includes/cron/jobs/.htaccess diff --git a/upload/includes/cron/jobs/attach_maintenance.php b/upload/library/includes/cron/jobs/attach_maintenance.php similarity index 100% rename from upload/includes/cron/jobs/attach_maintenance.php rename to upload/library/includes/cron/jobs/attach_maintenance.php diff --git a/upload/includes/cron/jobs/bb_maintenance.php b/upload/library/includes/cron/jobs/bb_maintenance.php similarity index 100% rename from upload/includes/cron/jobs/bb_maintenance.php rename to upload/library/includes/cron/jobs/bb_maintenance.php diff --git a/upload/includes/cron/jobs/cache_gc.php b/upload/library/includes/cron/jobs/cache_gc.php similarity index 100% rename from upload/includes/cron/jobs/cache_gc.php rename to upload/library/includes/cron/jobs/cache_gc.php diff --git a/upload/includes/cron/jobs/captcha_gen_gc.php b/upload/library/includes/cron/jobs/captcha_gen_gc.php similarity index 100% rename from upload/includes/cron/jobs/captcha_gen_gc.php rename to upload/library/includes/cron/jobs/captcha_gen_gc.php diff --git a/upload/includes/cron/jobs/clean_dlstat.php b/upload/library/includes/cron/jobs/clean_dlstat.php similarity index 100% rename from upload/includes/cron/jobs/clean_dlstat.php rename to upload/library/includes/cron/jobs/clean_dlstat.php diff --git a/upload/includes/cron/jobs/clean_log.php b/upload/library/includes/cron/jobs/clean_log.php similarity index 100% rename from upload/includes/cron/jobs/clean_log.php rename to upload/library/includes/cron/jobs/clean_log.php diff --git a/upload/includes/cron/jobs/clean_search_results.php b/upload/library/includes/cron/jobs/clean_search_results.php similarity index 100% rename from upload/includes/cron/jobs/clean_search_results.php rename to upload/library/includes/cron/jobs/clean_search_results.php diff --git a/upload/includes/cron/jobs/ds_update_cat_forums.php b/upload/library/includes/cron/jobs/ds_update_cat_forums.php similarity index 100% rename from upload/includes/cron/jobs/ds_update_cat_forums.php rename to upload/library/includes/cron/jobs/ds_update_cat_forums.php diff --git a/upload/includes/cron/jobs/ds_update_stats.php b/upload/library/includes/cron/jobs/ds_update_stats.php similarity index 100% rename from upload/includes/cron/jobs/ds_update_stats.php rename to upload/library/includes/cron/jobs/ds_update_stats.php diff --git a/upload/includes/cron/jobs/flash_topic_view.php b/upload/library/includes/cron/jobs/flash_topic_view.php similarity index 100% rename from upload/includes/cron/jobs/flash_topic_view.php rename to upload/library/includes/cron/jobs/flash_topic_view.php diff --git a/upload/includes/cron/jobs/prune_forums.php b/upload/library/includes/cron/jobs/prune_forums.php similarity index 100% rename from upload/includes/cron/jobs/prune_forums.php rename to upload/library/includes/cron/jobs/prune_forums.php diff --git a/upload/includes/cron/jobs/prune_inactive_users.php b/upload/library/includes/cron/jobs/prune_inactive_users.php similarity index 100% rename from upload/includes/cron/jobs/prune_inactive_users.php rename to upload/library/includes/cron/jobs/prune_inactive_users.php diff --git a/upload/includes/cron/jobs/prune_topic_moved.php b/upload/library/includes/cron/jobs/prune_topic_moved.php similarity index 100% rename from upload/includes/cron/jobs/prune_topic_moved.php rename to upload/library/includes/cron/jobs/prune_topic_moved.php diff --git a/upload/includes/cron/jobs/sessions_cleanup.php b/upload/library/includes/cron/jobs/sessions_cleanup.php similarity index 100% rename from upload/includes/cron/jobs/sessions_cleanup.php rename to upload/library/includes/cron/jobs/sessions_cleanup.php diff --git a/upload/includes/cron/jobs/sitemap.php b/upload/library/includes/cron/jobs/sitemap.php similarity index 100% rename from upload/includes/cron/jobs/sitemap.php rename to upload/library/includes/cron/jobs/sitemap.php diff --git a/upload/includes/cron/jobs/tr_cleanup_and_dlstat.php b/upload/library/includes/cron/jobs/tr_cleanup_and_dlstat.php similarity index 100% rename from upload/includes/cron/jobs/tr_cleanup_and_dlstat.php rename to upload/library/includes/cron/jobs/tr_cleanup_and_dlstat.php diff --git a/upload/includes/cron/jobs/tr_complete_count.php b/upload/library/includes/cron/jobs/tr_complete_count.php similarity index 100% rename from upload/includes/cron/jobs/tr_complete_count.php rename to upload/library/includes/cron/jobs/tr_complete_count.php diff --git a/upload/includes/cron/jobs/tr_maintenance.php b/upload/library/includes/cron/jobs/tr_maintenance.php similarity index 100% rename from upload/includes/cron/jobs/tr_maintenance.php rename to upload/library/includes/cron/jobs/tr_maintenance.php diff --git a/upload/includes/cron/jobs/tr_make_snapshot.php b/upload/library/includes/cron/jobs/tr_make_snapshot.php similarity index 100% rename from upload/includes/cron/jobs/tr_make_snapshot.php rename to upload/library/includes/cron/jobs/tr_make_snapshot.php diff --git a/upload/includes/cron/jobs/tr_update_seeder_last_seen.php b/upload/library/includes/cron/jobs/tr_update_seeder_last_seen.php similarity index 100% rename from upload/includes/cron/jobs/tr_update_seeder_last_seen.php rename to upload/library/includes/cron/jobs/tr_update_seeder_last_seen.php diff --git a/upload/includes/cron/jobs/update_forums_atom.php b/upload/library/includes/cron/jobs/update_forums_atom.php similarity index 100% rename from upload/includes/cron/jobs/update_forums_atom.php rename to upload/library/includes/cron/jobs/update_forums_atom.php diff --git a/upload/language/.htaccess b/upload/library/includes/datastore/.htaccess similarity index 100% rename from upload/language/.htaccess rename to upload/library/includes/datastore/.htaccess diff --git a/upload/includes/datastore/build_attach_extensions.php b/upload/library/includes/datastore/build_attach_extensions.php similarity index 100% rename from upload/includes/datastore/build_attach_extensions.php rename to upload/library/includes/datastore/build_attach_extensions.php diff --git a/upload/includes/datastore/build_cat_forums.php b/upload/library/includes/datastore/build_cat_forums.php similarity index 100% rename from upload/includes/datastore/build_cat_forums.php rename to upload/library/includes/datastore/build_cat_forums.php diff --git a/upload/includes/datastore/build_moderators.php b/upload/library/includes/datastore/build_moderators.php similarity index 100% rename from upload/includes/datastore/build_moderators.php rename to upload/library/includes/datastore/build_moderators.php diff --git a/upload/includes/datastore/build_ranks.php b/upload/library/includes/datastore/build_ranks.php similarity index 100% rename from upload/includes/datastore/build_ranks.php rename to upload/library/includes/datastore/build_ranks.php diff --git a/upload/includes/datastore/build_smilies.php b/upload/library/includes/datastore/build_smilies.php similarity index 100% rename from upload/includes/datastore/build_smilies.php rename to upload/library/includes/datastore/build_smilies.php diff --git a/upload/includes/datastore/build_stats.php b/upload/library/includes/datastore/build_stats.php similarity index 100% rename from upload/includes/datastore/build_stats.php rename to upload/library/includes/datastore/build_stats.php diff --git a/upload/language/en/.htaccess b/upload/library/includes/db/.htaccess similarity index 100% rename from upload/language/en/.htaccess rename to upload/library/includes/db/.htaccess diff --git a/upload/includes/db/mysql.php b/upload/library/includes/db/mysql.php similarity index 100% rename from upload/includes/db/mysql.php rename to upload/library/includes/db/mysql.php diff --git a/upload/includes/emailer.class.php b/upload/library/includes/emailer.class.php similarity index 100% rename from upload/includes/emailer.class.php rename to upload/library/includes/emailer.class.php diff --git a/upload/includes/functions.php b/upload/library/includes/functions.php similarity index 100% rename from upload/includes/functions.php rename to upload/library/includes/functions.php diff --git a/upload/includes/functions_admin.php b/upload/library/includes/functions_admin.php similarity index 100% rename from upload/includes/functions_admin.php rename to upload/library/includes/functions_admin.php diff --git a/upload/includes/functions_admin_cron.php b/upload/library/includes/functions_admin_cron.php similarity index 100% rename from upload/includes/functions_admin_cron.php rename to upload/library/includes/functions_admin_cron.php diff --git a/upload/includes/functions_admin_torrent.php b/upload/library/includes/functions_admin_torrent.php similarity index 100% rename from upload/includes/functions_admin_torrent.php rename to upload/library/includes/functions_admin_torrent.php diff --git a/upload/includes/functions_atom.php b/upload/library/includes/functions_atom.php similarity index 100% rename from upload/includes/functions_atom.php rename to upload/library/includes/functions_atom.php diff --git a/upload/includes/functions_dev.php b/upload/library/includes/functions_dev.php similarity index 100% rename from upload/includes/functions_dev.php rename to upload/library/includes/functions_dev.php diff --git a/upload/includes/functions_group.php b/upload/library/includes/functions_group.php similarity index 100% rename from upload/includes/functions_group.php rename to upload/library/includes/functions_group.php diff --git a/upload/includes/functions_post.php b/upload/library/includes/functions_post.php similarity index 100% rename from upload/includes/functions_post.php rename to upload/library/includes/functions_post.php diff --git a/upload/includes/functions_selects.php b/upload/library/includes/functions_selects.php similarity index 100% rename from upload/includes/functions_selects.php rename to upload/library/includes/functions_selects.php diff --git a/upload/includes/functions_torrent.php b/upload/library/includes/functions_torrent.php similarity index 100% rename from upload/includes/functions_torrent.php rename to upload/library/includes/functions_torrent.php diff --git a/upload/includes/functions_upload.php b/upload/library/includes/functions_upload.php similarity index 100% rename from upload/includes/functions_upload.php rename to upload/library/includes/functions_upload.php diff --git a/upload/includes/functions_validate.php b/upload/library/includes/functions_validate.php similarity index 100% rename from upload/includes/functions_validate.php rename to upload/library/includes/functions_validate.php diff --git a/upload/includes/init_bb.php b/upload/library/includes/init_bb.php similarity index 100% rename from upload/includes/init_bb.php rename to upload/library/includes/init_bb.php diff --git a/upload/includes/online_userlist.php b/upload/library/includes/online_userlist.php similarity index 100% rename from upload/includes/online_userlist.php rename to upload/library/includes/online_userlist.php diff --git a/upload/includes/page_footer.php b/upload/library/includes/page_footer.php similarity index 100% rename from upload/includes/page_footer.php rename to upload/library/includes/page_footer.php diff --git a/upload/includes/page_footer_dev.php b/upload/library/includes/page_footer_dev.php similarity index 100% rename from upload/includes/page_footer_dev.php rename to upload/library/includes/page_footer_dev.php diff --git a/upload/includes/page_header.php b/upload/library/includes/page_header.php similarity index 100% rename from upload/includes/page_header.php rename to upload/library/includes/page_header.php diff --git a/upload/includes/posting_tpl.php b/upload/library/includes/posting_tpl.php similarity index 100% rename from upload/includes/posting_tpl.php rename to upload/library/includes/posting_tpl.php diff --git a/upload/includes/sessions.php b/upload/library/includes/sessions.php similarity index 100% rename from upload/includes/sessions.php rename to upload/library/includes/sessions.php diff --git a/upload/includes/smtp.php b/upload/library/includes/smtp.php similarity index 100% rename from upload/includes/smtp.php rename to upload/library/includes/smtp.php diff --git a/upload/includes/sql_parse.php b/upload/library/includes/sql_parse.php similarity index 100% rename from upload/includes/sql_parse.php rename to upload/library/includes/sql_parse.php diff --git a/upload/includes/template.php b/upload/library/includes/template.php similarity index 100% rename from upload/includes/template.php rename to upload/library/includes/template.php diff --git a/upload/includes/torrent_announce_urls.php b/upload/library/includes/torrent_announce_urls.php similarity index 100% rename from upload/includes/torrent_announce_urls.php rename to upload/library/includes/torrent_announce_urls.php diff --git a/upload/includes/torrent_show_dl_list.php b/upload/library/includes/torrent_show_dl_list.php similarity index 100% rename from upload/includes/torrent_show_dl_list.php rename to upload/library/includes/torrent_show_dl_list.php diff --git a/upload/language/en/email/.htaccess b/upload/library/includes/ucp/.htaccess similarity index 100% rename from upload/language/en/email/.htaccess rename to upload/library/includes/ucp/.htaccess diff --git a/upload/includes/ucp/activate.php b/upload/library/includes/ucp/activate.php similarity index 100% rename from upload/includes/ucp/activate.php rename to upload/library/includes/ucp/activate.php diff --git a/upload/includes/ucp/bonus.php b/upload/library/includes/ucp/bonus.php similarity index 100% rename from upload/includes/ucp/bonus.php rename to upload/library/includes/ucp/bonus.php diff --git a/upload/includes/ucp/email.php b/upload/library/includes/ucp/email.php similarity index 100% rename from upload/includes/ucp/email.php rename to upload/library/includes/ucp/email.php diff --git a/upload/includes/ucp/register.php b/upload/library/includes/ucp/register.php similarity index 100% rename from upload/includes/ucp/register.php rename to upload/library/includes/ucp/register.php diff --git a/upload/includes/ucp/sendpasswd.php b/upload/library/includes/ucp/sendpasswd.php similarity index 100% rename from upload/includes/ucp/sendpasswd.php rename to upload/library/includes/ucp/sendpasswd.php diff --git a/upload/includes/ucp/topic_watch.php b/upload/library/includes/ucp/topic_watch.php similarity index 100% rename from upload/includes/ucp/topic_watch.php rename to upload/library/includes/ucp/topic_watch.php diff --git a/upload/includes/ucp/viewprofile.php b/upload/library/includes/ucp/viewprofile.php similarity index 100% rename from upload/includes/ucp/viewprofile.php rename to upload/library/includes/ucp/viewprofile.php diff --git a/upload/includes/ucp/viewtorrent.php b/upload/library/includes/ucp/viewtorrent.php similarity index 100% rename from upload/includes/ucp/viewtorrent.php rename to upload/library/includes/ucp/viewtorrent.php diff --git a/upload/language/en/html/.htaccess b/upload/library/language/.htaccess similarity index 100% rename from upload/language/en/html/.htaccess rename to upload/library/language/.htaccess diff --git a/upload/language/ru/.htaccess b/upload/library/language/en/.htaccess similarity index 100% rename from upload/language/ru/.htaccess rename to upload/library/language/en/.htaccess diff --git a/upload/language/ru/email/.htaccess b/upload/library/language/en/email/.htaccess similarity index 100% rename from upload/language/ru/email/.htaccess rename to upload/library/language/en/email/.htaccess diff --git a/upload/language/en/email/admin_send_email.tpl b/upload/library/language/en/email/admin_send_email.tpl similarity index 100% rename from upload/language/en/email/admin_send_email.tpl rename to upload/library/language/en/email/admin_send_email.tpl diff --git a/upload/language/en/email/blank.tpl b/upload/library/language/en/email/blank.tpl similarity index 100% rename from upload/language/en/email/blank.tpl rename to upload/library/language/en/email/blank.tpl diff --git a/upload/language/en/email/group_added.tpl b/upload/library/language/en/email/group_added.tpl similarity index 100% rename from upload/language/en/email/group_added.tpl rename to upload/library/language/en/email/group_added.tpl diff --git a/upload/language/en/email/group_approved.tpl b/upload/library/language/en/email/group_approved.tpl similarity index 100% rename from upload/language/en/email/group_approved.tpl rename to upload/library/language/en/email/group_approved.tpl diff --git a/upload/language/en/email/group_request.tpl b/upload/library/language/en/email/group_request.tpl similarity index 100% rename from upload/language/en/email/group_request.tpl rename to upload/library/language/en/email/group_request.tpl diff --git a/upload/language/en/email/privmsg_notify.tpl b/upload/library/language/en/email/privmsg_notify.tpl similarity index 100% rename from upload/language/en/email/privmsg_notify.tpl rename to upload/library/language/en/email/privmsg_notify.tpl diff --git a/upload/language/en/email/profile_send_email.tpl b/upload/library/language/en/email/profile_send_email.tpl similarity index 100% rename from upload/language/en/email/profile_send_email.tpl rename to upload/library/language/en/email/profile_send_email.tpl diff --git a/upload/language/en/email/topic_notify.tpl b/upload/library/language/en/email/topic_notify.tpl similarity index 100% rename from upload/language/en/email/topic_notify.tpl rename to upload/library/language/en/email/topic_notify.tpl diff --git a/upload/language/en/email/user_activate.tpl b/upload/library/language/en/email/user_activate.tpl similarity index 100% rename from upload/language/en/email/user_activate.tpl rename to upload/library/language/en/email/user_activate.tpl diff --git a/upload/language/en/email/user_activate_passwd.tpl b/upload/library/language/en/email/user_activate_passwd.tpl similarity index 100% rename from upload/language/en/email/user_activate_passwd.tpl rename to upload/library/language/en/email/user_activate_passwd.tpl diff --git a/upload/language/en/email/user_welcome.tpl b/upload/library/language/en/email/user_welcome.tpl similarity index 100% rename from upload/language/en/email/user_welcome.tpl rename to upload/library/language/en/email/user_welcome.tpl diff --git a/upload/language/en/email/user_welcome_inactive.tpl b/upload/library/language/en/email/user_welcome_inactive.tpl similarity index 100% rename from upload/language/en/email/user_welcome_inactive.tpl rename to upload/library/language/en/email/user_welcome_inactive.tpl diff --git a/upload/language/ru/html/.htaccess b/upload/library/language/en/html/.htaccess similarity index 100% rename from upload/language/ru/html/.htaccess rename to upload/library/language/en/html/.htaccess diff --git a/upload/language/en/html/advert.html b/upload/library/language/en/html/advert.html similarity index 100% rename from upload/language/en/html/advert.html rename to upload/library/language/en/html/advert.html diff --git a/upload/language/en/html/copyright_holders.html b/upload/library/language/en/html/copyright_holders.html similarity index 100% rename from upload/language/en/html/copyright_holders.html rename to upload/library/language/en/html/copyright_holders.html diff --git a/upload/language/en/html/not_found.html b/upload/library/language/en/html/not_found.html similarity index 100% rename from upload/language/en/html/not_found.html rename to upload/library/language/en/html/not_found.html diff --git a/upload/language/en/html/sidebar1.html b/upload/library/language/en/html/sidebar1.html similarity index 100% rename from upload/language/en/html/sidebar1.html rename to upload/library/language/en/html/sidebar1.html diff --git a/upload/language/en/html/sidebar2.html b/upload/library/language/en/html/sidebar2.html similarity index 100% rename from upload/language/en/html/sidebar2.html rename to upload/library/language/en/html/sidebar2.html diff --git a/upload/language/en/html/user_agreement.html b/upload/library/language/en/html/user_agreement.html similarity index 100% rename from upload/language/en/html/user_agreement.html rename to upload/library/language/en/html/user_agreement.html diff --git a/upload/language/en/main.php b/upload/library/language/en/main.php similarity index 100% rename from upload/language/en/main.php rename to upload/library/language/en/main.php diff --git a/upload/language/en/search_stopwords.txt b/upload/library/language/en/search_stopwords.txt similarity index 100% rename from upload/language/en/search_stopwords.txt rename to upload/library/language/en/search_stopwords.txt diff --git a/upload/language/en/search_synonyms.txt b/upload/library/language/en/search_synonyms.txt similarity index 100% rename from upload/language/en/search_synonyms.txt rename to upload/library/language/en/search_synonyms.txt diff --git a/upload/language/en/translit_table.php b/upload/library/language/en/translit_table.php similarity index 100% rename from upload/language/en/translit_table.php rename to upload/library/language/en/translit_table.php diff --git a/upload/language/uk/.htaccess b/upload/library/language/ru/.htaccess similarity index 100% rename from upload/language/uk/.htaccess rename to upload/library/language/ru/.htaccess diff --git a/upload/language/uk/email/.htaccess b/upload/library/language/ru/email/.htaccess similarity index 100% rename from upload/language/uk/email/.htaccess rename to upload/library/language/ru/email/.htaccess diff --git a/upload/language/ru/email/admin_send_email.tpl b/upload/library/language/ru/email/admin_send_email.tpl similarity index 100% rename from upload/language/ru/email/admin_send_email.tpl rename to upload/library/language/ru/email/admin_send_email.tpl diff --git a/upload/language/ru/email/blank.tpl b/upload/library/language/ru/email/blank.tpl similarity index 100% rename from upload/language/ru/email/blank.tpl rename to upload/library/language/ru/email/blank.tpl diff --git a/upload/language/ru/email/group_added.tpl b/upload/library/language/ru/email/group_added.tpl similarity index 100% rename from upload/language/ru/email/group_added.tpl rename to upload/library/language/ru/email/group_added.tpl diff --git a/upload/language/ru/email/group_approved.tpl b/upload/library/language/ru/email/group_approved.tpl similarity index 100% rename from upload/language/ru/email/group_approved.tpl rename to upload/library/language/ru/email/group_approved.tpl diff --git a/upload/language/ru/email/group_request.tpl b/upload/library/language/ru/email/group_request.tpl similarity index 100% rename from upload/language/ru/email/group_request.tpl rename to upload/library/language/ru/email/group_request.tpl diff --git a/upload/language/ru/email/privmsg_notify.tpl b/upload/library/language/ru/email/privmsg_notify.tpl similarity index 100% rename from upload/language/ru/email/privmsg_notify.tpl rename to upload/library/language/ru/email/privmsg_notify.tpl diff --git a/upload/language/ru/email/profile_send_email.tpl b/upload/library/language/ru/email/profile_send_email.tpl similarity index 100% rename from upload/language/ru/email/profile_send_email.tpl rename to upload/library/language/ru/email/profile_send_email.tpl diff --git a/upload/language/ru/email/topic_notify.tpl b/upload/library/language/ru/email/topic_notify.tpl similarity index 100% rename from upload/language/ru/email/topic_notify.tpl rename to upload/library/language/ru/email/topic_notify.tpl diff --git a/upload/language/ru/email/user_activate.tpl b/upload/library/language/ru/email/user_activate.tpl similarity index 100% rename from upload/language/ru/email/user_activate.tpl rename to upload/library/language/ru/email/user_activate.tpl diff --git a/upload/language/ru/email/user_activate_passwd.tpl b/upload/library/language/ru/email/user_activate_passwd.tpl similarity index 100% rename from upload/language/ru/email/user_activate_passwd.tpl rename to upload/library/language/ru/email/user_activate_passwd.tpl diff --git a/upload/language/ru/email/user_welcome.tpl b/upload/library/language/ru/email/user_welcome.tpl similarity index 100% rename from upload/language/ru/email/user_welcome.tpl rename to upload/library/language/ru/email/user_welcome.tpl diff --git a/upload/language/ru/email/user_welcome_inactive.tpl b/upload/library/language/ru/email/user_welcome_inactive.tpl similarity index 100% rename from upload/language/ru/email/user_welcome_inactive.tpl rename to upload/library/language/ru/email/user_welcome_inactive.tpl diff --git a/upload/language/uk/html/.htaccess b/upload/library/language/ru/html/.htaccess similarity index 100% rename from upload/language/uk/html/.htaccess rename to upload/library/language/ru/html/.htaccess diff --git a/upload/language/ru/html/advert.html b/upload/library/language/ru/html/advert.html similarity index 100% rename from upload/language/ru/html/advert.html rename to upload/library/language/ru/html/advert.html diff --git a/upload/language/ru/html/copyright_holders.html b/upload/library/language/ru/html/copyright_holders.html similarity index 100% rename from upload/language/ru/html/copyright_holders.html rename to upload/library/language/ru/html/copyright_holders.html diff --git a/upload/language/ru/html/not_found.html b/upload/library/language/ru/html/not_found.html similarity index 100% rename from upload/language/ru/html/not_found.html rename to upload/library/language/ru/html/not_found.html diff --git a/upload/language/ru/html/sidebar1.html b/upload/library/language/ru/html/sidebar1.html similarity index 100% rename from upload/language/ru/html/sidebar1.html rename to upload/library/language/ru/html/sidebar1.html diff --git a/upload/language/ru/html/sidebar2.html b/upload/library/language/ru/html/sidebar2.html similarity index 100% rename from upload/language/ru/html/sidebar2.html rename to upload/library/language/ru/html/sidebar2.html diff --git a/upload/language/ru/html/user_agreement.html b/upload/library/language/ru/html/user_agreement.html similarity index 100% rename from upload/language/ru/html/user_agreement.html rename to upload/library/language/ru/html/user_agreement.html diff --git a/upload/language/ru/main.php b/upload/library/language/ru/main.php similarity index 100% rename from upload/language/ru/main.php rename to upload/library/language/ru/main.php diff --git a/upload/language/ru/search_stopwords.txt b/upload/library/language/ru/search_stopwords.txt similarity index 100% rename from upload/language/ru/search_stopwords.txt rename to upload/library/language/ru/search_stopwords.txt diff --git a/upload/language/ru/search_synonyms.txt b/upload/library/language/ru/search_synonyms.txt similarity index 100% rename from upload/language/ru/search_synonyms.txt rename to upload/library/language/ru/search_synonyms.txt diff --git a/upload/language/ru/translit_table.php b/upload/library/language/ru/translit_table.php similarity index 100% rename from upload/language/ru/translit_table.php rename to upload/library/language/ru/translit_table.php diff --git a/upload/log/.htaccess b/upload/library/language/uk/.htaccess similarity index 100% rename from upload/log/.htaccess rename to upload/library/language/uk/.htaccess diff --git a/upload/log/cron/.htaccess b/upload/library/language/uk/email/.htaccess similarity index 100% rename from upload/log/cron/.htaccess rename to upload/library/language/uk/email/.htaccess diff --git a/upload/language/uk/email/admin_send_email.tpl b/upload/library/language/uk/email/admin_send_email.tpl similarity index 100% rename from upload/language/uk/email/admin_send_email.tpl rename to upload/library/language/uk/email/admin_send_email.tpl diff --git a/upload/language/uk/email/blank.tpl b/upload/library/language/uk/email/blank.tpl similarity index 100% rename from upload/language/uk/email/blank.tpl rename to upload/library/language/uk/email/blank.tpl diff --git a/upload/language/uk/email/group_added.tpl b/upload/library/language/uk/email/group_added.tpl similarity index 100% rename from upload/language/uk/email/group_added.tpl rename to upload/library/language/uk/email/group_added.tpl diff --git a/upload/language/uk/email/group_approved.tpl b/upload/library/language/uk/email/group_approved.tpl similarity index 100% rename from upload/language/uk/email/group_approved.tpl rename to upload/library/language/uk/email/group_approved.tpl diff --git a/upload/language/uk/email/group_request.tpl b/upload/library/language/uk/email/group_request.tpl similarity index 100% rename from upload/language/uk/email/group_request.tpl rename to upload/library/language/uk/email/group_request.tpl diff --git a/upload/language/uk/email/privmsg_notify.tpl b/upload/library/language/uk/email/privmsg_notify.tpl similarity index 100% rename from upload/language/uk/email/privmsg_notify.tpl rename to upload/library/language/uk/email/privmsg_notify.tpl diff --git a/upload/language/uk/email/profile_send_email.tpl b/upload/library/language/uk/email/profile_send_email.tpl similarity index 100% rename from upload/language/uk/email/profile_send_email.tpl rename to upload/library/language/uk/email/profile_send_email.tpl diff --git a/upload/language/uk/email/topic_notify.tpl b/upload/library/language/uk/email/topic_notify.tpl similarity index 100% rename from upload/language/uk/email/topic_notify.tpl rename to upload/library/language/uk/email/topic_notify.tpl diff --git a/upload/language/uk/email/user_activate.tpl b/upload/library/language/uk/email/user_activate.tpl similarity index 100% rename from upload/language/uk/email/user_activate.tpl rename to upload/library/language/uk/email/user_activate.tpl diff --git a/upload/language/uk/email/user_activate_passwd.tpl b/upload/library/language/uk/email/user_activate_passwd.tpl similarity index 100% rename from upload/language/uk/email/user_activate_passwd.tpl rename to upload/library/language/uk/email/user_activate_passwd.tpl diff --git a/upload/language/uk/email/user_welcome.tpl b/upload/library/language/uk/email/user_welcome.tpl similarity index 100% rename from upload/language/uk/email/user_welcome.tpl rename to upload/library/language/uk/email/user_welcome.tpl diff --git a/upload/language/uk/email/user_welcome_inactive.tpl b/upload/library/language/uk/email/user_welcome_inactive.tpl similarity index 100% rename from upload/language/uk/email/user_welcome_inactive.tpl rename to upload/library/language/uk/email/user_welcome_inactive.tpl diff --git a/upload/triggers/.htaccess b/upload/library/language/uk/html/.htaccess similarity index 100% rename from upload/triggers/.htaccess rename to upload/library/language/uk/html/.htaccess diff --git a/upload/language/uk/html/advert.html b/upload/library/language/uk/html/advert.html similarity index 100% rename from upload/language/uk/html/advert.html rename to upload/library/language/uk/html/advert.html diff --git a/upload/language/uk/html/copyright_holders.html b/upload/library/language/uk/html/copyright_holders.html similarity index 100% rename from upload/language/uk/html/copyright_holders.html rename to upload/library/language/uk/html/copyright_holders.html diff --git a/upload/language/uk/html/not_found.html b/upload/library/language/uk/html/not_found.html similarity index 100% rename from upload/language/uk/html/not_found.html rename to upload/library/language/uk/html/not_found.html diff --git a/upload/language/uk/html/sidebar1.html b/upload/library/language/uk/html/sidebar1.html similarity index 100% rename from upload/language/uk/html/sidebar1.html rename to upload/library/language/uk/html/sidebar1.html diff --git a/upload/language/uk/html/sidebar2.html b/upload/library/language/uk/html/sidebar2.html similarity index 100% rename from upload/language/uk/html/sidebar2.html rename to upload/library/language/uk/html/sidebar2.html diff --git a/upload/language/uk/html/user_agreement.html b/upload/library/language/uk/html/user_agreement.html similarity index 100% rename from upload/language/uk/html/user_agreement.html rename to upload/library/language/uk/html/user_agreement.html diff --git a/upload/language/uk/main.php b/upload/library/language/uk/main.php similarity index 100% rename from upload/language/uk/main.php rename to upload/library/language/uk/main.php diff --git a/upload/language/uk/search_stopwords.txt b/upload/library/language/uk/search_stopwords.txt similarity index 100% rename from upload/language/uk/search_stopwords.txt rename to upload/library/language/uk/search_stopwords.txt diff --git a/upload/language/uk/search_synonyms.txt b/upload/library/language/uk/search_synonyms.txt similarity index 100% rename from upload/language/uk/search_synonyms.txt rename to upload/library/language/uk/search_synonyms.txt diff --git a/upload/language/uk/translit_table.php b/upload/library/language/uk/translit_table.php similarity index 100% rename from upload/language/uk/translit_table.php rename to upload/library/language/uk/translit_table.php diff --git a/upload/images/bad.gif b/upload/styles/images/bad.gif similarity index 100% rename from upload/images/bad.gif rename to upload/styles/images/bad.gif diff --git a/upload/images/dc_magnet.png b/upload/styles/images/dc_magnet.png similarity index 100% rename from upload/images/dc_magnet.png rename to upload/styles/images/dc_magnet.png diff --git a/upload/images/dc_magnet_ext.png b/upload/styles/images/dc_magnet_ext.png similarity index 100% rename from upload/images/dc_magnet_ext.png rename to upload/styles/images/dc_magnet_ext.png diff --git a/upload/images/folder.gif b/upload/styles/images/folder.gif similarity index 100% rename from upload/images/folder.gif rename to upload/styles/images/folder.gif diff --git a/upload/images/good.gif b/upload/styles/images/good.gif similarity index 100% rename from upload/images/good.gif rename to upload/styles/images/good.gif diff --git a/upload/images/icon_clip.gif b/upload/styles/images/icon_clip.gif similarity index 100% rename from upload/images/icon_clip.gif rename to upload/styles/images/icon_clip.gif diff --git a/upload/images/icon_delete.gif b/upload/styles/images/icon_delete.gif similarity index 100% rename from upload/images/icon_delete.gif rename to upload/styles/images/icon_delete.gif diff --git a/upload/images/icon_dn.gif b/upload/styles/images/icon_dn.gif similarity index 100% rename from upload/images/icon_dn.gif rename to upload/styles/images/icon_dn.gif diff --git a/upload/images/icon_edit.gif b/upload/styles/images/icon_edit.gif similarity index 100% rename from upload/images/icon_edit.gif rename to upload/styles/images/icon_edit.gif diff --git a/upload/images/icon_external.png b/upload/styles/images/icon_external.png similarity index 100% rename from upload/images/icon_external.png rename to upload/styles/images/icon_external.png diff --git a/upload/images/icon_run.gif b/upload/styles/images/icon_run.gif similarity index 100% rename from upload/images/icon_run.gif rename to upload/styles/images/icon_run.gif diff --git a/upload/images/icon_sync.gif b/upload/styles/images/icon_sync.gif similarity index 100% rename from upload/images/icon_sync.gif rename to upload/styles/images/icon_sync.gif diff --git a/upload/images/logo/logo.png b/upload/styles/images/logo/logo.png similarity index 100% rename from upload/images/logo/logo.png rename to upload/styles/images/logo/logo.png diff --git a/upload/images/logo/logo_summer.png b/upload/styles/images/logo/logo_summer.png similarity index 100% rename from upload/images/logo/logo_summer.png rename to upload/styles/images/logo/logo_summer.png diff --git a/upload/images/magnet.png b/upload/styles/images/magnet.png similarity index 100% rename from upload/images/magnet.png rename to upload/styles/images/magnet.png diff --git a/upload/images/page.gif b/upload/styles/images/page.gif similarity index 100% rename from upload/images/page.gif rename to upload/styles/images/page.gif diff --git a/upload/images/pic_loading.gif b/upload/styles/images/pic_loading.gif similarity index 100% rename from upload/images/pic_loading.gif rename to upload/styles/images/pic_loading.gif diff --git a/upload/images/ranks/admin.png b/upload/styles/images/ranks/admin.png similarity index 100% rename from upload/images/ranks/admin.png rename to upload/styles/images/ranks/admin.png diff --git a/upload/images/ranks/user.png b/upload/styles/images/ranks/user.png similarity index 100% rename from upload/images/ranks/user.png rename to upload/styles/images/ranks/user.png diff --git a/upload/images/smiles/aa.gif b/upload/styles/images/smiles/aa.gif similarity index 100% rename from upload/images/smiles/aa.gif rename to upload/styles/images/smiles/aa.gif diff --git a/upload/images/smiles/ab.gif b/upload/styles/images/smiles/ab.gif similarity index 100% rename from upload/images/smiles/ab.gif rename to upload/styles/images/smiles/ab.gif diff --git a/upload/images/smiles/ac.gif b/upload/styles/images/smiles/ac.gif similarity index 100% rename from upload/images/smiles/ac.gif rename to upload/styles/images/smiles/ac.gif diff --git a/upload/images/smiles/ad.gif b/upload/styles/images/smiles/ad.gif similarity index 100% rename from upload/images/smiles/ad.gif rename to upload/styles/images/smiles/ad.gif diff --git a/upload/images/smiles/ae.gif b/upload/styles/images/smiles/ae.gif similarity index 100% rename from upload/images/smiles/ae.gif rename to upload/styles/images/smiles/ae.gif diff --git a/upload/images/smiles/af.gif b/upload/styles/images/smiles/af.gif similarity index 100% rename from upload/images/smiles/af.gif rename to upload/styles/images/smiles/af.gif diff --git a/upload/images/smiles/ag.gif b/upload/styles/images/smiles/ag.gif similarity index 100% rename from upload/images/smiles/ag.gif rename to upload/styles/images/smiles/ag.gif diff --git a/upload/images/smiles/ah.gif b/upload/styles/images/smiles/ah.gif similarity index 100% rename from upload/images/smiles/ah.gif rename to upload/styles/images/smiles/ah.gif diff --git a/upload/images/smiles/ai.gif b/upload/styles/images/smiles/ai.gif similarity index 100% rename from upload/images/smiles/ai.gif rename to upload/styles/images/smiles/ai.gif diff --git a/upload/images/smiles/aj.gif b/upload/styles/images/smiles/aj.gif similarity index 100% rename from upload/images/smiles/aj.gif rename to upload/styles/images/smiles/aj.gif diff --git a/upload/images/smiles/ak.gif b/upload/styles/images/smiles/ak.gif similarity index 100% rename from upload/images/smiles/ak.gif rename to upload/styles/images/smiles/ak.gif diff --git a/upload/images/smiles/al.gif b/upload/styles/images/smiles/al.gif similarity index 100% rename from upload/images/smiles/al.gif rename to upload/styles/images/smiles/al.gif diff --git a/upload/images/smiles/am.gif b/upload/styles/images/smiles/am.gif similarity index 100% rename from upload/images/smiles/am.gif rename to upload/styles/images/smiles/am.gif diff --git a/upload/images/smiles/an.gif b/upload/styles/images/smiles/an.gif similarity index 100% rename from upload/images/smiles/an.gif rename to upload/styles/images/smiles/an.gif diff --git a/upload/images/smiles/ao.gif b/upload/styles/images/smiles/ao.gif similarity index 100% rename from upload/images/smiles/ao.gif rename to upload/styles/images/smiles/ao.gif diff --git a/upload/images/smiles/ap.gif b/upload/styles/images/smiles/ap.gif similarity index 100% rename from upload/images/smiles/ap.gif rename to upload/styles/images/smiles/ap.gif diff --git a/upload/images/smiles/aq.gif b/upload/styles/images/smiles/aq.gif similarity index 100% rename from upload/images/smiles/aq.gif rename to upload/styles/images/smiles/aq.gif diff --git a/upload/images/smiles/ar.gif b/upload/styles/images/smiles/ar.gif similarity index 100% rename from upload/images/smiles/ar.gif rename to upload/styles/images/smiles/ar.gif diff --git a/upload/images/smiles/as.gif b/upload/styles/images/smiles/as.gif similarity index 100% rename from upload/images/smiles/as.gif rename to upload/styles/images/smiles/as.gif diff --git a/upload/images/smiles/at.gif b/upload/styles/images/smiles/at.gif similarity index 100% rename from upload/images/smiles/at.gif rename to upload/styles/images/smiles/at.gif diff --git a/upload/images/smiles/au.gif b/upload/styles/images/smiles/au.gif similarity index 100% rename from upload/images/smiles/au.gif rename to upload/styles/images/smiles/au.gif diff --git a/upload/images/smiles/av.gif b/upload/styles/images/smiles/av.gif similarity index 100% rename from upload/images/smiles/av.gif rename to upload/styles/images/smiles/av.gif diff --git a/upload/images/smiles/aw.gif b/upload/styles/images/smiles/aw.gif similarity index 100% rename from upload/images/smiles/aw.gif rename to upload/styles/images/smiles/aw.gif diff --git a/upload/images/smiles/ax.gif b/upload/styles/images/smiles/ax.gif similarity index 100% rename from upload/images/smiles/ax.gif rename to upload/styles/images/smiles/ax.gif diff --git a/upload/images/smiles/ay.gif b/upload/styles/images/smiles/ay.gif similarity index 100% rename from upload/images/smiles/ay.gif rename to upload/styles/images/smiles/ay.gif diff --git a/upload/images/smiles/az.gif b/upload/styles/images/smiles/az.gif similarity index 100% rename from upload/images/smiles/az.gif rename to upload/styles/images/smiles/az.gif diff --git a/upload/images/smiles/ba.gif b/upload/styles/images/smiles/ba.gif similarity index 100% rename from upload/images/smiles/ba.gif rename to upload/styles/images/smiles/ba.gif diff --git a/upload/images/smiles/bb.gif b/upload/styles/images/smiles/bb.gif similarity index 100% rename from upload/images/smiles/bb.gif rename to upload/styles/images/smiles/bb.gif diff --git a/upload/images/smiles/bc.gif b/upload/styles/images/smiles/bc.gif similarity index 100% rename from upload/images/smiles/bc.gif rename to upload/styles/images/smiles/bc.gif diff --git a/upload/images/smiles/bd.gif b/upload/styles/images/smiles/bd.gif similarity index 100% rename from upload/images/smiles/bd.gif rename to upload/styles/images/smiles/bd.gif diff --git a/upload/images/smiles/be.gif b/upload/styles/images/smiles/be.gif similarity index 100% rename from upload/images/smiles/be.gif rename to upload/styles/images/smiles/be.gif diff --git a/upload/images/smiles/bf.gif b/upload/styles/images/smiles/bf.gif similarity index 100% rename from upload/images/smiles/bf.gif rename to upload/styles/images/smiles/bf.gif diff --git a/upload/images/smiles/bg.gif b/upload/styles/images/smiles/bg.gif similarity index 100% rename from upload/images/smiles/bg.gif rename to upload/styles/images/smiles/bg.gif diff --git a/upload/images/smiles/bh.gif b/upload/styles/images/smiles/bh.gif similarity index 100% rename from upload/images/smiles/bh.gif rename to upload/styles/images/smiles/bh.gif diff --git a/upload/images/smiles/bi.gif b/upload/styles/images/smiles/bi.gif similarity index 100% rename from upload/images/smiles/bi.gif rename to upload/styles/images/smiles/bi.gif diff --git a/upload/images/smiles/bj.gif b/upload/styles/images/smiles/bj.gif similarity index 100% rename from upload/images/smiles/bj.gif rename to upload/styles/images/smiles/bj.gif diff --git a/upload/images/smiles/bk.gif b/upload/styles/images/smiles/bk.gif similarity index 100% rename from upload/images/smiles/bk.gif rename to upload/styles/images/smiles/bk.gif diff --git a/upload/images/smiles/bl.gif b/upload/styles/images/smiles/bl.gif similarity index 100% rename from upload/images/smiles/bl.gif rename to upload/styles/images/smiles/bl.gif diff --git a/upload/images/smiles/bm.gif b/upload/styles/images/smiles/bm.gif similarity index 100% rename from upload/images/smiles/bm.gif rename to upload/styles/images/smiles/bm.gif diff --git a/upload/images/smiles/bn.gif b/upload/styles/images/smiles/bn.gif similarity index 100% rename from upload/images/smiles/bn.gif rename to upload/styles/images/smiles/bn.gif diff --git a/upload/images/smiles/bo.gif b/upload/styles/images/smiles/bo.gif similarity index 100% rename from upload/images/smiles/bo.gif rename to upload/styles/images/smiles/bo.gif diff --git a/upload/images/smiles/bp.gif b/upload/styles/images/smiles/bp.gif similarity index 100% rename from upload/images/smiles/bp.gif rename to upload/styles/images/smiles/bp.gif diff --git a/upload/images/smiles/bq.gif b/upload/styles/images/smiles/bq.gif similarity index 100% rename from upload/images/smiles/bq.gif rename to upload/styles/images/smiles/bq.gif diff --git a/upload/images/smiles/br.gif b/upload/styles/images/smiles/br.gif similarity index 100% rename from upload/images/smiles/br.gif rename to upload/styles/images/smiles/br.gif diff --git a/upload/images/smiles/bs.gif b/upload/styles/images/smiles/bs.gif similarity index 100% rename from upload/images/smiles/bs.gif rename to upload/styles/images/smiles/bs.gif diff --git a/upload/images/smiles/bt.gif b/upload/styles/images/smiles/bt.gif similarity index 100% rename from upload/images/smiles/bt.gif rename to upload/styles/images/smiles/bt.gif diff --git a/upload/images/smiles/bu.gif b/upload/styles/images/smiles/bu.gif similarity index 100% rename from upload/images/smiles/bu.gif rename to upload/styles/images/smiles/bu.gif diff --git a/upload/images/smiles/bv.gif b/upload/styles/images/smiles/bv.gif similarity index 100% rename from upload/images/smiles/bv.gif rename to upload/styles/images/smiles/bv.gif diff --git a/upload/images/smiles/bw.gif b/upload/styles/images/smiles/bw.gif similarity index 100% rename from upload/images/smiles/bw.gif rename to upload/styles/images/smiles/bw.gif diff --git a/upload/images/smiles/bx.gif b/upload/styles/images/smiles/bx.gif similarity index 100% rename from upload/images/smiles/bx.gif rename to upload/styles/images/smiles/bx.gif diff --git a/upload/images/smiles/by.gif b/upload/styles/images/smiles/by.gif similarity index 100% rename from upload/images/smiles/by.gif rename to upload/styles/images/smiles/by.gif diff --git a/upload/images/smiles/bz.gif b/upload/styles/images/smiles/bz.gif similarity index 100% rename from upload/images/smiles/bz.gif rename to upload/styles/images/smiles/bz.gif diff --git a/upload/images/smiles/ca.gif b/upload/styles/images/smiles/ca.gif similarity index 100% rename from upload/images/smiles/ca.gif rename to upload/styles/images/smiles/ca.gif diff --git a/upload/images/smiles/cb.gif b/upload/styles/images/smiles/cb.gif similarity index 100% rename from upload/images/smiles/cb.gif rename to upload/styles/images/smiles/cb.gif diff --git a/upload/images/smiles/cc.gif b/upload/styles/images/smiles/cc.gif similarity index 100% rename from upload/images/smiles/cc.gif rename to upload/styles/images/smiles/cc.gif diff --git a/upload/images/smiles/tr_oops.gif b/upload/styles/images/smiles/tr_oops.gif similarity index 100% rename from upload/images/smiles/tr_oops.gif rename to upload/styles/images/smiles/tr_oops.gif diff --git a/upload/images/spacer.gif b/upload/styles/images/spacer.gif similarity index 100% rename from upload/images/spacer.gif rename to upload/styles/images/spacer.gif diff --git a/upload/images/tor_gold.gif b/upload/styles/images/tor_gold.gif similarity index 100% rename from upload/images/tor_gold.gif rename to upload/styles/images/tor_gold.gif diff --git a/upload/images/tor_silver.gif b/upload/styles/images/tor_silver.gif similarity index 100% rename from upload/images/tor_silver.gif rename to upload/styles/images/tor_silver.gif diff --git a/upload/images/user_offline.gif b/upload/styles/images/user_offline.gif similarity index 100% rename from upload/images/user_offline.gif rename to upload/styles/images/user_offline.gif diff --git a/upload/images/user_online.gif b/upload/styles/images/user_online.gif similarity index 100% rename from upload/images/user_online.gif rename to upload/styles/images/user_online.gif diff --git a/upload/misc/bootstrap/css/bootstrap-theme.css b/upload/styles/misc/bootstrap/css/bootstrap-theme.css similarity index 100% rename from upload/misc/bootstrap/css/bootstrap-theme.css rename to upload/styles/misc/bootstrap/css/bootstrap-theme.css diff --git a/upload/misc/bootstrap/css/bootstrap-theme.css.map b/upload/styles/misc/bootstrap/css/bootstrap-theme.css.map similarity index 100% rename from upload/misc/bootstrap/css/bootstrap-theme.css.map rename to upload/styles/misc/bootstrap/css/bootstrap-theme.css.map diff --git a/upload/misc/bootstrap/css/bootstrap-theme.min.css b/upload/styles/misc/bootstrap/css/bootstrap-theme.min.css similarity index 100% rename from upload/misc/bootstrap/css/bootstrap-theme.min.css rename to upload/styles/misc/bootstrap/css/bootstrap-theme.min.css diff --git a/upload/misc/bootstrap/css/bootstrap.css b/upload/styles/misc/bootstrap/css/bootstrap.css similarity index 100% rename from upload/misc/bootstrap/css/bootstrap.css rename to upload/styles/misc/bootstrap/css/bootstrap.css diff --git a/upload/misc/bootstrap/css/bootstrap.css.map b/upload/styles/misc/bootstrap/css/bootstrap.css.map similarity index 100% rename from upload/misc/bootstrap/css/bootstrap.css.map rename to upload/styles/misc/bootstrap/css/bootstrap.css.map diff --git a/upload/misc/bootstrap/css/bootstrap.min.css b/upload/styles/misc/bootstrap/css/bootstrap.min.css similarity index 100% rename from upload/misc/bootstrap/css/bootstrap.min.css rename to upload/styles/misc/bootstrap/css/bootstrap.min.css diff --git a/upload/misc/bootstrap/fonts/glyphicons-halflings-regular.eot b/upload/styles/misc/bootstrap/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from upload/misc/bootstrap/fonts/glyphicons-halflings-regular.eot rename to upload/styles/misc/bootstrap/fonts/glyphicons-halflings-regular.eot diff --git a/upload/misc/bootstrap/fonts/glyphicons-halflings-regular.svg b/upload/styles/misc/bootstrap/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from upload/misc/bootstrap/fonts/glyphicons-halflings-regular.svg rename to upload/styles/misc/bootstrap/fonts/glyphicons-halflings-regular.svg diff --git a/upload/misc/bootstrap/fonts/glyphicons-halflings-regular.ttf b/upload/styles/misc/bootstrap/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from upload/misc/bootstrap/fonts/glyphicons-halflings-regular.ttf rename to upload/styles/misc/bootstrap/fonts/glyphicons-halflings-regular.ttf diff --git a/upload/misc/bootstrap/fonts/glyphicons-halflings-regular.woff b/upload/styles/misc/bootstrap/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from upload/misc/bootstrap/fonts/glyphicons-halflings-regular.woff rename to upload/styles/misc/bootstrap/fonts/glyphicons-halflings-regular.woff diff --git a/upload/misc/bootstrap/js/bootstrap.js b/upload/styles/misc/bootstrap/js/bootstrap.js similarity index 100% rename from upload/misc/bootstrap/js/bootstrap.js rename to upload/styles/misc/bootstrap/js/bootstrap.js diff --git a/upload/misc/bootstrap/js/bootstrap.min.js b/upload/styles/misc/bootstrap/js/bootstrap.min.js similarity index 100% rename from upload/misc/bootstrap/js/bootstrap.min.js rename to upload/styles/misc/bootstrap/js/bootstrap.min.js diff --git a/upload/misc/js/bbcode.js b/upload/styles/misc/js/bbcode.js similarity index 100% rename from upload/misc/js/bbcode.js rename to upload/styles/misc/js/bbcode.js diff --git a/upload/misc/js/jquery.pack.js b/upload/styles/misc/js/jquery.pack.js similarity index 100% rename from upload/misc/js/jquery.pack.js rename to upload/styles/misc/js/jquery.pack.js diff --git a/upload/misc/js/main.js b/upload/styles/misc/js/main.js similarity index 100% rename from upload/misc/js/main.js rename to upload/styles/misc/js/main.js diff --git a/upload/templates/admin/admin_attach_cp.tpl b/upload/styles/templates/admin/admin_attach_cp.tpl similarity index 100% rename from upload/templates/admin/admin_attach_cp.tpl rename to upload/styles/templates/admin/admin_attach_cp.tpl diff --git a/upload/templates/admin/admin_attachments.tpl b/upload/styles/templates/admin/admin_attachments.tpl similarity index 100% rename from upload/templates/admin/admin_attachments.tpl rename to upload/styles/templates/admin/admin_attachments.tpl diff --git a/upload/templates/admin/admin_board.tpl b/upload/styles/templates/admin/admin_board.tpl similarity index 100% rename from upload/templates/admin/admin_board.tpl rename to upload/styles/templates/admin/admin_board.tpl diff --git a/upload/templates/admin/admin_bt_forum_cfg.tpl b/upload/styles/templates/admin/admin_bt_forum_cfg.tpl similarity index 100% rename from upload/templates/admin/admin_bt_forum_cfg.tpl rename to upload/styles/templates/admin/admin_bt_forum_cfg.tpl diff --git a/upload/templates/admin/admin_bt_tracker_cfg.tpl b/upload/styles/templates/admin/admin_bt_tracker_cfg.tpl similarity index 100% rename from upload/templates/admin/admin_bt_tracker_cfg.tpl rename to upload/styles/templates/admin/admin_bt_tracker_cfg.tpl diff --git a/upload/templates/admin/admin_cron.tpl b/upload/styles/templates/admin/admin_cron.tpl similarity index 100% rename from upload/templates/admin/admin_cron.tpl rename to upload/styles/templates/admin/admin_cron.tpl diff --git a/upload/templates/admin/admin_disallow.tpl b/upload/styles/templates/admin/admin_disallow.tpl similarity index 100% rename from upload/templates/admin/admin_disallow.tpl rename to upload/styles/templates/admin/admin_disallow.tpl diff --git a/upload/templates/admin/admin_extensions.tpl b/upload/styles/templates/admin/admin_extensions.tpl similarity index 100% rename from upload/templates/admin/admin_extensions.tpl rename to upload/styles/templates/admin/admin_extensions.tpl diff --git a/upload/templates/admin/admin_forum_prune.tpl b/upload/styles/templates/admin/admin_forum_prune.tpl similarity index 100% rename from upload/templates/admin/admin_forum_prune.tpl rename to upload/styles/templates/admin/admin_forum_prune.tpl diff --git a/upload/templates/admin/admin_forumauth.tpl b/upload/styles/templates/admin/admin_forumauth.tpl similarity index 100% rename from upload/templates/admin/admin_forumauth.tpl rename to upload/styles/templates/admin/admin_forumauth.tpl diff --git a/upload/templates/admin/admin_forumauth_list.tpl b/upload/styles/templates/admin/admin_forumauth_list.tpl similarity index 100% rename from upload/templates/admin/admin_forumauth_list.tpl rename to upload/styles/templates/admin/admin_forumauth_list.tpl diff --git a/upload/templates/admin/admin_forums.tpl b/upload/styles/templates/admin/admin_forums.tpl similarity index 100% rename from upload/templates/admin/admin_forums.tpl rename to upload/styles/templates/admin/admin_forums.tpl diff --git a/upload/templates/admin/admin_groups.tpl b/upload/styles/templates/admin/admin_groups.tpl similarity index 100% rename from upload/templates/admin/admin_groups.tpl rename to upload/styles/templates/admin/admin_groups.tpl diff --git a/upload/templates/admin/admin_log.tpl b/upload/styles/templates/admin/admin_log.tpl similarity index 100% rename from upload/templates/admin/admin_log.tpl rename to upload/styles/templates/admin/admin_log.tpl diff --git a/upload/templates/admin/admin_mass_email.tpl b/upload/styles/templates/admin/admin_mass_email.tpl similarity index 100% rename from upload/templates/admin/admin_mass_email.tpl rename to upload/styles/templates/admin/admin_mass_email.tpl diff --git a/upload/templates/admin/admin_ranks.tpl b/upload/styles/templates/admin/admin_ranks.tpl similarity index 100% rename from upload/templates/admin/admin_ranks.tpl rename to upload/styles/templates/admin/admin_ranks.tpl diff --git a/upload/templates/admin/admin_rebuild_search.tpl b/upload/styles/templates/admin/admin_rebuild_search.tpl similarity index 100% rename from upload/templates/admin/admin_rebuild_search.tpl rename to upload/styles/templates/admin/admin_rebuild_search.tpl diff --git a/upload/templates/admin/admin_sitemap.tpl b/upload/styles/templates/admin/admin_sitemap.tpl similarity index 100% rename from upload/templates/admin/admin_sitemap.tpl rename to upload/styles/templates/admin/admin_sitemap.tpl diff --git a/upload/templates/admin/admin_smilies.tpl b/upload/styles/templates/admin/admin_smilies.tpl similarity index 100% rename from upload/templates/admin/admin_smilies.tpl rename to upload/styles/templates/admin/admin_smilies.tpl diff --git a/upload/templates/admin/admin_terms.tpl b/upload/styles/templates/admin/admin_terms.tpl similarity index 100% rename from upload/templates/admin/admin_terms.tpl rename to upload/styles/templates/admin/admin_terms.tpl diff --git a/upload/templates/admin/admin_ug_auth.tpl b/upload/styles/templates/admin/admin_ug_auth.tpl similarity index 100% rename from upload/templates/admin/admin_ug_auth.tpl rename to upload/styles/templates/admin/admin_ug_auth.tpl diff --git a/upload/templates/admin/admin_user_ban.tpl b/upload/styles/templates/admin/admin_user_ban.tpl similarity index 100% rename from upload/templates/admin/admin_user_ban.tpl rename to upload/styles/templates/admin/admin_user_ban.tpl diff --git a/upload/templates/admin/admin_user_search.tpl b/upload/styles/templates/admin/admin_user_search.tpl similarity index 100% rename from upload/templates/admin/admin_user_search.tpl rename to upload/styles/templates/admin/admin_user_search.tpl diff --git a/upload/templates/admin/admin_words.tpl b/upload/styles/templates/admin/admin_words.tpl similarity index 100% rename from upload/templates/admin/admin_words.tpl rename to upload/styles/templates/admin/admin_words.tpl diff --git a/upload/templates/admin/index.tpl b/upload/styles/templates/admin/index.tpl similarity index 98% rename from upload/templates/admin/index.tpl rename to upload/styles/templates/admin/index.tpl index 57c01ab2b..0e1fd7f25 100644 --- a/upload/templates/admin/index.tpl +++ b/upload/styles/templates/admin/index.tpl @@ -117,8 +117,8 @@ ajax.callback.manage_admin = function(data) { {L_STATISTICS}: - tr_stats.php,  - tracker.php + tr_stats.php,  + tracker.php diff --git a/upload/templates/default/common.tpl b/upload/styles/templates/default/common.tpl similarity index 100% rename from upload/templates/default/common.tpl rename to upload/styles/templates/default/common.tpl diff --git a/upload/templates/default/css/admin.css b/upload/styles/templates/default/css/admin.css similarity index 100% rename from upload/templates/default/css/admin.css rename to upload/styles/templates/default/css/admin.css diff --git a/upload/templates/default/css/main.css b/upload/styles/templates/default/css/main.css similarity index 100% rename from upload/templates/default/css/main.css rename to upload/styles/templates/default/css/main.css diff --git a/upload/templates/default/group.tpl b/upload/styles/templates/default/group.tpl similarity index 100% rename from upload/templates/default/group.tpl rename to upload/styles/templates/default/group.tpl diff --git a/upload/templates/default/group_edit.tpl b/upload/styles/templates/default/group_edit.tpl similarity index 100% rename from upload/templates/default/group_edit.tpl rename to upload/styles/templates/default/group_edit.tpl diff --git a/upload/templates/default/images/aerobg.png b/upload/styles/templates/default/images/aerobg.png similarity index 100% rename from upload/templates/default/images/aerobg.png rename to upload/styles/templates/default/images/aerobg.png diff --git a/upload/templates/default/images/arrow1.gif b/upload/styles/templates/default/images/arrow1.gif similarity index 100% rename from upload/templates/default/images/arrow1.gif rename to upload/styles/templates/default/images/arrow1.gif diff --git a/upload/templates/default/images/button.gif b/upload/styles/templates/default/images/button.gif similarity index 100% rename from upload/templates/default/images/button.gif rename to upload/styles/templates/default/images/button.gif diff --git a/upload/templates/default/images/cellpic.gif b/upload/styles/templates/default/images/cellpic.gif similarity index 100% rename from upload/templates/default/images/cellpic.gif rename to upload/styles/templates/default/images/cellpic.gif diff --git a/upload/templates/default/images/cellpic1.gif b/upload/styles/templates/default/images/cellpic1.gif similarity index 100% rename from upload/templates/default/images/cellpic1.gif rename to upload/styles/templates/default/images/cellpic1.gif diff --git a/upload/templates/default/images/def_button.png b/upload/styles/templates/default/images/def_button.png similarity index 100% rename from upload/templates/default/images/def_button.png rename to upload/styles/templates/default/images/def_button.png diff --git a/upload/templates/default/images/def_button_light.png b/upload/styles/templates/default/images/def_button_light.png similarity index 100% rename from upload/templates/default/images/def_button_light.png rename to upload/styles/templates/default/images/def_button_light.png diff --git a/upload/templates/default/images/feed.png b/upload/styles/templates/default/images/feed.png similarity index 100% rename from upload/templates/default/images/feed.png rename to upload/styles/templates/default/images/feed.png diff --git a/upload/templates/default/images/folder.gif b/upload/styles/templates/default/images/folder.gif similarity index 100% rename from upload/templates/default/images/folder.gif rename to upload/styles/templates/default/images/folder.gif diff --git a/upload/templates/default/images/folder_announce.gif b/upload/styles/templates/default/images/folder_announce.gif similarity index 100% rename from upload/templates/default/images/folder_announce.gif rename to upload/styles/templates/default/images/folder_announce.gif diff --git a/upload/templates/default/images/folder_announce_new.gif b/upload/styles/templates/default/images/folder_announce_new.gif similarity index 100% rename from upload/templates/default/images/folder_announce_new.gif rename to upload/styles/templates/default/images/folder_announce_new.gif diff --git a/upload/templates/default/images/folder_big.gif b/upload/styles/templates/default/images/folder_big.gif similarity index 100% rename from upload/templates/default/images/folder_big.gif rename to upload/styles/templates/default/images/folder_big.gif diff --git a/upload/templates/default/images/folder_dl.gif b/upload/styles/templates/default/images/folder_dl.gif similarity index 100% rename from upload/templates/default/images/folder_dl.gif rename to upload/styles/templates/default/images/folder_dl.gif diff --git a/upload/templates/default/images/folder_dl_hot.gif b/upload/styles/templates/default/images/folder_dl_hot.gif similarity index 100% rename from upload/templates/default/images/folder_dl_hot.gif rename to upload/styles/templates/default/images/folder_dl_hot.gif diff --git a/upload/templates/default/images/folder_dl_hot_new.gif b/upload/styles/templates/default/images/folder_dl_hot_new.gif similarity index 100% rename from upload/templates/default/images/folder_dl_hot_new.gif rename to upload/styles/templates/default/images/folder_dl_hot_new.gif diff --git a/upload/templates/default/images/folder_dl_new.gif b/upload/styles/templates/default/images/folder_dl_new.gif similarity index 100% rename from upload/templates/default/images/folder_dl_new.gif rename to upload/styles/templates/default/images/folder_dl_new.gif diff --git a/upload/templates/default/images/folder_hot.gif b/upload/styles/templates/default/images/folder_hot.gif similarity index 100% rename from upload/templates/default/images/folder_hot.gif rename to upload/styles/templates/default/images/folder_hot.gif diff --git a/upload/templates/default/images/folder_lock.gif b/upload/styles/templates/default/images/folder_lock.gif similarity index 100% rename from upload/templates/default/images/folder_lock.gif rename to upload/styles/templates/default/images/folder_lock.gif diff --git a/upload/templates/default/images/folder_lock_new.gif b/upload/styles/templates/default/images/folder_lock_new.gif similarity index 100% rename from upload/templates/default/images/folder_lock_new.gif rename to upload/styles/templates/default/images/folder_lock_new.gif diff --git a/upload/templates/default/images/folder_locked_big.gif b/upload/styles/templates/default/images/folder_locked_big.gif similarity index 100% rename from upload/templates/default/images/folder_locked_big.gif rename to upload/styles/templates/default/images/folder_locked_big.gif diff --git a/upload/templates/default/images/folder_new.gif b/upload/styles/templates/default/images/folder_new.gif similarity index 100% rename from upload/templates/default/images/folder_new.gif rename to upload/styles/templates/default/images/folder_new.gif diff --git a/upload/templates/default/images/folder_new_big.gif b/upload/styles/templates/default/images/folder_new_big.gif similarity index 100% rename from upload/templates/default/images/folder_new_big.gif rename to upload/styles/templates/default/images/folder_new_big.gif diff --git a/upload/templates/default/images/folder_new_hot.gif b/upload/styles/templates/default/images/folder_new_hot.gif similarity index 100% rename from upload/templates/default/images/folder_new_hot.gif rename to upload/styles/templates/default/images/folder_new_hot.gif diff --git a/upload/templates/default/images/folder_sticky.gif b/upload/styles/templates/default/images/folder_sticky.gif similarity index 100% rename from upload/templates/default/images/folder_sticky.gif rename to upload/styles/templates/default/images/folder_sticky.gif diff --git a/upload/templates/default/images/folder_sticky_new.gif b/upload/styles/templates/default/images/folder_sticky_new.gif similarity index 100% rename from upload/templates/default/images/folder_sticky_new.gif rename to upload/styles/templates/default/images/folder_sticky_new.gif diff --git a/upload/templates/default/images/hr200_ltr_gradient.jpg b/upload/styles/templates/default/images/hr200_ltr_gradient.jpg similarity index 100% rename from upload/templates/default/images/hr200_ltr_gradient.jpg rename to upload/styles/templates/default/images/hr200_ltr_gradient.jpg diff --git a/upload/templates/default/images/hr400_ltr_gradient.jpg b/upload/styles/templates/default/images/hr400_ltr_gradient.jpg similarity index 100% rename from upload/templates/default/images/hr400_ltr_gradient.jpg rename to upload/styles/templates/default/images/hr400_ltr_gradient.jpg diff --git a/upload/templates/default/images/icon_birthday.gif b/upload/styles/templates/default/images/icon_birthday.gif similarity index 100% rename from upload/templates/default/images/icon_birthday.gif rename to upload/styles/templates/default/images/icon_birthday.gif diff --git a/upload/templates/default/images/icon_delete.gif b/upload/styles/templates/default/images/icon_delete.gif similarity index 100% rename from upload/templates/default/images/icon_delete.gif rename to upload/styles/templates/default/images/icon_delete.gif diff --git a/upload/templates/default/images/icon_female.gif b/upload/styles/templates/default/images/icon_female.gif similarity index 100% rename from upload/templates/default/images/icon_female.gif rename to upload/styles/templates/default/images/icon_female.gif diff --git a/upload/templates/default/images/icon_latest_reply.gif b/upload/styles/templates/default/images/icon_latest_reply.gif similarity index 100% rename from upload/templates/default/images/icon_latest_reply.gif rename to upload/styles/templates/default/images/icon_latest_reply.gif diff --git a/upload/templates/default/images/icon_male.gif b/upload/styles/templates/default/images/icon_male.gif similarity index 100% rename from upload/templates/default/images/icon_male.gif rename to upload/styles/templates/default/images/icon_male.gif diff --git a/upload/templates/default/images/icon_minipost.gif b/upload/styles/templates/default/images/icon_minipost.gif similarity index 100% rename from upload/templates/default/images/icon_minipost.gif rename to upload/styles/templates/default/images/icon_minipost.gif diff --git a/upload/templates/default/images/icon_minipost_new.gif b/upload/styles/templates/default/images/icon_minipost_new.gif similarity index 100% rename from upload/templates/default/images/icon_minipost_new.gif rename to upload/styles/templates/default/images/icon_minipost_new.gif diff --git a/upload/templates/default/images/icon_minus_1.gif b/upload/styles/templates/default/images/icon_minus_1.gif similarity index 100% rename from upload/templates/default/images/icon_minus_1.gif rename to upload/styles/templates/default/images/icon_minus_1.gif diff --git a/upload/templates/default/images/icon_minus_2.gif b/upload/styles/templates/default/images/icon_minus_2.gif similarity index 100% rename from upload/templates/default/images/icon_minus_2.gif rename to upload/styles/templates/default/images/icon_minus_2.gif diff --git a/upload/templates/default/images/icon_mod.gif b/upload/styles/templates/default/images/icon_mod.gif similarity index 100% rename from upload/templates/default/images/icon_mod.gif rename to upload/styles/templates/default/images/icon_mod.gif diff --git a/upload/templates/default/images/icon_newest_reply.gif b/upload/styles/templates/default/images/icon_newest_reply.gif similarity index 100% rename from upload/templates/default/images/icon_newest_reply.gif rename to upload/styles/templates/default/images/icon_newest_reply.gif diff --git a/upload/templates/default/images/icon_nogender.gif b/upload/styles/templates/default/images/icon_nogender.gif similarity index 100% rename from upload/templates/default/images/icon_nogender.gif rename to upload/styles/templates/default/images/icon_nogender.gif diff --git a/upload/templates/default/images/icon_plus_1.gif b/upload/styles/templates/default/images/icon_plus_1.gif similarity index 100% rename from upload/templates/default/images/icon_plus_1.gif rename to upload/styles/templates/default/images/icon_plus_1.gif diff --git a/upload/templates/default/images/icon_plus_2.gif b/upload/styles/templates/default/images/icon_plus_2.gif similarity index 100% rename from upload/templates/default/images/icon_plus_2.gif rename to upload/styles/templates/default/images/icon_plus_2.gif diff --git a/upload/templates/default/images/img_alert.gif b/upload/styles/templates/default/images/img_alert.gif similarity index 100% rename from upload/templates/default/images/img_alert.gif rename to upload/styles/templates/default/images/img_alert.gif diff --git a/upload/templates/default/images/lang/en/icon_edit.gif b/upload/styles/templates/default/images/lang/en/icon_edit.gif similarity index 100% rename from upload/templates/default/images/lang/en/icon_edit.gif rename to upload/styles/templates/default/images/lang/en/icon_edit.gif diff --git a/upload/templates/default/images/lang/en/icon_email.gif b/upload/styles/templates/default/images/lang/en/icon_email.gif similarity index 100% rename from upload/templates/default/images/lang/en/icon_email.gif rename to upload/styles/templates/default/images/lang/en/icon_email.gif diff --git a/upload/templates/default/images/lang/en/icon_icq_add.gif b/upload/styles/templates/default/images/lang/en/icon_icq_add.gif similarity index 100% rename from upload/templates/default/images/lang/en/icon_icq_add.gif rename to upload/styles/templates/default/images/lang/en/icon_icq_add.gif diff --git a/upload/templates/default/images/lang/en/icon_ip.gif b/upload/styles/templates/default/images/lang/en/icon_ip.gif similarity index 100% rename from upload/templates/default/images/lang/en/icon_ip.gif rename to upload/styles/templates/default/images/lang/en/icon_ip.gif diff --git a/upload/templates/default/images/lang/en/icon_mc.gif b/upload/styles/templates/default/images/lang/en/icon_mc.gif similarity index 100% rename from upload/templates/default/images/lang/en/icon_mc.gif rename to upload/styles/templates/default/images/lang/en/icon_mc.gif diff --git a/upload/templates/default/images/lang/en/icon_pm.gif b/upload/styles/templates/default/images/lang/en/icon_pm.gif similarity index 100% rename from upload/templates/default/images/lang/en/icon_pm.gif rename to upload/styles/templates/default/images/lang/en/icon_pm.gif diff --git a/upload/templates/default/images/lang/en/icon_poll.gif b/upload/styles/templates/default/images/lang/en/icon_poll.gif similarity index 100% rename from upload/templates/default/images/lang/en/icon_poll.gif rename to upload/styles/templates/default/images/lang/en/icon_poll.gif diff --git a/upload/templates/default/images/lang/en/icon_profile.gif b/upload/styles/templates/default/images/lang/en/icon_profile.gif similarity index 100% rename from upload/templates/default/images/lang/en/icon_profile.gif rename to upload/styles/templates/default/images/lang/en/icon_profile.gif diff --git a/upload/templates/default/images/lang/en/icon_quote.gif b/upload/styles/templates/default/images/lang/en/icon_quote.gif similarity index 100% rename from upload/templates/default/images/lang/en/icon_quote.gif rename to upload/styles/templates/default/images/lang/en/icon_quote.gif diff --git a/upload/templates/default/images/lang/en/icon_search.gif b/upload/styles/templates/default/images/lang/en/icon_search.gif similarity index 100% rename from upload/templates/default/images/lang/en/icon_search.gif rename to upload/styles/templates/default/images/lang/en/icon_search.gif diff --git a/upload/templates/default/images/lang/en/icon_www.gif b/upload/styles/templates/default/images/lang/en/icon_www.gif similarity index 100% rename from upload/templates/default/images/lang/en/icon_www.gif rename to upload/styles/templates/default/images/lang/en/icon_www.gif diff --git a/upload/templates/default/images/lang/en/msg_newpost.gif b/upload/styles/templates/default/images/lang/en/msg_newpost.gif similarity index 100% rename from upload/templates/default/images/lang/en/msg_newpost.gif rename to upload/styles/templates/default/images/lang/en/msg_newpost.gif diff --git a/upload/templates/default/images/lang/en/post.gif b/upload/styles/templates/default/images/lang/en/post.gif similarity index 100% rename from upload/templates/default/images/lang/en/post.gif rename to upload/styles/templates/default/images/lang/en/post.gif diff --git a/upload/templates/default/images/lang/en/release.gif b/upload/styles/templates/default/images/lang/en/release.gif similarity index 100% rename from upload/templates/default/images/lang/en/release.gif rename to upload/styles/templates/default/images/lang/en/release.gif diff --git a/upload/templates/default/images/lang/en/reply-locked.gif b/upload/styles/templates/default/images/lang/en/reply-locked.gif similarity index 100% rename from upload/templates/default/images/lang/en/reply-locked.gif rename to upload/styles/templates/default/images/lang/en/reply-locked.gif diff --git a/upload/templates/default/images/lang/en/reply.gif b/upload/styles/templates/default/images/lang/en/reply.gif similarity index 100% rename from upload/templates/default/images/lang/en/reply.gif rename to upload/styles/templates/default/images/lang/en/reply.gif diff --git a/upload/templates/default/images/lang/ru/icon_edit.gif b/upload/styles/templates/default/images/lang/ru/icon_edit.gif similarity index 100% rename from upload/templates/default/images/lang/ru/icon_edit.gif rename to upload/styles/templates/default/images/lang/ru/icon_edit.gif diff --git a/upload/templates/default/images/lang/ru/icon_email.gif b/upload/styles/templates/default/images/lang/ru/icon_email.gif similarity index 100% rename from upload/templates/default/images/lang/ru/icon_email.gif rename to upload/styles/templates/default/images/lang/ru/icon_email.gif diff --git a/upload/templates/default/images/lang/ru/icon_icq_add.gif b/upload/styles/templates/default/images/lang/ru/icon_icq_add.gif similarity index 100% rename from upload/templates/default/images/lang/ru/icon_icq_add.gif rename to upload/styles/templates/default/images/lang/ru/icon_icq_add.gif diff --git a/upload/templates/default/images/lang/ru/icon_ip.gif b/upload/styles/templates/default/images/lang/ru/icon_ip.gif similarity index 100% rename from upload/templates/default/images/lang/ru/icon_ip.gif rename to upload/styles/templates/default/images/lang/ru/icon_ip.gif diff --git a/upload/templates/default/images/lang/ru/icon_mc.gif b/upload/styles/templates/default/images/lang/ru/icon_mc.gif similarity index 100% rename from upload/templates/default/images/lang/ru/icon_mc.gif rename to upload/styles/templates/default/images/lang/ru/icon_mc.gif diff --git a/upload/templates/default/images/lang/ru/icon_pm.gif b/upload/styles/templates/default/images/lang/ru/icon_pm.gif similarity index 100% rename from upload/templates/default/images/lang/ru/icon_pm.gif rename to upload/styles/templates/default/images/lang/ru/icon_pm.gif diff --git a/upload/templates/default/images/lang/ru/icon_poll.gif b/upload/styles/templates/default/images/lang/ru/icon_poll.gif similarity index 100% rename from upload/templates/default/images/lang/ru/icon_poll.gif rename to upload/styles/templates/default/images/lang/ru/icon_poll.gif diff --git a/upload/templates/default/images/lang/ru/icon_profile.gif b/upload/styles/templates/default/images/lang/ru/icon_profile.gif similarity index 100% rename from upload/templates/default/images/lang/ru/icon_profile.gif rename to upload/styles/templates/default/images/lang/ru/icon_profile.gif diff --git a/upload/templates/default/images/lang/ru/icon_quote.gif b/upload/styles/templates/default/images/lang/ru/icon_quote.gif similarity index 100% rename from upload/templates/default/images/lang/ru/icon_quote.gif rename to upload/styles/templates/default/images/lang/ru/icon_quote.gif diff --git a/upload/templates/default/images/lang/ru/icon_search.gif b/upload/styles/templates/default/images/lang/ru/icon_search.gif similarity index 100% rename from upload/templates/default/images/lang/ru/icon_search.gif rename to upload/styles/templates/default/images/lang/ru/icon_search.gif diff --git a/upload/templates/default/images/lang/ru/icon_www.gif b/upload/styles/templates/default/images/lang/ru/icon_www.gif similarity index 100% rename from upload/templates/default/images/lang/ru/icon_www.gif rename to upload/styles/templates/default/images/lang/ru/icon_www.gif diff --git a/upload/templates/default/images/lang/ru/msg_newpost.gif b/upload/styles/templates/default/images/lang/ru/msg_newpost.gif similarity index 100% rename from upload/templates/default/images/lang/ru/msg_newpost.gif rename to upload/styles/templates/default/images/lang/ru/msg_newpost.gif diff --git a/upload/templates/default/images/lang/ru/post.gif b/upload/styles/templates/default/images/lang/ru/post.gif similarity index 100% rename from upload/templates/default/images/lang/ru/post.gif rename to upload/styles/templates/default/images/lang/ru/post.gif diff --git a/upload/templates/default/images/lang/ru/release.gif b/upload/styles/templates/default/images/lang/ru/release.gif similarity index 100% rename from upload/templates/default/images/lang/ru/release.gif rename to upload/styles/templates/default/images/lang/ru/release.gif diff --git a/upload/templates/default/images/lang/ru/reply-locked.gif b/upload/styles/templates/default/images/lang/ru/reply-locked.gif similarity index 100% rename from upload/templates/default/images/lang/ru/reply-locked.gif rename to upload/styles/templates/default/images/lang/ru/reply-locked.gif diff --git a/upload/templates/default/images/lang/ru/reply.gif b/upload/styles/templates/default/images/lang/ru/reply.gif similarity index 100% rename from upload/templates/default/images/lang/ru/reply.gif rename to upload/styles/templates/default/images/lang/ru/reply.gif diff --git a/upload/templates/default/images/lang/uk/icon_edit.gif b/upload/styles/templates/default/images/lang/uk/icon_edit.gif similarity index 100% rename from upload/templates/default/images/lang/uk/icon_edit.gif rename to upload/styles/templates/default/images/lang/uk/icon_edit.gif diff --git a/upload/templates/default/images/lang/uk/icon_email.gif b/upload/styles/templates/default/images/lang/uk/icon_email.gif similarity index 100% rename from upload/templates/default/images/lang/uk/icon_email.gif rename to upload/styles/templates/default/images/lang/uk/icon_email.gif diff --git a/upload/templates/default/images/lang/uk/icon_icq_add.gif b/upload/styles/templates/default/images/lang/uk/icon_icq_add.gif similarity index 100% rename from upload/templates/default/images/lang/uk/icon_icq_add.gif rename to upload/styles/templates/default/images/lang/uk/icon_icq_add.gif diff --git a/upload/templates/default/images/lang/uk/icon_ip.gif b/upload/styles/templates/default/images/lang/uk/icon_ip.gif similarity index 100% rename from upload/templates/default/images/lang/uk/icon_ip.gif rename to upload/styles/templates/default/images/lang/uk/icon_ip.gif diff --git a/upload/templates/default/images/lang/uk/icon_mc.gif b/upload/styles/templates/default/images/lang/uk/icon_mc.gif similarity index 100% rename from upload/templates/default/images/lang/uk/icon_mc.gif rename to upload/styles/templates/default/images/lang/uk/icon_mc.gif diff --git a/upload/templates/default/images/lang/uk/icon_pm.gif b/upload/styles/templates/default/images/lang/uk/icon_pm.gif similarity index 100% rename from upload/templates/default/images/lang/uk/icon_pm.gif rename to upload/styles/templates/default/images/lang/uk/icon_pm.gif diff --git a/upload/templates/default/images/lang/uk/icon_poll.gif b/upload/styles/templates/default/images/lang/uk/icon_poll.gif similarity index 100% rename from upload/templates/default/images/lang/uk/icon_poll.gif rename to upload/styles/templates/default/images/lang/uk/icon_poll.gif diff --git a/upload/templates/default/images/lang/uk/icon_profile.gif b/upload/styles/templates/default/images/lang/uk/icon_profile.gif similarity index 100% rename from upload/templates/default/images/lang/uk/icon_profile.gif rename to upload/styles/templates/default/images/lang/uk/icon_profile.gif diff --git a/upload/templates/default/images/lang/uk/icon_quote.gif b/upload/styles/templates/default/images/lang/uk/icon_quote.gif similarity index 100% rename from upload/templates/default/images/lang/uk/icon_quote.gif rename to upload/styles/templates/default/images/lang/uk/icon_quote.gif diff --git a/upload/templates/default/images/lang/uk/icon_search.gif b/upload/styles/templates/default/images/lang/uk/icon_search.gif similarity index 100% rename from upload/templates/default/images/lang/uk/icon_search.gif rename to upload/styles/templates/default/images/lang/uk/icon_search.gif diff --git a/upload/templates/default/images/lang/uk/icon_www.gif b/upload/styles/templates/default/images/lang/uk/icon_www.gif similarity index 100% rename from upload/templates/default/images/lang/uk/icon_www.gif rename to upload/styles/templates/default/images/lang/uk/icon_www.gif diff --git a/upload/templates/default/images/lang/uk/msg_newpost.gif b/upload/styles/templates/default/images/lang/uk/msg_newpost.gif similarity index 100% rename from upload/templates/default/images/lang/uk/msg_newpost.gif rename to upload/styles/templates/default/images/lang/uk/msg_newpost.gif diff --git a/upload/templates/default/images/lang/uk/post.gif b/upload/styles/templates/default/images/lang/uk/post.gif similarity index 100% rename from upload/templates/default/images/lang/uk/post.gif rename to upload/styles/templates/default/images/lang/uk/post.gif diff --git a/upload/templates/default/images/lang/uk/release.gif b/upload/styles/templates/default/images/lang/uk/release.gif similarity index 100% rename from upload/templates/default/images/lang/uk/release.gif rename to upload/styles/templates/default/images/lang/uk/release.gif diff --git a/upload/templates/default/images/lang/uk/reply-locked.gif b/upload/styles/templates/default/images/lang/uk/reply-locked.gif similarity index 100% rename from upload/templates/default/images/lang/uk/reply-locked.gif rename to upload/styles/templates/default/images/lang/uk/reply-locked.gif diff --git a/upload/templates/default/images/lang/uk/reply.gif b/upload/styles/templates/default/images/lang/uk/reply.gif similarity index 100% rename from upload/templates/default/images/lang/uk/reply.gif rename to upload/styles/templates/default/images/lang/uk/reply.gif diff --git a/upload/templates/default/images/link_help.cur b/upload/styles/templates/default/images/link_help.cur similarity index 100% rename from upload/templates/default/images/link_help.cur rename to upload/styles/templates/default/images/link_help.cur diff --git a/upload/templates/default/images/loading.gif b/upload/styles/templates/default/images/loading.gif similarity index 100% rename from upload/templates/default/images/loading.gif rename to upload/styles/templates/default/images/loading.gif diff --git a/upload/templates/default/images/loading_1.gif b/upload/styles/templates/default/images/loading_1.gif similarity index 100% rename from upload/templates/default/images/loading_1.gif rename to upload/styles/templates/default/images/loading_1.gif diff --git a/upload/templates/default/images/menu_open.gif b/upload/styles/templates/default/images/menu_open.gif similarity index 100% rename from upload/templates/default/images/menu_open.gif rename to upload/styles/templates/default/images/menu_open.gif diff --git a/upload/templates/default/images/menu_open_1.gif b/upload/styles/templates/default/images/menu_open_1.gif similarity index 100% rename from upload/templates/default/images/menu_open_1.gif rename to upload/styles/templates/default/images/menu_open_1.gif diff --git a/upload/templates/default/images/msg_inbox.gif b/upload/styles/templates/default/images/msg_inbox.gif similarity index 100% rename from upload/templates/default/images/msg_inbox.gif rename to upload/styles/templates/default/images/msg_inbox.gif diff --git a/upload/templates/default/images/msg_outbox.gif b/upload/styles/templates/default/images/msg_outbox.gif similarity index 100% rename from upload/templates/default/images/msg_outbox.gif rename to upload/styles/templates/default/images/msg_outbox.gif diff --git a/upload/templates/default/images/msg_savebox.gif b/upload/styles/templates/default/images/msg_savebox.gif similarity index 100% rename from upload/templates/default/images/msg_savebox.gif rename to upload/styles/templates/default/images/msg_savebox.gif diff --git a/upload/templates/default/images/msg_sentbox.gif b/upload/styles/templates/default/images/msg_sentbox.gif similarity index 100% rename from upload/templates/default/images/msg_sentbox.gif rename to upload/styles/templates/default/images/msg_sentbox.gif diff --git a/upload/templates/default/images/progress_bar.gif b/upload/styles/templates/default/images/progress_bar.gif similarity index 100% rename from upload/templates/default/images/progress_bar.gif rename to upload/styles/templates/default/images/progress_bar.gif diff --git a/upload/templates/default/images/progress_bar_full.gif b/upload/styles/templates/default/images/progress_bar_full.gif similarity index 100% rename from upload/templates/default/images/progress_bar_full.gif rename to upload/styles/templates/default/images/progress_bar_full.gif diff --git a/upload/templates/default/images/spacer.gif b/upload/styles/templates/default/images/spacer.gif similarity index 100% rename from upload/templates/default/images/spacer.gif rename to upload/styles/templates/default/images/spacer.gif diff --git a/upload/templates/default/images/tbl_sort_asc.gif b/upload/styles/templates/default/images/tbl_sort_asc.gif similarity index 100% rename from upload/templates/default/images/tbl_sort_asc.gif rename to upload/styles/templates/default/images/tbl_sort_asc.gif diff --git a/upload/templates/default/images/tbl_sort_bg.gif b/upload/styles/templates/default/images/tbl_sort_bg.gif similarity index 100% rename from upload/templates/default/images/tbl_sort_bg.gif rename to upload/styles/templates/default/images/tbl_sort_bg.gif diff --git a/upload/templates/default/images/tbl_sort_desc.gif b/upload/styles/templates/default/images/tbl_sort_desc.gif similarity index 100% rename from upload/templates/default/images/tbl_sort_desc.gif rename to upload/styles/templates/default/images/tbl_sort_desc.gif diff --git a/upload/templates/default/images/topic_delete.gif b/upload/styles/templates/default/images/topic_delete.gif similarity index 100% rename from upload/templates/default/images/topic_delete.gif rename to upload/styles/templates/default/images/topic_delete.gif diff --git a/upload/templates/default/images/topic_dl.gif b/upload/styles/templates/default/images/topic_dl.gif similarity index 100% rename from upload/templates/default/images/topic_dl.gif rename to upload/styles/templates/default/images/topic_dl.gif diff --git a/upload/templates/default/images/topic_lock.gif b/upload/styles/templates/default/images/topic_lock.gif similarity index 100% rename from upload/templates/default/images/topic_lock.gif rename to upload/styles/templates/default/images/topic_lock.gif diff --git a/upload/templates/default/images/topic_move.gif b/upload/styles/templates/default/images/topic_move.gif similarity index 100% rename from upload/templates/default/images/topic_move.gif rename to upload/styles/templates/default/images/topic_move.gif diff --git a/upload/templates/default/images/topic_normal.gif b/upload/styles/templates/default/images/topic_normal.gif similarity index 100% rename from upload/templates/default/images/topic_normal.gif rename to upload/styles/templates/default/images/topic_normal.gif diff --git a/upload/templates/default/images/topic_split.gif b/upload/styles/templates/default/images/topic_split.gif similarity index 100% rename from upload/templates/default/images/topic_split.gif rename to upload/styles/templates/default/images/topic_split.gif diff --git a/upload/templates/default/images/topic_unlock.gif b/upload/styles/templates/default/images/topic_unlock.gif similarity index 100% rename from upload/templates/default/images/topic_unlock.gif rename to upload/styles/templates/default/images/topic_unlock.gif diff --git a/upload/templates/default/images/treeview/treeview-default-line.gif b/upload/styles/templates/default/images/treeview/treeview-default-line.gif similarity index 100% rename from upload/templates/default/images/treeview/treeview-default-line.gif rename to upload/styles/templates/default/images/treeview/treeview-default-line.gif diff --git a/upload/templates/default/images/treeview/treeview-default.gif b/upload/styles/templates/default/images/treeview/treeview-default.gif similarity index 100% rename from upload/templates/default/images/treeview/treeview-default.gif rename to upload/styles/templates/default/images/treeview/treeview-default.gif diff --git a/upload/templates/default/images/vote_lcap.gif b/upload/styles/templates/default/images/vote_lcap.gif similarity index 100% rename from upload/templates/default/images/vote_lcap.gif rename to upload/styles/templates/default/images/vote_lcap.gif diff --git a/upload/templates/default/images/vote_rcap.gif b/upload/styles/templates/default/images/vote_rcap.gif similarity index 100% rename from upload/templates/default/images/vote_rcap.gif rename to upload/styles/templates/default/images/vote_rcap.gif diff --git a/upload/templates/default/images/voting_bar.gif b/upload/styles/templates/default/images/voting_bar.gif similarity index 100% rename from upload/templates/default/images/voting_bar.gif rename to upload/styles/templates/default/images/voting_bar.gif diff --git a/upload/templates/default/images/whosonline.gif b/upload/styles/templates/default/images/whosonline.gif similarity index 100% rename from upload/templates/default/images/whosonline.gif rename to upload/styles/templates/default/images/whosonline.gif diff --git a/upload/templates/default/index.tpl b/upload/styles/templates/default/index.tpl similarity index 100% rename from upload/templates/default/index.tpl rename to upload/styles/templates/default/index.tpl diff --git a/upload/templates/default/index_map.tpl b/upload/styles/templates/default/index_map.tpl similarity index 100% rename from upload/templates/default/index_map.tpl rename to upload/styles/templates/default/index_map.tpl diff --git a/upload/templates/default/login.tpl b/upload/styles/templates/default/login.tpl similarity index 100% rename from upload/templates/default/login.tpl rename to upload/styles/templates/default/login.tpl diff --git a/upload/templates/default/memberlist.tpl b/upload/styles/templates/default/memberlist.tpl similarity index 100% rename from upload/templates/default/memberlist.tpl rename to upload/styles/templates/default/memberlist.tpl diff --git a/upload/templates/default/modcp.tpl b/upload/styles/templates/default/modcp.tpl similarity index 100% rename from upload/templates/default/modcp.tpl rename to upload/styles/templates/default/modcp.tpl diff --git a/upload/templates/default/modcp_split.tpl b/upload/styles/templates/default/modcp_split.tpl similarity index 100% rename from upload/templates/default/modcp_split.tpl rename to upload/styles/templates/default/modcp_split.tpl diff --git a/upload/templates/default/page_footer.tpl b/upload/styles/templates/default/page_footer.tpl similarity index 100% rename from upload/templates/default/page_footer.tpl rename to upload/styles/templates/default/page_footer.tpl diff --git a/upload/templates/default/page_header.tpl b/upload/styles/templates/default/page_header.tpl similarity index 100% rename from upload/templates/default/page_header.tpl rename to upload/styles/templates/default/page_header.tpl diff --git a/upload/templates/default/posting.tpl b/upload/styles/templates/default/posting.tpl similarity index 100% rename from upload/templates/default/posting.tpl rename to upload/styles/templates/default/posting.tpl diff --git a/upload/templates/default/posting_attach.tpl b/upload/styles/templates/default/posting_attach.tpl similarity index 100% rename from upload/templates/default/posting_attach.tpl rename to upload/styles/templates/default/posting_attach.tpl diff --git a/upload/templates/default/posting_editor.tpl b/upload/styles/templates/default/posting_editor.tpl similarity index 100% rename from upload/templates/default/posting_editor.tpl rename to upload/styles/templates/default/posting_editor.tpl diff --git a/upload/templates/default/posting_smilies.tpl b/upload/styles/templates/default/posting_smilies.tpl similarity index 100% rename from upload/templates/default/posting_smilies.tpl rename to upload/styles/templates/default/posting_smilies.tpl diff --git a/upload/templates/default/privmsgs.tpl b/upload/styles/templates/default/privmsgs.tpl similarity index 100% rename from upload/templates/default/privmsgs.tpl rename to upload/styles/templates/default/privmsgs.tpl diff --git a/upload/templates/default/privmsgs_read.tpl b/upload/styles/templates/default/privmsgs_read.tpl similarity index 100% rename from upload/templates/default/privmsgs_read.tpl rename to upload/styles/templates/default/privmsgs_read.tpl diff --git a/upload/templates/default/search.tpl b/upload/styles/templates/default/search.tpl similarity index 100% rename from upload/templates/default/search.tpl rename to upload/styles/templates/default/search.tpl diff --git a/upload/templates/default/search_results.tpl b/upload/styles/templates/default/search_results.tpl similarity index 100% rename from upload/templates/default/search_results.tpl rename to upload/styles/templates/default/search_results.tpl diff --git a/upload/templates/default/terms.tpl b/upload/styles/templates/default/terms.tpl similarity index 100% rename from upload/templates/default/terms.tpl rename to upload/styles/templates/default/terms.tpl diff --git a/upload/templates/default/torhelp.tpl b/upload/styles/templates/default/torhelp.tpl similarity index 100% rename from upload/templates/default/torhelp.tpl rename to upload/styles/templates/default/torhelp.tpl diff --git a/upload/templates/default/tpl_config.php b/upload/styles/templates/default/tpl_config.php similarity index 100% rename from upload/templates/default/tpl_config.php rename to upload/styles/templates/default/tpl_config.php diff --git a/upload/templates/default/tracker.tpl b/upload/styles/templates/default/tracker.tpl similarity index 100% rename from upload/templates/default/tracker.tpl rename to upload/styles/templates/default/tracker.tpl diff --git a/upload/templates/default/usercp_bonus.tpl b/upload/styles/templates/default/usercp_bonus.tpl similarity index 100% rename from upload/templates/default/usercp_bonus.tpl rename to upload/styles/templates/default/usercp_bonus.tpl diff --git a/upload/templates/default/usercp_email.tpl b/upload/styles/templates/default/usercp_email.tpl similarity index 100% rename from upload/templates/default/usercp_email.tpl rename to upload/styles/templates/default/usercp_email.tpl diff --git a/upload/templates/default/usercp_register.tpl b/upload/styles/templates/default/usercp_register.tpl similarity index 100% rename from upload/templates/default/usercp_register.tpl rename to upload/styles/templates/default/usercp_register.tpl diff --git a/upload/templates/default/usercp_sendpasswd.tpl b/upload/styles/templates/default/usercp_sendpasswd.tpl similarity index 100% rename from upload/templates/default/usercp_sendpasswd.tpl rename to upload/styles/templates/default/usercp_sendpasswd.tpl diff --git a/upload/templates/default/usercp_topic_watch.tpl b/upload/styles/templates/default/usercp_topic_watch.tpl similarity index 100% rename from upload/templates/default/usercp_topic_watch.tpl rename to upload/styles/templates/default/usercp_topic_watch.tpl diff --git a/upload/templates/default/usercp_viewprofile.tpl b/upload/styles/templates/default/usercp_viewprofile.tpl similarity index 100% rename from upload/templates/default/usercp_viewprofile.tpl rename to upload/styles/templates/default/usercp_viewprofile.tpl diff --git a/upload/templates/default/viewforum.tpl b/upload/styles/templates/default/viewforum.tpl similarity index 100% rename from upload/templates/default/viewforum.tpl rename to upload/styles/templates/default/viewforum.tpl diff --git a/upload/templates/default/viewtopic.tpl b/upload/styles/templates/default/viewtopic.tpl similarity index 100% rename from upload/templates/default/viewtopic.tpl rename to upload/styles/templates/default/viewtopic.tpl diff --git a/upload/templates/default/viewtopic_attach.tpl b/upload/styles/templates/default/viewtopic_attach.tpl similarity index 100% rename from upload/templates/default/viewtopic_attach.tpl rename to upload/styles/templates/default/viewtopic_attach.tpl diff --git a/upload/templates/default/viewtopic_attach_guest.tpl b/upload/styles/templates/default/viewtopic_attach_guest.tpl similarity index 100% rename from upload/templates/default/viewtopic_attach_guest.tpl rename to upload/styles/templates/default/viewtopic_attach_guest.tpl diff --git a/upload/templates/default/viewtopic_poll.tpl b/upload/styles/templates/default/viewtopic_poll.tpl similarity index 100% rename from upload/templates/default/viewtopic_poll.tpl rename to upload/styles/templates/default/viewtopic_poll.tpl diff --git a/upload/templates/default/viewtopic_torrent.tpl b/upload/styles/templates/default/viewtopic_torrent.tpl similarity index 100% rename from upload/templates/default/viewtopic_torrent.tpl rename to upload/styles/templates/default/viewtopic_torrent.tpl diff --git a/upload/templates/posting_tpl.tpl b/upload/styles/templates/posting_tpl.tpl similarity index 100% rename from upload/templates/posting_tpl.tpl rename to upload/styles/templates/posting_tpl.tpl From 68b722be83632d236d59acbd1f38d64589f93bb7 Mon Sep 17 00:00:00 2001 From: Exile Date: Thu, 25 Sep 2014 15:45:18 +0400 Subject: [PATCH 04/17] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BE?= =?UTF-8?q?=D0=BA.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- upload/admin/admin_sitemap.php | 4 ++-- upload/library/ajax/sitemap.php | 2 +- upload/library/config.php | 18 +++++++++--------- upload/library/includes/bbcode.php | 2 +- upload/library/includes/functions.php | 4 ++-- upload/robots.txt | 2 +- .../bootstrap/css/bootstrap-theme.css | 0 .../bootstrap/css/bootstrap-theme.css.map | 0 .../bootstrap/css/bootstrap-theme.min.css | 0 .../{misc => }/bootstrap/css/bootstrap.css | 0 .../bootstrap/css/bootstrap.css.map | 0 .../bootstrap/css/bootstrap.min.css | 0 .../fonts/glyphicons-halflings-regular.eot | Bin .../fonts/glyphicons-halflings-regular.svg | 0 .../fonts/glyphicons-halflings-regular.ttf | Bin .../fonts/glyphicons-halflings-regular.woff | Bin .../{misc => }/bootstrap/js/bootstrap.js | 0 .../{misc => }/bootstrap/js/bootstrap.min.js | 0 upload/styles/{misc => }/js/bbcode.js | 0 upload/styles/{misc => }/js/jquery.pack.js | 0 upload/styles/{misc => }/js/main.js | 0 .../styles/templates/default/page_header.tpl | 6 +++--- .../styles/templates/default/tpl_config.php | 6 +++--- 23 files changed, 22 insertions(+), 22 deletions(-) rename upload/styles/{misc => }/bootstrap/css/bootstrap-theme.css (100%) rename upload/styles/{misc => }/bootstrap/css/bootstrap-theme.css.map (100%) rename upload/styles/{misc => }/bootstrap/css/bootstrap-theme.min.css (100%) rename upload/styles/{misc => }/bootstrap/css/bootstrap.css (100%) rename upload/styles/{misc => }/bootstrap/css/bootstrap.css.map (100%) rename upload/styles/{misc => }/bootstrap/css/bootstrap.min.css (100%) rename upload/styles/{misc => }/bootstrap/fonts/glyphicons-halflings-regular.eot (100%) rename upload/styles/{misc => }/bootstrap/fonts/glyphicons-halflings-regular.svg (100%) rename upload/styles/{misc => }/bootstrap/fonts/glyphicons-halflings-regular.ttf (100%) rename upload/styles/{misc => }/bootstrap/fonts/glyphicons-halflings-regular.woff (100%) rename upload/styles/{misc => }/bootstrap/js/bootstrap.js (100%) rename upload/styles/{misc => }/bootstrap/js/bootstrap.min.js (100%) rename upload/styles/{misc => }/js/bbcode.js (100%) rename upload/styles/{misc => }/js/jquery.pack.js (100%) rename upload/styles/{misc => }/js/main.js (100%) diff --git a/upload/admin/admin_sitemap.php b/upload/admin/admin_sitemap.php index 0354e5792..3976758af 100644 --- a/upload/admin/admin_sitemap.php +++ b/upload/admin/admin_sitemap.php @@ -41,8 +41,8 @@ else } } -$s_mess = $lang['SITEMAP_CREATED'].': '.bb_date($new['sitemap_time'], $bb_cfg['post_date_format']).' '.$lang['SITEMAP_AVAILABLE'].': '.make_url('/sitemap/sitemap.xml').''; -$message = (@file_exists(BB_ROOT. "/sitemap/sitemap.xml")) ? $s_mess : $lang['SITEMAP_NOT_CREATED']; +$s_mess = $lang['SITEMAP_CREATED'].': '.bb_date($new['sitemap_time'], $bb_cfg['post_date_format']).' '.$lang['SITEMAP_AVAILABLE'].': '.make_url('sitemap.xml').''; +$message = (@file_exists(BB_ROOT. "/internal_data/sitemap/sitemap.xml")) ? $s_mess : $lang['SITEMAP_NOT_CREATED']; $template->assign_vars(array( 'STATIC_SITEMAP' => $new['static_sitemap'], diff --git a/upload/library/ajax/sitemap.php b/upload/library/ajax/sitemap.php index 0c2fcea90..45decf5f7 100644 --- a/upload/library/ajax/sitemap.php +++ b/upload/library/ajax/sitemap.php @@ -14,7 +14,7 @@ switch ($mode) $map->create(); if (@file_exists(SITEMAP_DIR. 'sitemap.xml')) { - $html .= $lang['SITEMAP_CREATED'].': '.bb_date(TIMENOW, $bb_cfg['post_date_format']).' '.$lang['SITEMAP_AVAILABLE'].': '.make_url('/sitemap/sitemap.xml').''; + $html .= $lang['SITEMAP_CREATED'].': '.bb_date(TIMENOW, $bb_cfg['post_date_format']).' '.$lang['SITEMAP_AVAILABLE'].': '.make_url('sitemap.xml').''; } else { $html .= $lang['SITEMAP_NOT_CREATED']; } diff --git a/upload/library/config.php b/upload/library/config.php index 0f5eb2bac..1308413fd 100644 --- a/upload/library/config.php +++ b/upload/library/config.php @@ -205,8 +205,8 @@ $bb_cfg['seeder_last_seen_days_keep'] = 0; // сколько дней наза $bb_cfg['seeder_never_seen_days_keep'] = 0; // сколько дней имеется статус "Сида не было никогда" // Ratio limits -define('TR_RATING_LIMITS', true); // ON/OFF -define('MIN_DL_FOR_RATIO', 10737418240); // 10 GB in bytes, 0 - disable +define('TR_RATING_LIMITS', true); // ON/OFF +define('MIN_DL_FOR_RATIO', 10737418240); // 10 GB in bytes, 0 - disable // Don't change the order of ratios (from 0 to 1) // rating < 0.4 -- allow only 1 torrent for leeching @@ -226,10 +226,10 @@ $bb_cfg['dl_complete_days_keep'] = 180; $bb_cfg['dl_cancel_days_keep'] = 30; // Tor-Stats -$bb_cfg['torstat_days_keep'] = 60; // days to keep user's per-torrent stats +$bb_cfg['torstat_days_keep'] = 60; // days to keep user's per-torrent stats // Tor-Help -$bb_cfg['torhelp_enabled'] = false; // find dead torrents (without seeder) that user might help seeding +$bb_cfg['torhelp_enabled'] = false; // find dead torrents (without seeder) that user might help seeding $page_cfg['show_torhelp'] = array( # BB_SCRIPT => true @@ -524,8 +524,8 @@ $bb_cfg['ad_blocks'] = array( // Attachments $bb_cfg['attach'] = array( - 'upload_path' => BB_ROOT . 'torrents', // without '/' - 'max_size' => 250*1024, // bytes + 'upload_path' => DATA_DIR . 'torrent_files', // without '/' + 'max_size' => 250*1024, // bytes ); $bb_cfg['file_id_ext'] = array( @@ -551,7 +551,7 @@ $bb_cfg['avatars'] = array( 'max_height' => 100, // высота аватара в px 'max_width' => 100, // ширина аватара в px 'no_avatar' => 'gallery/noavatar.png', // дефолтная аватара - 'upload_path' => DATA_DIR . 'avatars/', // путь к директории с аватарами + 'upload_path' => BB_ROOT . 'data/avatars/', // путь к директории с аватарами 'up_allowed' => true, // разрешить загрузку аватар ); @@ -562,7 +562,7 @@ $bb_cfg['group_avatars'] = array( 'max_height' => 300, // высота аватара в px 'max_width' => 300, // ширина аватара в px 'no_avatar' => 'gallery/noavatar.png', // дефолтная аватара - 'upload_path' => DATA_DIR . 'avatars/', // путь к директории с аватарами + 'upload_path' => BB_ROOT . 'data/avatars/', // путь к директории с аватарами 'up_allowed' => true, // разрешить загрузку аватар ); @@ -606,8 +606,8 @@ $bb_cfg['advert_url'] = 'info.php?show=advert'; $bb_cfg['captcha'] = array( 'disabled' => false, 'secret_key' => 'secret_key', - 'img_url' => './internal_data/captcha/', # with '/' 'img_path' => INT_DATA_DIR .'captcha/', # with '/' + 'img_url' => './internal_data/captcha/', # with '/' ); // Atom feed diff --git a/upload/library/includes/bbcode.php b/upload/library/includes/bbcode.php index cc07348c2..9a136935b 100644 --- a/upload/library/includes/bbcode.php +++ b/upload/library/includes/bbcode.php @@ -863,7 +863,7 @@ class words_rate function words_rate () { // слова начинающиеся на.. - $del_list = file_get_contents(BB_ROOT .'/misc/words_rate_del_list.txt'); + $del_list = file_get_contents(BB_ROOT .'/library/words_rate_del_list.txt'); $del_list = str_compact($del_list); $del_list = str_replace(' ', '|', preg_quote($del_list, '/')); $del_exp = '/\b('.$del_list.')[\w\-]*/i'; diff --git a/upload/library/includes/functions.php b/upload/library/includes/functions.php index bb7aaea27..23f9e4873 100644 --- a/upload/library/includes/functions.php +++ b/upload/library/includes/functions.php @@ -1542,11 +1542,11 @@ function setup_style () } $template = new Template(TEMPLATES_DIR . $tpl_dir_name); - $css_dir = basename(TEMPLATES_DIR) ."/$tpl_dir_name/css/"; + $css_dir = 'styles/' . basename(TEMPLATES_DIR) . '/' . $tpl_dir_name . '/css/'; $template->assign_vars(array( 'BB_ROOT' => BB_ROOT, - 'SPACER' => make_url('/images/spacer.gif'), + 'SPACER' => make_url('styles/images/spacer.gif'), 'STYLESHEET' => make_url($css_dir . $stylesheet), 'EXT_LINK_NEW_WIN' => $bb_cfg['ext_link_new_win'], 'TPL_DIR' => make_url($css_dir), diff --git a/upload/robots.txt b/upload/robots.txt index b7d377cec..033673ab4 100644 --- a/upload/robots.txt +++ b/upload/robots.txt @@ -9,4 +9,4 @@ Disallow: /privmsg.php Disallow: /profile.php Host: torrentpier.me -Sitemap: http://torrentpier.me/sitemap/sitemap.xml \ No newline at end of file +Sitemap: http://torrentpier.me/sitemap.xml \ No newline at end of file diff --git a/upload/styles/misc/bootstrap/css/bootstrap-theme.css b/upload/styles/bootstrap/css/bootstrap-theme.css similarity index 100% rename from upload/styles/misc/bootstrap/css/bootstrap-theme.css rename to upload/styles/bootstrap/css/bootstrap-theme.css diff --git a/upload/styles/misc/bootstrap/css/bootstrap-theme.css.map b/upload/styles/bootstrap/css/bootstrap-theme.css.map similarity index 100% rename from upload/styles/misc/bootstrap/css/bootstrap-theme.css.map rename to upload/styles/bootstrap/css/bootstrap-theme.css.map diff --git a/upload/styles/misc/bootstrap/css/bootstrap-theme.min.css b/upload/styles/bootstrap/css/bootstrap-theme.min.css similarity index 100% rename from upload/styles/misc/bootstrap/css/bootstrap-theme.min.css rename to upload/styles/bootstrap/css/bootstrap-theme.min.css diff --git a/upload/styles/misc/bootstrap/css/bootstrap.css b/upload/styles/bootstrap/css/bootstrap.css similarity index 100% rename from upload/styles/misc/bootstrap/css/bootstrap.css rename to upload/styles/bootstrap/css/bootstrap.css diff --git a/upload/styles/misc/bootstrap/css/bootstrap.css.map b/upload/styles/bootstrap/css/bootstrap.css.map similarity index 100% rename from upload/styles/misc/bootstrap/css/bootstrap.css.map rename to upload/styles/bootstrap/css/bootstrap.css.map diff --git a/upload/styles/misc/bootstrap/css/bootstrap.min.css b/upload/styles/bootstrap/css/bootstrap.min.css similarity index 100% rename from upload/styles/misc/bootstrap/css/bootstrap.min.css rename to upload/styles/bootstrap/css/bootstrap.min.css diff --git a/upload/styles/misc/bootstrap/fonts/glyphicons-halflings-regular.eot b/upload/styles/bootstrap/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from upload/styles/misc/bootstrap/fonts/glyphicons-halflings-regular.eot rename to upload/styles/bootstrap/fonts/glyphicons-halflings-regular.eot diff --git a/upload/styles/misc/bootstrap/fonts/glyphicons-halflings-regular.svg b/upload/styles/bootstrap/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from upload/styles/misc/bootstrap/fonts/glyphicons-halflings-regular.svg rename to upload/styles/bootstrap/fonts/glyphicons-halflings-regular.svg diff --git a/upload/styles/misc/bootstrap/fonts/glyphicons-halflings-regular.ttf b/upload/styles/bootstrap/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from upload/styles/misc/bootstrap/fonts/glyphicons-halflings-regular.ttf rename to upload/styles/bootstrap/fonts/glyphicons-halflings-regular.ttf diff --git a/upload/styles/misc/bootstrap/fonts/glyphicons-halflings-regular.woff b/upload/styles/bootstrap/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from upload/styles/misc/bootstrap/fonts/glyphicons-halflings-regular.woff rename to upload/styles/bootstrap/fonts/glyphicons-halflings-regular.woff diff --git a/upload/styles/misc/bootstrap/js/bootstrap.js b/upload/styles/bootstrap/js/bootstrap.js similarity index 100% rename from upload/styles/misc/bootstrap/js/bootstrap.js rename to upload/styles/bootstrap/js/bootstrap.js diff --git a/upload/styles/misc/bootstrap/js/bootstrap.min.js b/upload/styles/bootstrap/js/bootstrap.min.js similarity index 100% rename from upload/styles/misc/bootstrap/js/bootstrap.min.js rename to upload/styles/bootstrap/js/bootstrap.min.js diff --git a/upload/styles/misc/js/bbcode.js b/upload/styles/js/bbcode.js similarity index 100% rename from upload/styles/misc/js/bbcode.js rename to upload/styles/js/bbcode.js diff --git a/upload/styles/misc/js/jquery.pack.js b/upload/styles/js/jquery.pack.js similarity index 100% rename from upload/styles/misc/js/jquery.pack.js rename to upload/styles/js/jquery.pack.js diff --git a/upload/styles/misc/js/main.js b/upload/styles/js/main.js similarity index 100% rename from upload/styles/misc/js/main.js rename to upload/styles/js/main.js diff --git a/upload/styles/templates/default/page_header.tpl b/upload/styles/templates/default/page_header.tpl index dcb0c3c44..9ec0bad85 100644 --- a/upload/styles/templates/default/page_header.tpl +++ b/upload/styles/templates/default/page_header.tpl @@ -11,11 +11,11 @@ - - + + - +