Skip to content

Commit 9b5c5fa

Browse files
author
Mariusz08
committed
Fix settings
1 parent 843e63e commit 9b5c5fa

File tree

2 files changed

+36
-15
lines changed

2 files changed

+36
-15
lines changed

forum/qa-plugin/send-pw-on-register/qa-pw-admin.php

Lines changed: 26 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,39 @@ class qa_pw_admin
55
public function admin_form(&$qa_content)
66
{
77
$isSaved = false;
8-
8+
$info = null;
9+
910
if (qa_clicked('sendPwMessageOnRegister_save')) {
10-
qa_opt('sendPwMessageOnRegister_messageContent', qa_post_text('messageContent'));
11-
qa_opt('sendPwMessageOnRegister_enabled', qa_post_text('enablePlugin'));
12-
qa_opt('sendPwMessageOnRegister_botId', qa_post_text('botId'));
13-
14-
$isSaved = true;
11+
$canSave = (bool) qa_post_text('enablePlugin');
12+
if (empty(qa_post_text('messageContent'))) {
13+
$canSave = false;
14+
$info = 'Empty message content';
15+
}
16+
17+
require_once QA_INCLUDE_DIR . 'db/users.php';
18+
19+
if ([] === qa_db_user_get_userid_handles(qa_post_text('botId'))) {
20+
$canSave = false;
21+
$info = 'Invalid bot id';
22+
}
23+
24+
if ($canSave) {
25+
qa_opt('sendPwMessageOnRegister_messageContent', qa_post_text('messageContent'));
26+
qa_opt('sendPwMessageOnRegister_enabled', qa_post_text('enablePlugin'));
27+
qa_opt('sendPwMessageOnRegister_botId', qa_post_text('botId'));
28+
$isSaved = true;
29+
} else {
30+
qa_opt('sendPwMessageOnRegister_enabled', false);
31+
}
1532
}
1633

17-
return $this->prepareAdminForm($isSaved);
34+
return $this->prepareAdminForm($isSaved, $info);
1835
}
1936

20-
private function prepareAdminForm($isSaved)
37+
private function prepareAdminForm($isSaved, $info)
2138
{
2239
return [
23-
'ok' => $isSaved ? 'Settings saved' : null,
40+
'ok' => $isSaved ? 'Settings saved' : $info,
2441
'fields' => [
2542
[
2643
'label' => 'Enable plugin',

forum/qa-plugin/send-pw-on-register/qa-pw-event.php

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,25 @@ public function process_event($event, $userId, $handle, $cookieId, $params)
1010

1111
$botId = qa_opt('sendPwMessageOnRegister_botId');
1212
$messageContent = qa_opt('sendPwMessageOnRegister_messageContent');
13-
13+
14+
if (empty($botId) || empty($messageContent)) {
15+
return;
16+
}
17+
1418
$messsageId = qa_db_message_create(
1519
$botId,
1620
$userId,
1721
$messageContent,
18-
''
22+
'',
23+
false
1924
);
2025

2126
$fromUserHandle = qa_db_query_sub('SELECT `handle` FROM ^users WHERE `userid` = #', $botId);
22-
$toUserHandle = qa_db_query_sub('SELECT `handle` FROM ^users WHERE `userid` = #', $userId);
23-
27+
2428
qa_report_event('u_message', $botId, $fromUserHandle, qa_cookie_get(), [
2529
'userid' => $userId,
26-
'handle' => $toUserHandle,
27-
'messageid' => $messageId,
30+
'handle' => $handle,
31+
'messageid' => (int) $messageId,
2832
'message' => $messageContent
2933
]);
3034
}

0 commit comments

Comments
 (0)