Реформат в PSR-2 + добавление заголовков лицензии MIT в файлы

This commit is contained in:
Yuriy Pikhtarev 2017-01-13 01:20:43 +03:00
commit 3730bed000
No known key found for this signature in database
GPG key ID: 3A9B5A757B48ECC6
207 changed files with 44327 additions and 43119 deletions

View file

@ -1,6 +1,31 @@
<?php
/**
* MIT License
*
* Copyright (c) 2005-2017 TorrentPier
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
if (!defined('BB_ROOT')) die(basename(__FILE__));
if (!defined('BB_ROOT')) {
die(basename(__FILE__));
}
global $bf, $bb_cfg;
@ -8,96 +33,87 @@ global $bf, $bb_cfg;
// cat_forums
//
$data = array(
'not_auth_forums' => array(
'guest_view' => array(),
'guest_read' => array(),
'user_view' => array(),
'user_read' => array(),
),
'tracker_forums' => array(),
'cat_title_html' => array(),
'forum_name_html' => array(),
'c' => array(), // also has $data['c']['cat_id']['forums'] key
'f' => array(), // also has $data['f']['forum_id']['subforums'] key
'not_auth_forums' => array(
'guest_view' => array(),
'guest_read' => array(),
'user_view' => array(),
'user_read' => array(),
),
'tracker_forums' => array(),
'cat_title_html' => array(),
'forum_name_html' => array(),
'c' => array(), // also has $data['c']['cat_id']['forums'] key
'f' => array(), // also has $data['f']['forum_id']['subforums'] key
);
// Store only these fields from BB_FORUMS in $data['f']
$forum_store_fields = array_flip(array_keys($bf['forum_perm']));
$forum_store_fields += array_flip(array(
'forum_id',
'cat_id',
'forum_name',
'forum_desc',
'forum_status',
'forum_posts',
'forum_topics',
'forum_parent',
'forum_id',
'cat_id',
'forum_name',
'forum_desc',
'forum_status',
'forum_posts',
'forum_topics',
'forum_parent',
));
// Categories
$sql = "SELECT * FROM ". BB_CATEGORIES ." ORDER BY cat_order";
$sql = "SELECT * FROM " . BB_CATEGORIES . " ORDER BY cat_order";
foreach(DB()->fetch_rowset($sql) as $row)
{
$data['c'][$row['cat_id']] = $row;
$data['cat_title_html'][$row['cat_id']] = htmlCHR($row['cat_title']);
foreach (DB()->fetch_rowset($sql) as $row) {
$data['c'][$row['cat_id']] = $row;
$data['cat_title_html'][$row['cat_id']] = htmlCHR($row['cat_title']);
}
$sql = "
SELECT f.*
FROM ". BB_FORUMS ." f, ". BB_CATEGORIES ." c
FROM " . BB_FORUMS . " f, " . BB_CATEGORIES . " c
WHERE f.cat_id = c.cat_id
ORDER BY c.cat_order, f.forum_order
";
foreach (DB()->fetch_rowset($sql) as $row)
{
$fid = $row['forum_id'];
$not_auth =& $data['not_auth_forums'];
foreach (DB()->fetch_rowset($sql) as $row) {
$fid = $row['forum_id'];
$not_auth =& $data['not_auth_forums'];
// Find not auth forums
if ($row['auth_view'] != AUTH_ALL)
{
$not_auth['guest_view'][] = $fid;
}
if ($row['auth_view'] != AUTH_ALL && $row['auth_view'] != AUTH_REG)
{
$not_auth['user_view'][] = $fid;
}
if ($row['auth_read'] != AUTH_ALL)
{
$not_auth['guest_read'][] = $fid;
}
if ($row['auth_read'] != AUTH_ALL && $row['auth_read'] != AUTH_REG)
{
$not_auth['user_read'][] = $fid;
}
// Find not auth forums
if ($row['auth_view'] != AUTH_ALL) {
$not_auth['guest_view'][] = $fid;
}
if ($row['auth_view'] != AUTH_ALL && $row['auth_view'] != AUTH_REG) {
$not_auth['user_view'][] = $fid;
}
if ($row['auth_read'] != AUTH_ALL) {
$not_auth['guest_read'][] = $fid;
}
if ($row['auth_read'] != AUTH_ALL && $row['auth_read'] != AUTH_REG) {
$not_auth['user_read'][] = $fid;
}
$data['forum'][$fid] = $row;
$data['forum'][$fid] = $row;
// Store forums data
if ($parent_id = $row['forum_parent'])
{
$parent =& $data['f'][$parent_id];
// Store forums data
if ($parent_id = $row['forum_parent']) {
$parent =& $data['f'][$parent_id];
$parent['subforums'][] = $fid;
$parent['forum_posts'] += $row['forum_posts'];
$parent['forum_topics'] += $row['forum_topics'];
}
if ($row['allow_reg_tracker'])
{
$data['tracker_forums'][] = $fid;
}
$parent['subforums'][] = $fid;
$parent['forum_posts'] += $row['forum_posts'];
$parent['forum_topics'] += $row['forum_topics'];
}
if ($row['allow_reg_tracker']) {
$data['tracker_forums'][] = $fid;
}
$data['f'][$fid] = array_intersect_key($row, $forum_store_fields);
$data['forum_name_html'][$fid] = htmlCHR($row['forum_name']);
$data['f'][$fid] = array_intersect_key($row, $forum_store_fields);
$data['forum_name_html'][$fid] = htmlCHR($row['forum_name']);
// Forum ids in cat
$data['c'][$row['cat_id']]['forums'][] = $fid;
// Forum ids in cat
$data['c'][$row['cat_id']]['forums'][] = $fid;
}
foreach ($data['not_auth_forums'] as $key => $val)
{
$data['not_auth_forums'][$key] = join(',', $val);
foreach ($data['not_auth_forums'] as $key => $val) {
$data['not_auth_forums'][$key] = join(',', $val);
}
$data['tracker_forums'] = join(',', $data['tracker_forums']);
@ -107,20 +123,20 @@ $this->store('cat_forums', $data);
// jumpbox
//
$data = array(
'guest' => get_forum_select('guest', 'f', null, null, null, 'id="jumpbox" onchange="window.location.href=\'viewforum.php?f=\'+this.value;"'),
'user' => get_forum_select('user', 'f', null, null, null, 'id="jumpbox" onchange="window.location.href=\'viewforum.php?f=\'+this.value;"'),
'guest' => get_forum_select('guest', 'f', null, null, null, 'id="jumpbox" onchange="window.location.href=\'viewforum.php?f=\'+this.value;"'),
'user' => get_forum_select('user', 'f', null, null, null, 'id="jumpbox" onchange="window.location.href=\'viewforum.php?f=\'+this.value;"'),
);
$this->store('jumpbox', $data);
file_write($data['guest'], AJAX_HTML_DIR .'jumpbox_guest.html', false, true, true);
file_write($data['user'], AJAX_HTML_DIR .'jumpbox_user.html', false, true, true);
file_write($data['guest'], AJAX_HTML_DIR . 'jumpbox_guest.html', false, true, true);
file_write($data['user'], AJAX_HTML_DIR . 'jumpbox_user.html', false, true, true);
//
// viewtopic_forum_select
//
$data = array(
'viewtopic_forum_select' => get_forum_select('admin', 'new_forum_id'),
'viewtopic_forum_select' => get_forum_select('admin', 'new_forum_id'),
);
$this->store('viewtopic_forum_select', $data);
@ -128,68 +144,62 @@ $this->store('viewtopic_forum_select', $data);
//
// latest_news
//
if ($bb_cfg['show_latest_news'] AND $news_forum_ids = $bb_cfg['latest_news_forum_id'])
{
$news_count = max($bb_cfg['latest_news_count'], 1);
if ($bb_cfg['show_latest_news'] and $news_forum_ids = $bb_cfg['latest_news_forum_id']) {
$news_count = max($bb_cfg['latest_news_count'], 1);
$data = DB()->fetch_rowset("
$data = DB()->fetch_rowset("
SELECT topic_id, topic_time, topic_title, forum_id
FROM ". BB_TOPICS ."
FROM " . BB_TOPICS . "
WHERE forum_id IN ($news_forum_ids)
AND topic_moved_id = 0
ORDER BY topic_time DESC
LIMIT $news_count
");
$this->store('latest_news', $data);
$this->store('latest_news', $data);
}
//
// Network_news
//
if ($bb_cfg['show_network_news'] AND $net_forum_ids = $bb_cfg['network_news_forum_id'])
{
$net_count = max($bb_cfg['network_news_count'], 1);
if ($bb_cfg['show_network_news'] and $net_forum_ids = $bb_cfg['network_news_forum_id']) {
$net_count = max($bb_cfg['network_news_count'], 1);
$data = DB()->fetch_rowset("
$data = DB()->fetch_rowset("
SELECT topic_id, topic_time, topic_title, forum_id
FROM ". BB_TOPICS ."
FROM " . BB_TOPICS . "
WHERE forum_id IN ($net_forum_ids)
AND topic_moved_id = 0
ORDER BY topic_time DESC
LIMIT $net_count
");
$this->store('network_news', $data);
$this->store('network_news', $data);
}
//
// Ads
//
if ($bb_cfg['show_ads'])
{
$ad_html = $ad_block_assignment = array();
if ($bb_cfg['show_ads']) {
$ad_html = $ad_block_assignment = array();
$active_ads = DB()->fetch_rowset("
$active_ads = DB()->fetch_rowset("
SELECT *
FROM ". BB_ADS ."
FROM " . BB_ADS . "
WHERE ad_status = 1
AND ad_start_time < NOW()
AND DATE_ADD(ad_start_time, INTERVAL ad_active_days DAY) > NOW()
");
foreach ($active_ads as $ad)
{
if ($ad['ad_block_ids'])
{
foreach(explode(',', $ad['ad_block_ids']) as $block_id)
{
$ad_block_assignment[$block_id][] = $ad['ad_id'];
}
}
$ad_html[$ad['ad_id']] = $ad['ad_html'];
}
foreach ($active_ads as $ad) {
if ($ad['ad_block_ids']) {
foreach (explode(',', $ad['ad_block_ids']) as $block_id) {
$ad_block_assignment[$block_id][] = $ad['ad_id'];
}
}
$ad_html[$ad['ad_id']] = $ad['ad_html'];
}
$this->store('ads', $ad_html);
bb_update_config(array('active_ads' => serialize($ad_block_assignment)));
}
$this->store('ads', $ad_html);
bb_update_config(array('active_ads' => serialize($ad_block_assignment)));
}