Minor improvements (#1315)

* Minor improvements

* Update functions.php

* Revert "Update functions.php"

This reverts commit 2a1c0c6ebe.

* Update functions.php

* Revert "Update functions.php"

This reverts commit b766af59ac.

* Update functions.php

* Update CHANGELOG.md
This commit is contained in:
Roman Kelesidis 2024-01-13 15:29:32 +07:00 committed by GitHub
commit ae616f3a74
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 10 deletions

View file

@ -10,7 +10,7 @@
- Used datastore to show statistic for more performance [\#1309](https://github.com/torrentpier/torrentpier/pull/1309) ([belomaxorka](https://github.com/belomaxorka))
- Used `humn_size()` to count average of releases in tr_stats.php [\#1313](https://github.com/torrentpier/torrentpier/pull/1313) ([belomaxorka](https://github.com/belomaxorka))
- Some enhancements in default template [\#1312](https://github.com/torrentpier/torrentpier/pull/1312) ([belomaxorka](https://github.com/belomaxorka))
- Minor improvements [\#1306](https://github.com/torrentpier/torrentpier/pull/1306), [\#1307](https://github.com/torrentpier/torrentpier/pull/1307), [\#1308](https://github.com/torrentpier/torrentpier/pull/1308) ([belomaxorka](https://github.com/belomaxorka))
- Minor improvements [\#1306](https://github.com/torrentpier/torrentpier/pull/1306), [\#1307](https://github.com/torrentpier/torrentpier/pull/1307), [\#1308](https://github.com/torrentpier/torrentpier/pull/1308), [\#1315](https://github.com/torrentpier/torrentpier/pull/1315) ([belomaxorka](https://github.com/belomaxorka))
- Updated deps [\#1304](https://github.com/torrentpier/torrentpier/pull/1304), [\#1305](https://github.com/torrentpier/torrentpier/pull/1305) ([belomaxorka](https://github.com/belomaxorka))
## [v2.4.0](https://github.com/torrentpier/torrentpier/tree/v2.4.0) (2024-01-01)

View file

@ -88,7 +88,7 @@ switch ($mode) {
$this->response['val']['tpl-last-edit-tst'] = $tpl_data['tpl_last_edit_tm'];
$this->response['html']['tpl-name-old-save'] = $tpl_data['tpl_name'];
$this->response['html']['tpl-last-edit-time'] = bb_date($tpl_data['tpl_last_edit_tm'], 'd-M-y H:i');
$this->response['html']['tpl-last-edit-by'] = get_username((int)$tpl_data['tpl_last_edit_by']);
$this->response['html']['tpl-last-edit-by'] = profile_url(get_userdata((int)$tpl_data['tpl_last_edit_by']));
$this->response['tpl_rules_href'] = POST_URL . $tpl_data['tpl_rules_post_id'] . '#' . $tpl_data['tpl_rules_post_id'];
break;
@ -124,7 +124,7 @@ switch ($mode) {
if ($tpl_data['tpl_last_edit_tm'] > $this->request['tpl_l_ed_tst'] && $tpl_data['tpl_last_edit_by'] != $userdata['user_id']) {
$last_edit_by_username = get_username((int)$tpl_data['tpl_last_edit_by']);
$msg = "Изменения не были сохранены!\n\n";
$msg .= 'Шаблон был отредактирован: ' . html_entity_decode($last_edit_by_username) . ', ' . delta_time($tpl_data['tpl_last_edit_tm']) . " назад\n\n";
$msg .= 'Шаблон был отредактирован: ' . htmlCHR($last_edit_by_username) . ', ' . bb_date($tpl_data['tpl_last_edit_tm'], 'd-M-y H:i');
$this->ajax_die($msg);
}
$sql = "UPDATE " . BB_TOPIC_TPL . " SET " . DB()->build_array('UPDATE', $sql_args) . " WHERE tpl_id = $tpl_id";

View file

@ -304,7 +304,7 @@ function auth($type, $forum_id, $ug_data, array $f_access = [], $group_perm = UG
}
if (empty($f_access)) {
trigger_error(__FUNCTION__ . '(): empty $f_access', E_USER_ERROR);
return [];
}
//
@ -802,7 +802,7 @@ function generate_user_info($row, bool $have_auth = IS_ADMIN): array
$email_uri = ($bb_cfg['board_email_form']) ? ("profile.php?mode=email&" . POST_USERS_URL . "=" . $row['user_id']) : 'mailto:' . $row['user_email'];
$email = '<a class="editable" href="' . $email_uri . '">' . $row['user_email'] . '</a>';
} else {
$email = $lang['NOSELECT'];
$email = $lang['HIDDEN_USER'];
}
if ($row['user_website']) {

View file

@ -74,7 +74,7 @@ if ($edit_tpl_mode) {
'TPL_COMMENT' => $tpl_data['tpl_comment'],
'TPL_RULES_POST_ID' => $tpl_data['tpl_rules_post_id'],
'TPL_LAST_EDIT_TIME' => bb_date($tpl_data['tpl_last_edit_tm'], 'd-M-y H:i'),
'TPL_LAST_EDIT_USER' => get_username((int)$tpl_data['tpl_last_edit_by']),
'TPL_LAST_EDIT_USER' => profile_url(get_userdata((int)$tpl_data['tpl_last_edit_by'])),
'TPL_LAST_EDIT_TIMESTAMP' => $tpl_data['tpl_last_edit_tm']
]);
}

View file

@ -4717,7 +4717,7 @@ $(function(){
<fieldset>
<legend>Включить/Загрузить</legend>
<div style="padding: 2px 12px 6px;">
Шаблоны: &nbsp;
{L_RELEASE}: &nbsp;
<!-- IF TPL_SELECT -->{TPL_SELECT} &nbsp;
<input type="button" value="Включить в этом форуме" class="bold" onclick="ajax.topic_tpl('assign', {tpl_id: $('#forum_tpl_select').val()})" /> &nbsp;
<input type="button" value="Загрузить" onclick="ajax.topic_tpl('load')" /> &nbsp;
@ -4728,7 +4728,7 @@ $(function(){
<!-- IF NO_TPL_ASSIGNED -->
В этом форуме шаблоны <b>не включены</b><br />
<!-- ELSE -->
Сейчас в этом форуме включен шаблон <b>{TPL_NAME}</b><br />
Сейчас в этом форуме включен шаблон: <b>{TPL_NAME}</b><br />
<!-- ENDIF -->
</span>
</div>
@ -4745,7 +4745,7 @@ $(function(){
<div class="label"><a href="{POST_URL}{TPL_RULES_POST_ID}#{TPL_RULES_POST_ID}" id="tpl-rules-link" target="_blank">Правила</a> (ссылка на сообщение с правилами или номер сообщения):</div>
<input type="text" id="tpl-rules-save" size="60" value="{TPL_RULES_POST_ID}" style="width: 75%" /><br />
<div class="label">Комментарий:</div>
<div class="label">{L_COMMENT}:</div>
<textarea id="tpl-comment-save" rows="2" cols="80" class="editor" style="width: 90%">{TPL_COMMENT}</textarea>
<div class="label">Последний раз редактировалось: <i id="tpl-last-edit-time">{TPL_LAST_EDIT_TIME}</i> by <b id="tpl-last-edit-by">{TPL_LAST_EDIT_USER}</b></div>
@ -4769,7 +4769,7 @@ $(function(){
<div class="label">Правила (ссылка на сообщение с правилами или номер сообщения):</div>
<input type="text" id="tpl-rules-new" size="60" value="" style="width: 75%" /><br />
<div class="label">Комментарий:</div>
<div class="label">{L_COMMENT}:</div>
<textarea id="tpl-comment-new" rows="2" cols="10" class="editor" style="width: 100%"></textarea><br />
<input type="button" class="bold" value="Создать новый шаблон" onclick="ajax.topic_tpl('new');" /><br /><br />