Merge pull request #30 from torrentpier/feature/terms

Feature/terms
This commit is contained in:
Exile 2014-08-30 18:44:23 +04:00
commit 0865d0f9ea
9 changed files with 111 additions and 4 deletions

View file

@ -0,0 +1,32 @@
<?php
if (!empty($setmodules)) {
$module['GENERAL']['TERMS'] = basename(__FILE__);
return;
}
require('./pagestart.php');
require(INC_DIR . 'bbcode.php');
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
bb_update_config(array(TERMS_KEY => $_POST['message']));
}
$message = '';
$sql = "SELECT config_value FROM " . BB_CONFIG . " WHERE config_name='" . TERMS_KEY . "'";
if ($result = DB()->sql_query($sql)) {
$row = DB()->sql_fetchrow($result);
$message = $row['config_value'];
}
$template->assign_vars(array(
'S_CONFIG_ACTION' => 'admin_terms.php',
'CONFIG' => true,
'MESSAGE' => $message,
'EXT_LINK_NEW_WIN' => $bb_cfg['ext_link_new_win'],
'PREVIEW_HTML' => (isset($_REQUEST['preview'])) ? bbcode2html($message) : ''
));
print_page('admin_terms.tpl', 'admin');

View file

@ -48,6 +48,8 @@ define('TOR_TYPE_SILVER', 2);
define('GUEST_UID', -1); define('GUEST_UID', -1);
define('BOT_UID', -746); define('BOT_UID', -746);
define('TERMS_KEY', 'terms');
// DBS // DBS
class DBS class DBS
{ {

View file

@ -600,7 +600,7 @@ $banned_user_agents = array(
$bb_cfg['trash_forum_id'] = 0; // (int) 7 $bb_cfg['trash_forum_id'] = 0; // (int) 7
$bb_cfg['first_logon_redirect_url'] = 'index.php'; $bb_cfg['first_logon_redirect_url'] = 'index.php';
$bb_cfg['terms_and_conditions_url'] = 'index.php'; $bb_cfg['terms_and_conditions_url'] = 'terms.php';
$bb_cfg['user_agreement_url'] = 'misc.php?do=info&show=user_agreement'; $bb_cfg['user_agreement_url'] = 'misc.php?do=info&show=user_agreement';
$bb_cfg['copyright_holders_url'] = 'misc.php?do=info&show=copyright_holders'; $bb_cfg['copyright_holders_url'] = 'misc.php?do=info&show=copyright_holders';

View file

@ -2877,4 +2877,6 @@ $lang['ATOM_NO_FORUM'] = 'This forum does not have a feed (no ongoing topics)';
$lang['ATOM_NO_USER'] = 'This user does not have a feed (no ongoing topics)'; $lang['ATOM_NO_USER'] = 'This user does not have a feed (no ongoing topics)';
$lang['HASH_INVALID'] = 'Hash %s is invalid'; $lang['HASH_INVALID'] = 'Hash %s is invalid';
$lang['HASH_NOT_FOUND'] = 'Release with hash %s not found'; $lang['HASH_NOT_FOUND'] = 'Release with hash %s not found';
$lang['TERMS_ADMIN_EMPTY_TEXT'] = '[align=center]The text of this page is edited at [url]http://%s/admin/admin_terms.php[/url][/align]';

View file

@ -2877,4 +2877,6 @@ $lang['ATOM_NO_FORUM'] = 'Для этого форума нет ленты (не
$lang['ATOM_NO_USER'] = 'Для этого пользователя нет ленты (нет начатых тем)'; $lang['ATOM_NO_USER'] = 'Для этого пользователя нет ленты (нет начатых тем)';
$lang['HASH_INVALID'] = 'Хэш %s некорректен'; $lang['HASH_INVALID'] = 'Хэш %s некорректен';
$lang['HASH_NOT_FOUND'] = 'Раздача с хэшем %s не найдена'; $lang['HASH_NOT_FOUND'] = 'Раздача с хэшем %s не найдена';
$lang['TERMS_ADMIN_EMPTY_TEXT'] = '[align=center]Текст этой страницы редактируется по адресу [url]http://%s/admin/admin_terms.php[/url][/align]';

View file

@ -2877,4 +2877,6 @@ $lang['ATOM_NO_FORUM'] = 'Для цього форуму немає стрічк
$lang['ATOM_NO_USER'] = 'Для цього користувача немає стрічки (немає початих тем)'; $lang['ATOM_NO_USER'] = 'Для цього користувача немає стрічки (немає початих тем)';
$lang['HASH_INVALID'] = 'Хеш %s некоректний'; $lang['HASH_INVALID'] = 'Хеш %s некоректний';
$lang['HASH_NOT_FOUND'] = 'Роздача з хешем %s не знайдено'; $lang['HASH_NOT_FOUND'] = 'Роздача з хешем %s не знайдено';
$lang['TERMS_ADMIN_EMPTY_TEXT'] = '[align=center]Текст цієї сторінки редагується за адресою [url]http://%s/admin/admin_terms.php[/url][/align]';

View file

@ -0,0 +1,25 @@
<script type="text/javascript" src="/misc/js/bbcode.js"></script>
<script type="text/javascript">
var ExternalLinks_InNewWindow = '{EXT_LINK_NEW_WIN}';
var hidePostImg = false;
</script>
<form action="{S_CONFIG_ACTION}" method="post">
<table class="forumline">
<tr>
<th>{L_TERMS}</th>
</tr>
<tr id="view_message"<!-- IF not PREVIEW_HTML --> class="hidden"<!-- ENDIF -->>
<td class="row1">
<div class="view-message">{PREVIEW_HTML}</div>
</td>
</tr>
<tr>
<td>
<!-- INCLUDE posting_editor.tpl -->
</td>
</tr>
</table>
</form>
<br clear="all"/>

View file

@ -0,0 +1,10 @@
<table class="forumline">
<tr>
<th>{L_TERMS}</th>
</tr>
<tr>
<td class="row1">
{TERMS_HTML}
</td>
</tr>
</table>

32
upload/terms.php Normal file
View file

@ -0,0 +1,32 @@
<?php
/**
* User: dimka3210
* Date: 30.08.14
* Time: 15:15
*/
define('BB_ROOT', './');
require(BB_ROOT . 'common.php');
require(INC_DIR . 'bbcode.php');
$user->session_start();
$message = '';
$sql = "SELECT config_value FROM " . BB_CONFIG . " WHERE config_name='" . TERMS_KEY . "'";
if ($result = DB()->sql_query($sql)) {
$row = DB()->sql_fetchrow($result);
$message = $row['config_value'];
}
if (!$message && IS_ADMIN) {
$message = sprintf($lang['TERMS_ADMIN_EMPTY_TEXT'], $domain_name);
} elseif (!$message) {
redirect('/');
}
$template->assign_vars(array(
'TERMS_HTML' => bbcode2html($message)
));
print_page('terms.tpl');