new-format

new-format

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');

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'] : '';

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'].': <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'];
@@ -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 .= '<br />'.$lang['SITEMAP_NOTIFY_SEARCH'].' Google: <font style="color: green;">'.$lang['SITEMAP_SENT'].'</font>';

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)

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;