mirror of
https://github.com/vichan-devel/vichan.git
synced 2024-11-27 17:00:52 +01:00
Added: /pol/-like flags based on a953229de7
Conflicts: inc/config.php templates/post_form.html
This commit is contained in:
parent
17967436e3
commit
f83c87b623
@ -531,6 +531,21 @@
|
||||
$config['country_flags_condensed'] = true;
|
||||
$config['country_flags_condensed_css'] = 'static/flags/flags.css';
|
||||
|
||||
// Let the user choose a /pol/-like user_flag that will be shown in the post. For the user flags, please be aware
|
||||
// that you will have to disable BOTH country_flags and contry_flags_condensed optimization (at least on a board
|
||||
// where they are enabled).
|
||||
$config['user_flag'] = false;
|
||||
|
||||
// List of user_flag the user can choose. Flag must be placed in the directory set by $config['uri_flags']
|
||||
$config['user_flags'] = [];
|
||||
/* example:
|
||||
$config['user_flags'] = array (
|
||||
'nz' => 'Nazi',
|
||||
'cm' => 'Communist',
|
||||
'eu' => 'Europe'
|
||||
);
|
||||
*/
|
||||
|
||||
/*
|
||||
* ====================
|
||||
* Ban settings
|
||||
|
@ -201,6 +201,10 @@ function loadConfig() {
|
||||
$config['additional_javascript_url'] = $config['root'];
|
||||
if (!isset($config['uri_flags']))
|
||||
$config['uri_flags'] = $config['root'] . 'static/flags/%s.png';
|
||||
if (!isset($config['user_flag']))
|
||||
$config['user_flag'] = false;
|
||||
if (!isset($config['user_flags']))
|
||||
$config['user_flags'] = [];
|
||||
|
||||
if ($config['root_file']) {
|
||||
chdir($config['root_file']);
|
||||
|
14
post.php
14
post.php
@ -469,6 +469,20 @@ if (isset($_POST['delete'])) {
|
||||
}
|
||||
}
|
||||
|
||||
if ($config['user_flag'] && isset($_POST['user_flag']))
|
||||
if (!empty($_POST['user_flag']) ){
|
||||
|
||||
$user_flag = $_POST['user_flag'];
|
||||
|
||||
if (!isset($config['user_flags'][$user_flag]))
|
||||
error('Invalid flag selection!');
|
||||
|
||||
$flag_alt = isset($user_flag_alt) ? $user_flag_alt : $config['user_flags'][$user_flag];
|
||||
|
||||
$post['body'] .= "\n<tinyboard flag>" . strtolower($user_flag) . "</tinyboard>" .
|
||||
"\n<tinyboard flag alt>" . $flag_alt . "</tinyboard>";
|
||||
}
|
||||
|
||||
if (mysql_version() >= 50503) {
|
||||
$post['body_nomarkup'] = $post['body']; // Assume we're using the utf8mb4 charset
|
||||
} else {
|
||||
|
@ -79,6 +79,19 @@
|
||||
</td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
{% if config.user_flag %}
|
||||
<tr>
|
||||
<th>{% trans %}Flag{% endtrans %}</th>
|
||||
<td>
|
||||
<select name="user_flag" id="user_flag">
|
||||
<option value="">{% trans %}None{% endtrans %}</option>
|
||||
{% for flag, text in config.user_flags %}
|
||||
<option value="{{ flag }}">{{ text }}</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
</td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
<tr id="upload">
|
||||
<th>
|
||||
{% trans %}File{% endtrans %}
|
||||
|
Loading…
Reference in New Issue
Block a user