diff --git a/install/sql/mysql.sql b/install/sql/mysql.sql index 08af7c232..9e0be35e4 100644 --- a/install/sql/mysql.sql +++ b/install/sql/mysql.sql @@ -105,7 +105,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', 'upload/torrent_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/common.php b/upload/common.php index b30bd090d..246051c24 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 .'data/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/includes/.htaccess b/upload/data/.htaccess similarity index 100% rename from upload/includes/.htaccess rename to upload/data/.htaccess diff --git a/upload/ajax/avatar.php b/upload/data/ajax/avatar.php similarity index 100% rename from upload/ajax/avatar.php rename to upload/data/ajax/avatar.php diff --git a/upload/ajax/change_tor_status.php b/upload/data/ajax/change_tor_status.php similarity index 100% rename from upload/ajax/change_tor_status.php rename to upload/data/ajax/change_tor_status.php diff --git a/upload/ajax/change_torrent.php b/upload/data/ajax/change_torrent.php similarity index 100% rename from upload/ajax/change_torrent.php rename to upload/data/ajax/change_torrent.php diff --git a/upload/ajax/change_user_opt.php b/upload/data/ajax/change_user_opt.php similarity index 100% rename from upload/ajax/change_user_opt.php rename to upload/data/ajax/change_user_opt.php diff --git a/upload/ajax/change_user_rank.php b/upload/data/ajax/change_user_rank.php similarity index 100% rename from upload/ajax/change_user_rank.php rename to upload/data/ajax/change_user_rank.php diff --git a/upload/ajax/edit_group_profile.php b/upload/data/ajax/edit_group_profile.php similarity index 100% rename from upload/ajax/edit_group_profile.php rename to upload/data/ajax/edit_group_profile.php diff --git a/upload/ajax/edit_user_profile.php b/upload/data/ajax/edit_user_profile.php similarity index 100% rename from upload/ajax/edit_user_profile.php rename to upload/data/ajax/edit_user_profile.php diff --git a/upload/ajax/gen_passkey.php b/upload/data/ajax/gen_passkey.php similarity index 100% rename from upload/ajax/gen_passkey.php rename to upload/data/ajax/gen_passkey.php diff --git a/upload/ajax/group_membership.php b/upload/data/ajax/group_membership.php similarity index 100% rename from upload/ajax/group_membership.php rename to upload/data/ajax/group_membership.php diff --git a/upload/ajax/html/jumpbox_guest.html b/upload/data/ajax/html/jumpbox_guest.html similarity index 100% rename from upload/ajax/html/jumpbox_guest.html rename to upload/data/ajax/html/jumpbox_guest.html diff --git a/upload/ajax/html/jumpbox_user.html b/upload/data/ajax/html/jumpbox_user.html similarity index 100% rename from upload/ajax/html/jumpbox_user.html rename to upload/data/ajax/html/jumpbox_user.html diff --git a/upload/ajax/index_data.php b/upload/data/ajax/index_data.php similarity index 100% rename from upload/ajax/index_data.php rename to upload/data/ajax/index_data.php diff --git a/upload/ajax/manage_admin.php b/upload/data/ajax/manage_admin.php similarity index 100% rename from upload/ajax/manage_admin.php rename to upload/data/ajax/manage_admin.php diff --git a/upload/ajax/manage_user.php b/upload/data/ajax/manage_user.php similarity index 100% rename from upload/ajax/manage_user.php rename to upload/data/ajax/manage_user.php diff --git a/upload/ajax/mod_action.php b/upload/data/ajax/mod_action.php similarity index 100% rename from upload/ajax/mod_action.php rename to upload/data/ajax/mod_action.php diff --git a/upload/ajax/post_mod_comment.php b/upload/data/ajax/post_mod_comment.php similarity index 100% rename from upload/ajax/post_mod_comment.php rename to upload/data/ajax/post_mod_comment.php diff --git a/upload/ajax/posts.php b/upload/data/ajax/posts.php similarity index 100% rename from upload/ajax/posts.php rename to upload/data/ajax/posts.php diff --git a/upload/ajax/sitemap.php b/upload/data/ajax/sitemap.php similarity index 93% rename from upload/ajax/sitemap.php rename to upload/data/ajax/sitemap.php index 185944a0b..c1594d48d 100644 --- a/upload/ajax/sitemap.php +++ b/upload/data/ajax/sitemap.php @@ -12,8 +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 { $html .= $lang['SITEMAP_NOT_CREATED']; @@ -21,12 +20,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/data/ajax/topic_tpl.php similarity index 100% rename from upload/ajax/topic_tpl.php rename to upload/data/ajax/topic_tpl.php diff --git a/upload/ajax/user_register.php b/upload/data/ajax/user_register.php similarity index 100% rename from upload/ajax/user_register.php rename to upload/data/ajax/user_register.php diff --git a/upload/ajax/view_post.php b/upload/data/ajax/view_post.php similarity index 100% rename from upload/ajax/view_post.php rename to upload/data/ajax/view_post.php diff --git a/upload/ajax/view_torrent.php b/upload/data/ajax/view_torrent.php similarity index 100% rename from upload/ajax/view_torrent.php rename to upload/data/ajax/view_torrent.php diff --git a/upload/config.php b/upload/data/config.php similarity index 96% rename from upload/config.php rename to upload/data/config.php index a1586e0e7..3b4ddbb80 100644 --- a/upload/config.php +++ b/upload/data/config.php @@ -247,16 +247,19 @@ $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) ); // 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 .'/data/includes/' ); +define('LANG_ROOT_DIR', BB_PATH .'/data/language/' ); +define('LOG_DIR', BB_PATH .'/data/log/' ); +define('TEMPLATES_DIR', BB_PATH .'/templates/' ); +define('TRIGGERS_DIR', BB_PATH .'/triggers/' ); +define('SITEMAP_DIR', BB_PATH .'/upload/sitemap/'); +define('AJAX_HTML_DIR', BB_PATH .'/data/ajax/html/'); +define('AJAX_DIR', BB_PATH .'/data/ajax/' ); // URL's $bb_cfg['ajax_url'] = 'ajax.php'; # "http://{$_SERVER['SERVER_NAME']}/ajax.php" @@ -367,10 +370,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) diff --git a/upload/includes/captcha/.htaccess b/upload/data/includes/.htaccess similarity index 100% rename from upload/includes/captcha/.htaccess rename to upload/data/includes/.htaccess diff --git a/upload/includes/api.sphinx.php b/upload/data/includes/api.sphinx.php old mode 100755 new mode 100644 similarity index 100% rename from upload/includes/api.sphinx.php rename to upload/data/includes/api.sphinx.php diff --git a/upload/includes/bbcode.php b/upload/data/includes/bbcode.php similarity index 100% rename from upload/includes/bbcode.php rename to upload/data/includes/bbcode.php diff --git a/upload/includes/cron/.htaccess b/upload/data/includes/captcha/.htaccess similarity index 100% rename from upload/includes/cron/.htaccess rename to upload/data/includes/captcha/.htaccess diff --git a/upload/includes/captcha/captcha.php b/upload/data/includes/captcha/captcha.php similarity index 100% rename from upload/includes/captcha/captcha.php rename to upload/data/includes/captcha/captcha.php diff --git a/upload/includes/captcha/kcaptcha/fonts/antiqua.png b/upload/data/includes/captcha/kcaptcha/fonts/antiqua.png similarity index 100% rename from upload/includes/captcha/kcaptcha/fonts/antiqua.png rename to upload/data/includes/captcha/kcaptcha/fonts/antiqua.png diff --git a/upload/includes/captcha/kcaptcha/fonts/baskerville.png b/upload/data/includes/captcha/kcaptcha/fonts/baskerville.png similarity index 100% rename from upload/includes/captcha/kcaptcha/fonts/baskerville.png rename to upload/data/includes/captcha/kcaptcha/fonts/baskerville.png diff --git a/upload/includes/captcha/kcaptcha/fonts/batang.png b/upload/data/includes/captcha/kcaptcha/fonts/batang.png similarity index 100% rename from upload/includes/captcha/kcaptcha/fonts/batang.png rename to upload/data/includes/captcha/kcaptcha/fonts/batang.png diff --git a/upload/includes/captcha/kcaptcha/fonts/bookman.png b/upload/data/includes/captcha/kcaptcha/fonts/bookman.png similarity index 100% rename from upload/includes/captcha/kcaptcha/fonts/bookman.png rename to upload/data/includes/captcha/kcaptcha/fonts/bookman.png diff --git a/upload/includes/captcha/kcaptcha/fonts/calisto.png b/upload/data/includes/captcha/kcaptcha/fonts/calisto.png similarity index 100% rename from upload/includes/captcha/kcaptcha/fonts/calisto.png rename to upload/data/includes/captcha/kcaptcha/fonts/calisto.png diff --git a/upload/includes/captcha/kcaptcha/fonts/cambria.png b/upload/data/includes/captcha/kcaptcha/fonts/cambria.png similarity index 100% rename from upload/includes/captcha/kcaptcha/fonts/cambria.png rename to upload/data/includes/captcha/kcaptcha/fonts/cambria.png diff --git a/upload/includes/captcha/kcaptcha/fonts/centaur.png b/upload/data/includes/captcha/kcaptcha/fonts/centaur.png similarity index 100% rename from upload/includes/captcha/kcaptcha/fonts/centaur.png rename to upload/data/includes/captcha/kcaptcha/fonts/centaur.png diff --git a/upload/includes/captcha/kcaptcha/fonts/century.png b/upload/data/includes/captcha/kcaptcha/fonts/century.png similarity index 100% rename from upload/includes/captcha/kcaptcha/fonts/century.png rename to upload/data/includes/captcha/kcaptcha/fonts/century.png diff --git a/upload/includes/captcha/kcaptcha/fonts/chaparral.png b/upload/data/includes/captcha/kcaptcha/fonts/chaparral.png similarity index 100% rename from upload/includes/captcha/kcaptcha/fonts/chaparral.png rename to upload/data/includes/captcha/kcaptcha/fonts/chaparral.png diff --git a/upload/includes/captcha/kcaptcha/fonts/constantia.png b/upload/data/includes/captcha/kcaptcha/fonts/constantia.png similarity index 100% rename from upload/includes/captcha/kcaptcha/fonts/constantia.png rename to upload/data/includes/captcha/kcaptcha/fonts/constantia.png diff --git a/upload/includes/captcha/kcaptcha/fonts/footlight.png b/upload/data/includes/captcha/kcaptcha/fonts/footlight.png similarity index 100% rename from upload/includes/captcha/kcaptcha/fonts/footlight.png rename to upload/data/includes/captcha/kcaptcha/fonts/footlight.png diff --git a/upload/includes/captcha/kcaptcha/fonts/garamond.png b/upload/data/includes/captcha/kcaptcha/fonts/garamond.png similarity index 100% rename from upload/includes/captcha/kcaptcha/fonts/garamond.png rename to upload/data/includes/captcha/kcaptcha/fonts/garamond.png diff --git a/upload/includes/captcha/kcaptcha/fonts/georgia.png b/upload/data/includes/captcha/kcaptcha/fonts/georgia.png similarity index 100% rename from upload/includes/captcha/kcaptcha/fonts/georgia.png rename to upload/data/includes/captcha/kcaptcha/fonts/georgia.png diff --git a/upload/includes/captcha/kcaptcha/fonts/goudy_old.png b/upload/data/includes/captcha/kcaptcha/fonts/goudy_old.png similarity index 100% rename from upload/includes/captcha/kcaptcha/fonts/goudy_old.png rename to upload/data/includes/captcha/kcaptcha/fonts/goudy_old.png diff --git a/upload/includes/captcha/kcaptcha/fonts/kozuka.png b/upload/data/includes/captcha/kcaptcha/fonts/kozuka.png similarity index 100% rename from upload/includes/captcha/kcaptcha/fonts/kozuka.png rename to upload/data/includes/captcha/kcaptcha/fonts/kozuka.png diff --git a/upload/includes/captcha/kcaptcha/fonts/lucida.png b/upload/data/includes/captcha/kcaptcha/fonts/lucida.png similarity index 100% rename from upload/includes/captcha/kcaptcha/fonts/lucida.png rename to upload/data/includes/captcha/kcaptcha/fonts/lucida.png diff --git a/upload/includes/captcha/kcaptcha/fonts/minion.png b/upload/data/includes/captcha/kcaptcha/fonts/minion.png similarity index 100% rename from upload/includes/captcha/kcaptcha/fonts/minion.png rename to upload/data/includes/captcha/kcaptcha/fonts/minion.png diff --git a/upload/includes/captcha/kcaptcha/fonts/palatino.png b/upload/data/includes/captcha/kcaptcha/fonts/palatino.png similarity index 100% rename from upload/includes/captcha/kcaptcha/fonts/palatino.png rename to upload/data/includes/captcha/kcaptcha/fonts/palatino.png diff --git a/upload/includes/captcha/kcaptcha/fonts/perpetua.png b/upload/data/includes/captcha/kcaptcha/fonts/perpetua.png similarity index 100% rename from upload/includes/captcha/kcaptcha/fonts/perpetua.png rename to upload/data/includes/captcha/kcaptcha/fonts/perpetua.png diff --git a/upload/includes/captcha/kcaptcha/fonts/rockwell.png b/upload/data/includes/captcha/kcaptcha/fonts/rockwell.png similarity index 100% rename from upload/includes/captcha/kcaptcha/fonts/rockwell.png rename to upload/data/includes/captcha/kcaptcha/fonts/rockwell.png diff --git a/upload/includes/captcha/kcaptcha/fonts/times.png b/upload/data/includes/captcha/kcaptcha/fonts/times.png similarity index 100% rename from upload/includes/captcha/kcaptcha/fonts/times.png rename to upload/data/includes/captcha/kcaptcha/fonts/times.png diff --git a/upload/includes/captcha/kcaptcha/fonts/warnock.png b/upload/data/includes/captcha/kcaptcha/fonts/warnock.png similarity index 100% rename from upload/includes/captcha/kcaptcha/fonts/warnock.png rename to upload/data/includes/captcha/kcaptcha/fonts/warnock.png diff --git a/upload/includes/class.correct.php b/upload/data/includes/class.correct.php similarity index 100% rename from upload/includes/class.correct.php rename to upload/data/includes/class.correct.php diff --git a/upload/includes/class.reflection.php b/upload/data/includes/class.reflection.php similarity index 100% rename from upload/includes/class.reflection.php rename to upload/data/includes/class.reflection.php diff --git a/upload/includes/class.sitemap.php b/upload/data/includes/class.sitemap.php similarity index 92% rename from upload/includes/class.sitemap.php rename to upload/data/includes/class.sitemap.php index 8e39a2e28..9d70eab3e 100644 --- a/upload/includes/class.sitemap.php +++ b/upload/data/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/data/includes/class.utf8.php similarity index 100% rename from upload/includes/class.utf8.php rename to upload/data/includes/class.utf8.php diff --git a/upload/includes/cron/jobs/.htaccess b/upload/data/includes/cron/.htaccess similarity index 100% rename from upload/includes/cron/jobs/.htaccess rename to upload/data/includes/cron/.htaccess diff --git a/upload/includes/cron/cron_check.php b/upload/data/includes/cron/cron_check.php similarity index 100% rename from upload/includes/cron/cron_check.php rename to upload/data/includes/cron/cron_check.php diff --git a/upload/includes/cron/cron_init.php b/upload/data/includes/cron/cron_init.php similarity index 100% rename from upload/includes/cron/cron_init.php rename to upload/data/includes/cron/cron_init.php diff --git a/upload/includes/cron/cron_run.php b/upload/data/includes/cron/cron_run.php similarity index 100% rename from upload/includes/cron/cron_run.php rename to upload/data/includes/cron/cron_run.php diff --git a/upload/includes/datastore/.htaccess b/upload/data/includes/cron/jobs/.htaccess similarity index 100% rename from upload/includes/datastore/.htaccess rename to upload/data/includes/cron/jobs/.htaccess diff --git a/upload/includes/cron/jobs/attach_maintenance.php b/upload/data/includes/cron/jobs/attach_maintenance.php similarity index 100% rename from upload/includes/cron/jobs/attach_maintenance.php rename to upload/data/includes/cron/jobs/attach_maintenance.php diff --git a/upload/includes/cron/jobs/bb_maintenance.php b/upload/data/includes/cron/jobs/bb_maintenance.php similarity index 100% rename from upload/includes/cron/jobs/bb_maintenance.php rename to upload/data/includes/cron/jobs/bb_maintenance.php diff --git a/upload/includes/cron/jobs/cache_gc.php b/upload/data/includes/cron/jobs/cache_gc.php similarity index 100% rename from upload/includes/cron/jobs/cache_gc.php rename to upload/data/includes/cron/jobs/cache_gc.php diff --git a/upload/includes/cron/jobs/captcha_gen_gc.php b/upload/data/includes/cron/jobs/captcha_gen_gc.php similarity index 100% rename from upload/includes/cron/jobs/captcha_gen_gc.php rename to upload/data/includes/cron/jobs/captcha_gen_gc.php diff --git a/upload/includes/cron/jobs/clean_dlstat.php b/upload/data/includes/cron/jobs/clean_dlstat.php similarity index 100% rename from upload/includes/cron/jobs/clean_dlstat.php rename to upload/data/includes/cron/jobs/clean_dlstat.php diff --git a/upload/includes/cron/jobs/clean_log.php b/upload/data/includes/cron/jobs/clean_log.php similarity index 100% rename from upload/includes/cron/jobs/clean_log.php rename to upload/data/includes/cron/jobs/clean_log.php diff --git a/upload/includes/cron/jobs/clean_search_results.php b/upload/data/includes/cron/jobs/clean_search_results.php similarity index 100% rename from upload/includes/cron/jobs/clean_search_results.php rename to upload/data/includes/cron/jobs/clean_search_results.php diff --git a/upload/includes/cron/jobs/db_backup.php b/upload/data/includes/cron/jobs/db_backup.php similarity index 100% rename from upload/includes/cron/jobs/db_backup.php rename to upload/data/includes/cron/jobs/db_backup.php diff --git a/upload/includes/cron/jobs/ds_update_cat_forums.php b/upload/data/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/data/includes/cron/jobs/ds_update_cat_forums.php diff --git a/upload/includes/cron/jobs/ds_update_stats.php b/upload/data/includes/cron/jobs/ds_update_stats.php similarity index 100% rename from upload/includes/cron/jobs/ds_update_stats.php rename to upload/data/includes/cron/jobs/ds_update_stats.php diff --git a/upload/includes/cron/jobs/flash_topic_view.php b/upload/data/includes/cron/jobs/flash_topic_view.php similarity index 100% rename from upload/includes/cron/jobs/flash_topic_view.php rename to upload/data/includes/cron/jobs/flash_topic_view.php diff --git a/upload/includes/cron/jobs/prune_forums.php b/upload/data/includes/cron/jobs/prune_forums.php similarity index 100% rename from upload/includes/cron/jobs/prune_forums.php rename to upload/data/includes/cron/jobs/prune_forums.php diff --git a/upload/includes/cron/jobs/prune_inactive_users.php b/upload/data/includes/cron/jobs/prune_inactive_users.php similarity index 100% rename from upload/includes/cron/jobs/prune_inactive_users.php rename to upload/data/includes/cron/jobs/prune_inactive_users.php diff --git a/upload/includes/cron/jobs/prune_topic_moved.php b/upload/data/includes/cron/jobs/prune_topic_moved.php similarity index 100% rename from upload/includes/cron/jobs/prune_topic_moved.php rename to upload/data/includes/cron/jobs/prune_topic_moved.php diff --git a/upload/includes/cron/jobs/sessions_cleanup.php b/upload/data/includes/cron/jobs/sessions_cleanup.php similarity index 100% rename from upload/includes/cron/jobs/sessions_cleanup.php rename to upload/data/includes/cron/jobs/sessions_cleanup.php diff --git a/upload/includes/cron/jobs/site_backup.php b/upload/data/includes/cron/jobs/site_backup.php similarity index 100% rename from upload/includes/cron/jobs/site_backup.php rename to upload/data/includes/cron/jobs/site_backup.php diff --git a/upload/includes/cron/jobs/sitemap.php b/upload/data/includes/cron/jobs/sitemap.php similarity index 100% rename from upload/includes/cron/jobs/sitemap.php rename to upload/data/includes/cron/jobs/sitemap.php diff --git a/upload/includes/cron/jobs/tr_cleanup_and_dlstat.php b/upload/data/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/data/includes/cron/jobs/tr_cleanup_and_dlstat.php diff --git a/upload/includes/cron/jobs/tr_complete_count.php b/upload/data/includes/cron/jobs/tr_complete_count.php similarity index 100% rename from upload/includes/cron/jobs/tr_complete_count.php rename to upload/data/includes/cron/jobs/tr_complete_count.php diff --git a/upload/includes/cron/jobs/tr_maintenance.php b/upload/data/includes/cron/jobs/tr_maintenance.php similarity index 100% rename from upload/includes/cron/jobs/tr_maintenance.php rename to upload/data/includes/cron/jobs/tr_maintenance.php diff --git a/upload/includes/cron/jobs/tr_make_snapshot.php b/upload/data/includes/cron/jobs/tr_make_snapshot.php similarity index 100% rename from upload/includes/cron/jobs/tr_make_snapshot.php rename to upload/data/includes/cron/jobs/tr_make_snapshot.php diff --git a/upload/includes/cron/jobs/tr_update_seeder_last_seen.php b/upload/data/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/data/includes/cron/jobs/tr_update_seeder_last_seen.php diff --git a/upload/includes/cron/jobs/update_forums_atom.php b/upload/data/includes/cron/jobs/update_forums_atom.php similarity index 100% rename from upload/includes/cron/jobs/update_forums_atom.php rename to upload/data/includes/cron/jobs/update_forums_atom.php diff --git a/upload/includes/db/.htaccess b/upload/data/includes/datastore/.htaccess similarity index 100% rename from upload/includes/db/.htaccess rename to upload/data/includes/datastore/.htaccess diff --git a/upload/includes/datastore/build_attach_extensions.php b/upload/data/includes/datastore/build_attach_extensions.php similarity index 100% rename from upload/includes/datastore/build_attach_extensions.php rename to upload/data/includes/datastore/build_attach_extensions.php diff --git a/upload/includes/datastore/build_cat_forums.php b/upload/data/includes/datastore/build_cat_forums.php similarity index 100% rename from upload/includes/datastore/build_cat_forums.php rename to upload/data/includes/datastore/build_cat_forums.php diff --git a/upload/includes/datastore/build_moderators.php b/upload/data/includes/datastore/build_moderators.php similarity index 100% rename from upload/includes/datastore/build_moderators.php rename to upload/data/includes/datastore/build_moderators.php diff --git a/upload/includes/datastore/build_ranks.php b/upload/data/includes/datastore/build_ranks.php similarity index 100% rename from upload/includes/datastore/build_ranks.php rename to upload/data/includes/datastore/build_ranks.php diff --git a/upload/includes/datastore/build_smilies.php b/upload/data/includes/datastore/build_smilies.php similarity index 100% rename from upload/includes/datastore/build_smilies.php rename to upload/data/includes/datastore/build_smilies.php diff --git a/upload/includes/datastore/build_stats.php b/upload/data/includes/datastore/build_stats.php similarity index 100% rename from upload/includes/datastore/build_stats.php rename to upload/data/includes/datastore/build_stats.php diff --git a/upload/includes/report_hack/.htaccess b/upload/data/includes/db/.htaccess similarity index 100% rename from upload/includes/report_hack/.htaccess rename to upload/data/includes/db/.htaccess diff --git a/upload/includes/db/mysql.php b/upload/data/includes/db/mysql.php similarity index 100% rename from upload/includes/db/mysql.php rename to upload/data/includes/db/mysql.php diff --git a/upload/includes/emailer.class.php b/upload/data/includes/emailer.class.php similarity index 100% rename from upload/includes/emailer.class.php rename to upload/data/includes/emailer.class.php diff --git a/upload/includes/functions.php b/upload/data/includes/functions.php similarity index 100% rename from upload/includes/functions.php rename to upload/data/includes/functions.php diff --git a/upload/includes/functions_admin.php b/upload/data/includes/functions_admin.php similarity index 100% rename from upload/includes/functions_admin.php rename to upload/data/includes/functions_admin.php diff --git a/upload/includes/functions_admin_cron.php b/upload/data/includes/functions_admin_cron.php similarity index 100% rename from upload/includes/functions_admin_cron.php rename to upload/data/includes/functions_admin_cron.php diff --git a/upload/includes/functions_admin_torrent.php b/upload/data/includes/functions_admin_torrent.php similarity index 100% rename from upload/includes/functions_admin_torrent.php rename to upload/data/includes/functions_admin_torrent.php diff --git a/upload/includes/functions_atom.php b/upload/data/includes/functions_atom.php similarity index 100% rename from upload/includes/functions_atom.php rename to upload/data/includes/functions_atom.php diff --git a/upload/includes/functions_dev.php b/upload/data/includes/functions_dev.php similarity index 100% rename from upload/includes/functions_dev.php rename to upload/data/includes/functions_dev.php diff --git a/upload/includes/functions_group.php b/upload/data/includes/functions_group.php similarity index 100% rename from upload/includes/functions_group.php rename to upload/data/includes/functions_group.php diff --git a/upload/includes/functions_post.php b/upload/data/includes/functions_post.php similarity index 100% rename from upload/includes/functions_post.php rename to upload/data/includes/functions_post.php diff --git a/upload/includes/functions_report.php b/upload/data/includes/functions_report.php similarity index 100% rename from upload/includes/functions_report.php rename to upload/data/includes/functions_report.php diff --git a/upload/includes/functions_report_admin.php b/upload/data/includes/functions_report_admin.php similarity index 100% rename from upload/includes/functions_report_admin.php rename to upload/data/includes/functions_report_admin.php diff --git a/upload/includes/functions_selects.php b/upload/data/includes/functions_selects.php similarity index 100% rename from upload/includes/functions_selects.php rename to upload/data/includes/functions_selects.php diff --git a/upload/includes/functions_torrent.php b/upload/data/includes/functions_torrent.php similarity index 100% rename from upload/includes/functions_torrent.php rename to upload/data/includes/functions_torrent.php diff --git a/upload/includes/functions_upload.php b/upload/data/includes/functions_upload.php similarity index 100% rename from upload/includes/functions_upload.php rename to upload/data/includes/functions_upload.php diff --git a/upload/includes/functions_validate.php b/upload/data/includes/functions_validate.php similarity index 100% rename from upload/includes/functions_validate.php rename to upload/data/includes/functions_validate.php diff --git a/upload/includes/init_bb.php b/upload/data/includes/init_bb.php similarity index 100% rename from upload/includes/init_bb.php rename to upload/data/includes/init_bb.php diff --git a/upload/includes/online_userlist.php b/upload/data/includes/online_userlist.php similarity index 100% rename from upload/includes/online_userlist.php rename to upload/data/includes/online_userlist.php diff --git a/upload/includes/page_footer.php b/upload/data/includes/page_footer.php similarity index 100% rename from upload/includes/page_footer.php rename to upload/data/includes/page_footer.php diff --git a/upload/includes/page_footer_dev.php b/upload/data/includes/page_footer_dev.php similarity index 100% rename from upload/includes/page_footer_dev.php rename to upload/data/includes/page_footer_dev.php diff --git a/upload/includes/page_header.php b/upload/data/includes/page_header.php similarity index 100% rename from upload/includes/page_header.php rename to upload/data/includes/page_header.php diff --git a/upload/includes/posting_tpl.php b/upload/data/includes/posting_tpl.php similarity index 100% rename from upload/includes/posting_tpl.php rename to upload/data/includes/posting_tpl.php diff --git a/upload/includes/ucp/.htaccess b/upload/data/includes/report_hack/.htaccess similarity index 100% rename from upload/includes/ucp/.htaccess rename to upload/data/includes/report_hack/.htaccess diff --git a/upload/includes/report_hack/report_general.php b/upload/data/includes/report_hack/report_general.php similarity index 100% rename from upload/includes/report_hack/report_general.php rename to upload/data/includes/report_hack/report_general.php diff --git a/upload/includes/report_hack/report_post.php b/upload/data/includes/report_hack/report_post.php similarity index 100% rename from upload/includes/report_hack/report_post.php rename to upload/data/includes/report_hack/report_post.php diff --git a/upload/includes/report_hack/report_privmsg.php b/upload/data/includes/report_hack/report_privmsg.php similarity index 100% rename from upload/includes/report_hack/report_privmsg.php rename to upload/data/includes/report_hack/report_privmsg.php diff --git a/upload/includes/report_hack/report_topic.php b/upload/data/includes/report_hack/report_topic.php similarity index 100% rename from upload/includes/report_hack/report_topic.php rename to upload/data/includes/report_hack/report_topic.php diff --git a/upload/includes/report_hack/report_user.php b/upload/data/includes/report_hack/report_user.php similarity index 100% rename from upload/includes/report_hack/report_user.php rename to upload/data/includes/report_hack/report_user.php diff --git a/upload/includes/report_module.php b/upload/data/includes/report_module.php similarity index 100% rename from upload/includes/report_module.php rename to upload/data/includes/report_module.php diff --git a/upload/includes/sessions.php b/upload/data/includes/sessions.php similarity index 100% rename from upload/includes/sessions.php rename to upload/data/includes/sessions.php diff --git a/upload/includes/smtp.php b/upload/data/includes/smtp.php similarity index 100% rename from upload/includes/smtp.php rename to upload/data/includes/smtp.php diff --git a/upload/includes/sql_parse.php b/upload/data/includes/sql_parse.php similarity index 100% rename from upload/includes/sql_parse.php rename to upload/data/includes/sql_parse.php diff --git a/upload/includes/template.php b/upload/data/includes/template.php similarity index 100% rename from upload/includes/template.php rename to upload/data/includes/template.php diff --git a/upload/includes/torrent_announce_urls.php b/upload/data/includes/torrent_announce_urls.php similarity index 100% rename from upload/includes/torrent_announce_urls.php rename to upload/data/includes/torrent_announce_urls.php diff --git a/upload/includes/torrent_show_dl_list.php b/upload/data/includes/torrent_show_dl_list.php similarity index 100% rename from upload/includes/torrent_show_dl_list.php rename to upload/data/includes/torrent_show_dl_list.php diff --git a/upload/language/.htaccess b/upload/data/includes/ucp/.htaccess similarity index 100% rename from upload/language/.htaccess rename to upload/data/includes/ucp/.htaccess diff --git a/upload/includes/ucp/activate.php b/upload/data/includes/ucp/activate.php similarity index 100% rename from upload/includes/ucp/activate.php rename to upload/data/includes/ucp/activate.php diff --git a/upload/includes/ucp/bonus.php b/upload/data/includes/ucp/bonus.php similarity index 100% rename from upload/includes/ucp/bonus.php rename to upload/data/includes/ucp/bonus.php diff --git a/upload/includes/ucp/email.php b/upload/data/includes/ucp/email.php similarity index 100% rename from upload/includes/ucp/email.php rename to upload/data/includes/ucp/email.php diff --git a/upload/includes/ucp/register.php b/upload/data/includes/ucp/register.php similarity index 100% rename from upload/includes/ucp/register.php rename to upload/data/includes/ucp/register.php diff --git a/upload/includes/ucp/sendpasswd.php b/upload/data/includes/ucp/sendpasswd.php similarity index 100% rename from upload/includes/ucp/sendpasswd.php rename to upload/data/includes/ucp/sendpasswd.php diff --git a/upload/includes/ucp/topic_watch.php b/upload/data/includes/ucp/topic_watch.php similarity index 100% rename from upload/includes/ucp/topic_watch.php rename to upload/data/includes/ucp/topic_watch.php diff --git a/upload/includes/ucp/viewprofile.php b/upload/data/includes/ucp/viewprofile.php similarity index 100% rename from upload/includes/ucp/viewprofile.php rename to upload/data/includes/ucp/viewprofile.php diff --git a/upload/includes/ucp/viewtorrent.php b/upload/data/includes/ucp/viewtorrent.php similarity index 100% rename from upload/includes/ucp/viewtorrent.php rename to upload/data/includes/ucp/viewtorrent.php diff --git a/upload/language/en/.htaccess b/upload/data/language/.htaccess similarity index 100% rename from upload/language/en/.htaccess rename to upload/data/language/.htaccess diff --git a/upload/language/en/email/.htaccess b/upload/data/language/en/.htaccess similarity index 100% rename from upload/language/en/email/.htaccess rename to upload/data/language/en/.htaccess diff --git a/upload/language/en/html/.htaccess b/upload/data/language/en/email/.htaccess similarity index 100% rename from upload/language/en/html/.htaccess rename to upload/data/language/en/email/.htaccess diff --git a/upload/language/en/email/admin_send_email.tpl b/upload/data/language/en/email/admin_send_email.tpl similarity index 100% rename from upload/language/en/email/admin_send_email.tpl rename to upload/data/language/en/email/admin_send_email.tpl diff --git a/upload/language/en/email/blank.tpl b/upload/data/language/en/email/blank.tpl similarity index 100% rename from upload/language/en/email/blank.tpl rename to upload/data/language/en/email/blank.tpl diff --git a/upload/language/en/email/group_added.tpl b/upload/data/language/en/email/group_added.tpl similarity index 100% rename from upload/language/en/email/group_added.tpl rename to upload/data/language/en/email/group_added.tpl diff --git a/upload/language/en/email/group_approved.tpl b/upload/data/language/en/email/group_approved.tpl similarity index 100% rename from upload/language/en/email/group_approved.tpl rename to upload/data/language/en/email/group_approved.tpl diff --git a/upload/language/en/email/group_request.tpl b/upload/data/language/en/email/group_request.tpl similarity index 100% rename from upload/language/en/email/group_request.tpl rename to upload/data/language/en/email/group_request.tpl diff --git a/upload/language/en/email/privmsg_notify.tpl b/upload/data/language/en/email/privmsg_notify.tpl similarity index 100% rename from upload/language/en/email/privmsg_notify.tpl rename to upload/data/language/en/email/privmsg_notify.tpl diff --git a/upload/language/en/email/profile_send_email.tpl b/upload/data/language/en/email/profile_send_email.tpl similarity index 100% rename from upload/language/en/email/profile_send_email.tpl rename to upload/data/language/en/email/profile_send_email.tpl diff --git a/upload/language/en/email/topic_notify.tpl b/upload/data/language/en/email/topic_notify.tpl similarity index 100% rename from upload/language/en/email/topic_notify.tpl rename to upload/data/language/en/email/topic_notify.tpl diff --git a/upload/language/en/email/user_activate.tpl b/upload/data/language/en/email/user_activate.tpl similarity index 100% rename from upload/language/en/email/user_activate.tpl rename to upload/data/language/en/email/user_activate.tpl diff --git a/upload/language/en/email/user_activate_passwd.tpl b/upload/data/language/en/email/user_activate_passwd.tpl similarity index 100% rename from upload/language/en/email/user_activate_passwd.tpl rename to upload/data/language/en/email/user_activate_passwd.tpl diff --git a/upload/language/en/email/user_welcome.tpl b/upload/data/language/en/email/user_welcome.tpl similarity index 100% rename from upload/language/en/email/user_welcome.tpl rename to upload/data/language/en/email/user_welcome.tpl diff --git a/upload/language/en/email/user_welcome_inactive.tpl b/upload/data/language/en/email/user_welcome_inactive.tpl similarity index 100% rename from upload/language/en/email/user_welcome_inactive.tpl rename to upload/data/language/en/email/user_welcome_inactive.tpl diff --git a/upload/language/en/report_hack/.htaccess b/upload/data/language/en/html/.htaccess similarity index 100% rename from upload/language/en/report_hack/.htaccess rename to upload/data/language/en/html/.htaccess diff --git a/upload/language/en/html/advert.html b/upload/data/language/en/html/advert.html similarity index 100% rename from upload/language/en/html/advert.html rename to upload/data/language/en/html/advert.html diff --git a/upload/language/en/html/copyright_holders.html b/upload/data/language/en/html/copyright_holders.html similarity index 100% rename from upload/language/en/html/copyright_holders.html rename to upload/data/language/en/html/copyright_holders.html diff --git a/upload/language/en/html/not_found.html b/upload/data/language/en/html/not_found.html similarity index 100% rename from upload/language/en/html/not_found.html rename to upload/data/language/en/html/not_found.html diff --git a/upload/language/en/html/sidebar1.html b/upload/data/language/en/html/sidebar1.html similarity index 100% rename from upload/language/en/html/sidebar1.html rename to upload/data/language/en/html/sidebar1.html diff --git a/upload/language/en/html/sidebar2.html b/upload/data/language/en/html/sidebar2.html similarity index 100% rename from upload/language/en/html/sidebar2.html rename to upload/data/language/en/html/sidebar2.html diff --git a/upload/language/en/html/user_agreement.html b/upload/data/language/en/html/user_agreement.html similarity index 100% rename from upload/language/en/html/user_agreement.html rename to upload/data/language/en/html/user_agreement.html diff --git a/upload/language/en/main.php b/upload/data/language/en/main.php similarity index 100% rename from upload/language/en/main.php rename to upload/data/language/en/main.php diff --git a/upload/language/ru/.htaccess b/upload/data/language/en/report_hack/.htaccess similarity index 100% rename from upload/language/ru/.htaccess rename to upload/data/language/en/report_hack/.htaccess diff --git a/upload/language/en/report_hack/report_general.php b/upload/data/language/en/report_hack/report_general.php similarity index 100% rename from upload/language/en/report_hack/report_general.php rename to upload/data/language/en/report_hack/report_general.php diff --git a/upload/language/en/report_hack/report_post.php b/upload/data/language/en/report_hack/report_post.php similarity index 100% rename from upload/language/en/report_hack/report_post.php rename to upload/data/language/en/report_hack/report_post.php diff --git a/upload/language/en/report_hack/report_privmsg.php b/upload/data/language/en/report_hack/report_privmsg.php similarity index 100% rename from upload/language/en/report_hack/report_privmsg.php rename to upload/data/language/en/report_hack/report_privmsg.php diff --git a/upload/language/en/report_hack/report_topic.php b/upload/data/language/en/report_hack/report_topic.php similarity index 100% rename from upload/language/en/report_hack/report_topic.php rename to upload/data/language/en/report_hack/report_topic.php diff --git a/upload/language/en/report_hack/report_user.php b/upload/data/language/en/report_hack/report_user.php similarity index 100% rename from upload/language/en/report_hack/report_user.php rename to upload/data/language/en/report_hack/report_user.php diff --git a/upload/language/en/search_stopwords.txt b/upload/data/language/en/search_stopwords.txt similarity index 100% rename from upload/language/en/search_stopwords.txt rename to upload/data/language/en/search_stopwords.txt diff --git a/upload/language/en/search_synonyms.txt b/upload/data/language/en/search_synonyms.txt similarity index 100% rename from upload/language/en/search_synonyms.txt rename to upload/data/language/en/search_synonyms.txt diff --git a/upload/language/en/translit_table.php b/upload/data/language/en/translit_table.php similarity index 100% rename from upload/language/en/translit_table.php rename to upload/data/language/en/translit_table.php diff --git a/upload/language/ru/email/.htaccess b/upload/data/language/ru/.htaccess similarity index 100% rename from upload/language/ru/email/.htaccess rename to upload/data/language/ru/.htaccess diff --git a/upload/language/ru/html/.htaccess b/upload/data/language/ru/email/.htaccess similarity index 100% rename from upload/language/ru/html/.htaccess rename to upload/data/language/ru/email/.htaccess diff --git a/upload/language/ru/email/admin_send_email.tpl b/upload/data/language/ru/email/admin_send_email.tpl similarity index 100% rename from upload/language/ru/email/admin_send_email.tpl rename to upload/data/language/ru/email/admin_send_email.tpl diff --git a/upload/language/ru/email/blank.tpl b/upload/data/language/ru/email/blank.tpl similarity index 100% rename from upload/language/ru/email/blank.tpl rename to upload/data/language/ru/email/blank.tpl diff --git a/upload/language/ru/email/group_added.tpl b/upload/data/language/ru/email/group_added.tpl similarity index 100% rename from upload/language/ru/email/group_added.tpl rename to upload/data/language/ru/email/group_added.tpl diff --git a/upload/language/ru/email/group_approved.tpl b/upload/data/language/ru/email/group_approved.tpl similarity index 100% rename from upload/language/ru/email/group_approved.tpl rename to upload/data/language/ru/email/group_approved.tpl diff --git a/upload/language/ru/email/group_request.tpl b/upload/data/language/ru/email/group_request.tpl similarity index 100% rename from upload/language/ru/email/group_request.tpl rename to upload/data/language/ru/email/group_request.tpl diff --git a/upload/language/ru/email/privmsg_notify.tpl b/upload/data/language/ru/email/privmsg_notify.tpl similarity index 100% rename from upload/language/ru/email/privmsg_notify.tpl rename to upload/data/language/ru/email/privmsg_notify.tpl diff --git a/upload/language/ru/email/profile_send_email.tpl b/upload/data/language/ru/email/profile_send_email.tpl similarity index 100% rename from upload/language/ru/email/profile_send_email.tpl rename to upload/data/language/ru/email/profile_send_email.tpl diff --git a/upload/language/ru/email/topic_notify.tpl b/upload/data/language/ru/email/topic_notify.tpl similarity index 100% rename from upload/language/ru/email/topic_notify.tpl rename to upload/data/language/ru/email/topic_notify.tpl diff --git a/upload/language/ru/email/user_activate.tpl b/upload/data/language/ru/email/user_activate.tpl similarity index 100% rename from upload/language/ru/email/user_activate.tpl rename to upload/data/language/ru/email/user_activate.tpl diff --git a/upload/language/ru/email/user_activate_passwd.tpl b/upload/data/language/ru/email/user_activate_passwd.tpl similarity index 100% rename from upload/language/ru/email/user_activate_passwd.tpl rename to upload/data/language/ru/email/user_activate_passwd.tpl diff --git a/upload/language/ru/email/user_welcome.tpl b/upload/data/language/ru/email/user_welcome.tpl similarity index 100% rename from upload/language/ru/email/user_welcome.tpl rename to upload/data/language/ru/email/user_welcome.tpl diff --git a/upload/language/ru/email/user_welcome_inactive.tpl b/upload/data/language/ru/email/user_welcome_inactive.tpl similarity index 100% rename from upload/language/ru/email/user_welcome_inactive.tpl rename to upload/data/language/ru/email/user_welcome_inactive.tpl diff --git a/upload/language/ru/report_hack/.htaccess b/upload/data/language/ru/html/.htaccess similarity index 100% rename from upload/language/ru/report_hack/.htaccess rename to upload/data/language/ru/html/.htaccess diff --git a/upload/language/ru/html/advert.html b/upload/data/language/ru/html/advert.html similarity index 100% rename from upload/language/ru/html/advert.html rename to upload/data/language/ru/html/advert.html diff --git a/upload/language/ru/html/copyright_holders.html b/upload/data/language/ru/html/copyright_holders.html similarity index 100% rename from upload/language/ru/html/copyright_holders.html rename to upload/data/language/ru/html/copyright_holders.html diff --git a/upload/language/ru/html/not_found.html b/upload/data/language/ru/html/not_found.html similarity index 100% rename from upload/language/ru/html/not_found.html rename to upload/data/language/ru/html/not_found.html diff --git a/upload/language/ru/html/sidebar1.html b/upload/data/language/ru/html/sidebar1.html similarity index 100% rename from upload/language/ru/html/sidebar1.html rename to upload/data/language/ru/html/sidebar1.html diff --git a/upload/language/ru/html/sidebar2.html b/upload/data/language/ru/html/sidebar2.html similarity index 100% rename from upload/language/ru/html/sidebar2.html rename to upload/data/language/ru/html/sidebar2.html diff --git a/upload/language/ru/html/user_agreement.html b/upload/data/language/ru/html/user_agreement.html similarity index 100% rename from upload/language/ru/html/user_agreement.html rename to upload/data/language/ru/html/user_agreement.html diff --git a/upload/language/ru/main.php b/upload/data/language/ru/main.php similarity index 100% rename from upload/language/ru/main.php rename to upload/data/language/ru/main.php diff --git a/upload/language/uk/.htaccess b/upload/data/language/ru/report_hack/.htaccess similarity index 100% rename from upload/language/uk/.htaccess rename to upload/data/language/ru/report_hack/.htaccess diff --git a/upload/language/ru/report_hack/report_general.php b/upload/data/language/ru/report_hack/report_general.php similarity index 100% rename from upload/language/ru/report_hack/report_general.php rename to upload/data/language/ru/report_hack/report_general.php diff --git a/upload/language/ru/report_hack/report_post.php b/upload/data/language/ru/report_hack/report_post.php similarity index 100% rename from upload/language/ru/report_hack/report_post.php rename to upload/data/language/ru/report_hack/report_post.php diff --git a/upload/language/ru/report_hack/report_privmsg.php b/upload/data/language/ru/report_hack/report_privmsg.php similarity index 100% rename from upload/language/ru/report_hack/report_privmsg.php rename to upload/data/language/ru/report_hack/report_privmsg.php diff --git a/upload/language/ru/report_hack/report_topic.php b/upload/data/language/ru/report_hack/report_topic.php similarity index 100% rename from upload/language/ru/report_hack/report_topic.php rename to upload/data/language/ru/report_hack/report_topic.php diff --git a/upload/language/ru/report_hack/report_user.php b/upload/data/language/ru/report_hack/report_user.php similarity index 100% rename from upload/language/ru/report_hack/report_user.php rename to upload/data/language/ru/report_hack/report_user.php diff --git a/upload/language/ru/search_stopwords.txt b/upload/data/language/ru/search_stopwords.txt similarity index 100% rename from upload/language/ru/search_stopwords.txt rename to upload/data/language/ru/search_stopwords.txt diff --git a/upload/language/ru/search_synonyms.txt b/upload/data/language/ru/search_synonyms.txt similarity index 100% rename from upload/language/ru/search_synonyms.txt rename to upload/data/language/ru/search_synonyms.txt diff --git a/upload/language/ru/translit_table.php b/upload/data/language/ru/translit_table.php similarity index 100% rename from upload/language/ru/translit_table.php rename to upload/data/language/ru/translit_table.php diff --git a/upload/language/uk/email/.htaccess b/upload/data/language/uk/.htaccess similarity index 100% rename from upload/language/uk/email/.htaccess rename to upload/data/language/uk/.htaccess diff --git a/upload/language/uk/html/.htaccess b/upload/data/language/uk/email/.htaccess similarity index 100% rename from upload/language/uk/html/.htaccess rename to upload/data/language/uk/email/.htaccess diff --git a/upload/language/uk/email/admin_send_email.tpl b/upload/data/language/uk/email/admin_send_email.tpl similarity index 100% rename from upload/language/uk/email/admin_send_email.tpl rename to upload/data/language/uk/email/admin_send_email.tpl diff --git a/upload/language/uk/email/blank.tpl b/upload/data/language/uk/email/blank.tpl similarity index 100% rename from upload/language/uk/email/blank.tpl rename to upload/data/language/uk/email/blank.tpl diff --git a/upload/language/uk/email/group_added.tpl b/upload/data/language/uk/email/group_added.tpl similarity index 100% rename from upload/language/uk/email/group_added.tpl rename to upload/data/language/uk/email/group_added.tpl diff --git a/upload/language/uk/email/group_approved.tpl b/upload/data/language/uk/email/group_approved.tpl similarity index 100% rename from upload/language/uk/email/group_approved.tpl rename to upload/data/language/uk/email/group_approved.tpl diff --git a/upload/language/uk/email/group_request.tpl b/upload/data/language/uk/email/group_request.tpl similarity index 100% rename from upload/language/uk/email/group_request.tpl rename to upload/data/language/uk/email/group_request.tpl diff --git a/upload/language/uk/email/privmsg_notify.tpl b/upload/data/language/uk/email/privmsg_notify.tpl similarity index 100% rename from upload/language/uk/email/privmsg_notify.tpl rename to upload/data/language/uk/email/privmsg_notify.tpl diff --git a/upload/language/uk/email/profile_send_email.tpl b/upload/data/language/uk/email/profile_send_email.tpl similarity index 100% rename from upload/language/uk/email/profile_send_email.tpl rename to upload/data/language/uk/email/profile_send_email.tpl diff --git a/upload/language/uk/email/topic_notify.tpl b/upload/data/language/uk/email/topic_notify.tpl similarity index 100% rename from upload/language/uk/email/topic_notify.tpl rename to upload/data/language/uk/email/topic_notify.tpl diff --git a/upload/language/uk/email/user_activate.tpl b/upload/data/language/uk/email/user_activate.tpl similarity index 100% rename from upload/language/uk/email/user_activate.tpl rename to upload/data/language/uk/email/user_activate.tpl diff --git a/upload/language/uk/email/user_activate_passwd.tpl b/upload/data/language/uk/email/user_activate_passwd.tpl similarity index 100% rename from upload/language/uk/email/user_activate_passwd.tpl rename to upload/data/language/uk/email/user_activate_passwd.tpl diff --git a/upload/language/uk/email/user_welcome.tpl b/upload/data/language/uk/email/user_welcome.tpl similarity index 100% rename from upload/language/uk/email/user_welcome.tpl rename to upload/data/language/uk/email/user_welcome.tpl diff --git a/upload/language/uk/email/user_welcome_inactive.tpl b/upload/data/language/uk/email/user_welcome_inactive.tpl similarity index 100% rename from upload/language/uk/email/user_welcome_inactive.tpl rename to upload/data/language/uk/email/user_welcome_inactive.tpl diff --git a/upload/language/uk/report_hack/.htaccess b/upload/data/language/uk/html/.htaccess similarity index 100% rename from upload/language/uk/report_hack/.htaccess rename to upload/data/language/uk/html/.htaccess diff --git a/upload/language/uk/html/advert.html b/upload/data/language/uk/html/advert.html similarity index 100% rename from upload/language/uk/html/advert.html rename to upload/data/language/uk/html/advert.html diff --git a/upload/language/uk/html/copyright_holders.html b/upload/data/language/uk/html/copyright_holders.html similarity index 100% rename from upload/language/uk/html/copyright_holders.html rename to upload/data/language/uk/html/copyright_holders.html diff --git a/upload/language/uk/html/not_found.html b/upload/data/language/uk/html/not_found.html similarity index 100% rename from upload/language/uk/html/not_found.html rename to upload/data/language/uk/html/not_found.html diff --git a/upload/language/uk/html/sidebar1.html b/upload/data/language/uk/html/sidebar1.html similarity index 100% rename from upload/language/uk/html/sidebar1.html rename to upload/data/language/uk/html/sidebar1.html diff --git a/upload/language/uk/html/sidebar2.html b/upload/data/language/uk/html/sidebar2.html similarity index 100% rename from upload/language/uk/html/sidebar2.html rename to upload/data/language/uk/html/sidebar2.html diff --git a/upload/language/uk/html/user_agreement.html b/upload/data/language/uk/html/user_agreement.html similarity index 100% rename from upload/language/uk/html/user_agreement.html rename to upload/data/language/uk/html/user_agreement.html diff --git a/upload/language/uk/main.php b/upload/data/language/uk/main.php similarity index 100% rename from upload/language/uk/main.php rename to upload/data/language/uk/main.php diff --git a/upload/log/.htaccess b/upload/data/language/uk/report_hack/.htaccess similarity index 100% rename from upload/log/.htaccess rename to upload/data/language/uk/report_hack/.htaccess diff --git a/upload/language/uk/report_hack/report_general.php b/upload/data/language/uk/report_hack/report_general.php similarity index 100% rename from upload/language/uk/report_hack/report_general.php rename to upload/data/language/uk/report_hack/report_general.php diff --git a/upload/language/uk/report_hack/report_post.php b/upload/data/language/uk/report_hack/report_post.php similarity index 100% rename from upload/language/uk/report_hack/report_post.php rename to upload/data/language/uk/report_hack/report_post.php diff --git a/upload/language/uk/report_hack/report_privmsg.php b/upload/data/language/uk/report_hack/report_privmsg.php similarity index 100% rename from upload/language/uk/report_hack/report_privmsg.php rename to upload/data/language/uk/report_hack/report_privmsg.php diff --git a/upload/language/uk/report_hack/report_topic.php b/upload/data/language/uk/report_hack/report_topic.php similarity index 100% rename from upload/language/uk/report_hack/report_topic.php rename to upload/data/language/uk/report_hack/report_topic.php diff --git a/upload/language/uk/report_hack/report_user.php b/upload/data/language/uk/report_hack/report_user.php similarity index 100% rename from upload/language/uk/report_hack/report_user.php rename to upload/data/language/uk/report_hack/report_user.php diff --git a/upload/language/uk/search_stopwords.txt b/upload/data/language/uk/search_stopwords.txt similarity index 100% rename from upload/language/uk/search_stopwords.txt rename to upload/data/language/uk/search_stopwords.txt diff --git a/upload/language/uk/search_synonyms.txt b/upload/data/language/uk/search_synonyms.txt similarity index 100% rename from upload/language/uk/search_synonyms.txt rename to upload/data/language/uk/search_synonyms.txt diff --git a/upload/language/uk/translit_table.php b/upload/data/language/uk/translit_table.php similarity index 100% rename from upload/language/uk/translit_table.php rename to upload/data/language/uk/translit_table.php diff --git a/upload/log/cron/.htaccess b/upload/data/log/.htaccess similarity index 100% rename from upload/log/cron/.htaccess rename to upload/data/log/.htaccess diff --git a/upload/data/log/cron/.htaccess b/upload/data/log/cron/.htaccess new file mode 100644 index 000000000..baa56e5a3 --- /dev/null +++ b/upload/data/log/cron/.htaccess @@ -0,0 +1,2 @@ +order allow,deny +deny from all \ No newline at end of file diff --git a/upload/sitemap/.keep b/upload/upload/sitemap/.keep similarity index 100% rename from upload/sitemap/.keep rename to upload/upload/sitemap/.keep diff --git a/upload/old_files/.htaccess b/upload/upload/torrent_files/.htaccess similarity index 100% rename from upload/old_files/.htaccess rename to upload/upload/torrent_files/.htaccess diff --git a/upload/old_files/thumbs/.htaccess b/upload/upload/torrent_files/thumbs/.htaccess similarity index 100% rename from upload/old_files/thumbs/.htaccess rename to upload/upload/torrent_files/thumbs/.htaccess