From 68b722be83632d236d59acbd1f38d64589f93bb7 Mon Sep 17 00:00:00 2001 From: Exile Date: Thu, 25 Sep 2014 15:45:18 +0400 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BE=D0=BA?= =?UTF-8?q?.?= 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 @@ - - + + - +