diff --git a/upload/data/ajax/sitemap.php b/upload/data/ajax/sitemap.php
index c1594d48d..f2a2ccce9 100644
--- a/upload/data/ajax/sitemap.php
+++ b/upload/data/ajax/sitemap.php
@@ -12,7 +12,7 @@ switch ($mode)
{
case 'create':
$map->create();
- if (@file_exists(SITEMAP_DIR. "sitemap.xml")) {
+ if (@file_exists(UPLOAD_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'];
@@ -20,9 +20,9 @@ switch ($mode)
break;
case 'search_update':
- if (!@file_exists(SITEMAP_DIR. "sitemap.xml")) $map->create();
+ if (!@file_exists(UPLOAD_DIR. "sitemap.xml")) $map->create();
- $map_link = make_url(SITEMAP_DIR.'sitemap.xml');
+ $map_link = make_url(UPLOAD_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/data/config.php b/upload/data/config.php
index 3b4ddbb80..370e965a7 100644
--- a/upload/data/config.php
+++ b/upload/data/config.php
@@ -257,7 +257,7 @@ 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('UPLOAD_DIR', BB_PATH .'/upload/' );
define('AJAX_HTML_DIR', BB_PATH .'/data/ajax/html/');
define('AJAX_DIR', BB_PATH .'/data/ajax/' );
@@ -558,7 +558,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' => BB_ROOT . 'upload/avatars/', // путь к директории с аватарами
'up_allowed' => true, // разрешить загрузку аватар
);
@@ -569,7 +569,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' => BB_ROOT . 'upload/avatars/', // путь к директории с аватарами
'up_allowed' => true, // разрешить загрузку аватар
);
@@ -613,8 +613,8 @@ $bb_cfg['advert_url'] = 'misc.php?do=info&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' => './upload/captcha/', # with '/'
+ 'img_path' => UPLOAD_DIR .'captcha/', # with '/'
);
// Atom feed
diff --git a/upload/data/includes/class.sitemap.php b/upload/data/includes/class.sitemap.php
index 9d70eab3e..cec752d5d 100644
--- a/upload/data/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(SITEMAP_DIR. "sitemap.xml", "wb+");
+ $handler = fopen(UPLOAD_DIR. "sitemap.xml", "wb+");
fwrite($handler, $sitemap);
fclose($handler);
- @chmod(SITEMAP_DIR. "sitemap.xml", 0666);
+ @chmod(UPLOAD_DIR. "sitemap.xml", 0666);
$sitemap = $this->build_stat();
- $handler = fopen(SITEMAP_DIR. "sitemap1.xml", "wb+");
+ $handler = fopen(UPLOAD_DIR. "sitemap1.xml", "wb+");
fwrite($handler, $sitemap);
fclose($handler);
- @chmod(SITEMAP_DIR. "sitemap.xml", 0666);
+ @chmod(UPLOAD_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(SITEMAP_DIR. "sitemap{$t}.xml", "wb+");
+ $handler = fopen(UPLOAD_DIR. "sitemap{$t}.xml", "wb+");
fwrite($handler, $sitemap);
fclose($handler);
- @chmod(SITEMAP_DIR. "sitemap{$t}.xml", 0666);
+ @chmod(UPLOAD_DIR. "sitemap{$t}.xml", 0666);
}
} else {
$sitemap = $this->build_map();
- $handler = fopen(SITEMAP_DIR. "sitemap.xml", "wb+");
+ $handler = fopen(UPLOAD_DIR. "sitemap.xml", "wb+");
fwrite($handler, $sitemap);
fclose($handler);
- @chmod(SITEMAP_DIR. "sitemap.xml", 0666);
+ @chmod(UPLOAD_DIR. "sitemap.xml", 0666);
}
$params['sitemap_time'] = TIMENOW;
diff --git a/upload/images/Thumbs.db b/upload/images/Thumbs.db
new file mode 100644
index 000000000..f7cecb35c
Binary files /dev/null and b/upload/images/Thumbs.db differ
diff --git a/upload/images/logo/Thumbs.db b/upload/images/logo/Thumbs.db
new file mode 100644
index 000000000..ea0ded890
Binary files /dev/null and b/upload/images/logo/Thumbs.db differ
diff --git a/upload/images/ranks/Thumbs.db b/upload/images/ranks/Thumbs.db
new file mode 100644
index 000000000..7cad6e3ba
Binary files /dev/null and b/upload/images/ranks/Thumbs.db differ
diff --git a/upload/images/smiles/Thumbs.db b/upload/images/smiles/Thumbs.db
new file mode 100644
index 000000000..c389a2d34
Binary files /dev/null and b/upload/images/smiles/Thumbs.db differ
diff --git a/upload/upload/avatars/gallery/Thumbs.db b/upload/upload/avatars/gallery/Thumbs.db
new file mode 100644
index 000000000..774377d5b
Binary files /dev/null and b/upload/upload/avatars/gallery/Thumbs.db differ
diff --git a/upload/images/avatars/gallery/bot.gif b/upload/upload/avatars/gallery/bot.gif
similarity index 100%
rename from upload/images/avatars/gallery/bot.gif
rename to upload/upload/avatars/gallery/bot.gif
diff --git a/upload/images/avatars/gallery/noavatar.png b/upload/upload/avatars/gallery/noavatar.png
similarity index 100%
rename from upload/images/avatars/gallery/noavatar.png
rename to upload/upload/avatars/gallery/noavatar.png
diff --git a/upload/images/captcha/.keep b/upload/upload/captcha/.keep
similarity index 100%
rename from upload/images/captcha/.keep
rename to upload/upload/captcha/.keep
diff --git a/upload/upload/sitemap/.keep b/upload/upload/sitemap/.keep
deleted file mode 100644
index e69de29bb..000000000