Смена директорий аватарок и капчи

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'].': <b>'.bb_date(TIMENOW, $bb_cfg['post_date_format']).'</b> '.$lang['SITEMAP_AVAILABLE'].': <a href="'.make_url('/sitemap/sitemap.xml').'" target="_blank">'.make_url('/sitemap/sitemap.xml').'</a>';
 		} 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 .= '<br />'.$lang['SITEMAP_NOTIFY_SEARCH'].' Google: <font style="color: green;">'.$lang['SITEMAP_SENT'].'</font>';

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

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;