Skip to content

Commit fe4f4fe

Browse files
nilsteampassnetnilsteampassnet
committed
Merge branch 'hotfix/fixing_password_empty'
2 parents 8a1cfbe + 2e7756a commit fe4f4fe

File tree

9 files changed

+21
-17
lines changed

9 files changed

+21
-17
lines changed

‎includes/config/include.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
define('TP_VERSION', '3.1.4');
3030
define("UPGRADE_MIN_DATE", "1732981987");
31-
define('TP_VERSION_MINOR', '2');
31+
define('TP_VERSION_MINOR', '3');
3232
define('TP_TOOL_NAME', 'Teampass');
3333
define('TP_ONE_DAY_SECONDS', 86400);
3434
define('TP_ONE_WEEK_SECONDS', 604800);

‎install/install-steps/run.step1.php

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
include __DIR__.'/../../includes/config/include.php';
3434
// Load functions
3535
include_once(__DIR__ . '/../tp.functions.php');
36+
require_once __DIR__.'/install.functions.php';
3637

3738
$superGlobal = new SuperGlobal();
3839

‎install/install-steps/run.step2.php

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
include __DIR__.'/../../includes/config/include.php';
3434
// Load functions
3535
include_once(__DIR__ . '/../tp.functions.php');
36+
require_once __DIR__.'/install.functions.php';
3637

3738
$superGlobal = new SuperGlobal();
3839

‎install/install-steps/run.step3.php

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
include __DIR__.'/../../includes/config/include.php';
3434
// Load functions
3535
include_once(__DIR__ . '/../tp.functions.php');
36+
require_once __DIR__.'/install.functions.php';
3637

3738
$superGlobal = new SuperGlobal();
3839

‎install/install-steps/run.step4.php

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
include __DIR__.'/../../includes/config/include.php';
3434
// Load functions
3535
include_once(__DIR__ . '/../tp.functions.php');
36+
require_once __DIR__.'/install.functions.php';
3637

3738
$superGlobal = new SuperGlobal();
3839

‎install/install-steps/run.step5.php

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
require_once __DIR__.'/../../includes/config/include.php';
3535
// Load functions
3636
include_once(__DIR__ . '/../tp.functions.php');
37+
require_once __DIR__.'/install.functions.php';
3738

3839
$superGlobal = new SuperGlobal();
3940

‎install/install-steps/run.step6.php

+1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
require_once __DIR__.'/../../includes/config/include.php';
3838
// Load functions
3939
include_once(__DIR__ . '/../tp.functions.php');
40+
require_once __DIR__.'/install.functions.php';
4041

4142
$superGlobal = new SuperGlobal();
4243

‎pages/tasks.js.php

+6-8
Original file line numberDiff line numberDiff line change
@@ -242,15 +242,13 @@ function showProcessesDone() {
242242
toastr.info('<?php echo $lang->get('loading_data'); ?> ... <i class="fas fa-circle-notch fa-spin fa-2x"></i>');
243243

244244
if ($(this).data('type') === "add-new-job") {
245-
console.log('add new job')
246245
$.post(
247246
"sources/utilities.queries.php", {
248247
type: "handle_crontab_job",
249248
key: "<?php echo $session->get('key'); ?>"
250249
},
251250
function(data) {
252251
data = prepareExchangedData(data, "decode", "<?php echo $session->get('key'); ?>");
253-
console.log(data)
254252

255253
// Inform user
256254
toastr.remove();
@@ -289,9 +287,11 @@ function fetchTaskData(){
289287
// Fetch data
290288
setTimeout(fetchTaskData,20000);
291289

292-
// show value on slider
290+
// Synchronize range slider with number input
293291
$('.form-control-range').on("input", function() {
294-
$('#'+$(this).attr('id')+'_text').val($(this).val());
292+
const rangeValue = $(this).val();
293+
const numberInputId = '#' + $(this).attr('id') + '_text';
294+
$(numberInputId).val(rangeValue);
295295
});
296296

297297
// Handle delete task
@@ -307,7 +307,6 @@ function fetchTaskData(){
307307
},
308308
function(data) {
309309
data = prepareExchangedData(data, "decode", "<?php echo $session->get('key'); ?>");
310-
console.log(data)
311310

312311
$("#task-delete-user-confirm").modal('hide');
313312

@@ -378,7 +377,7 @@ function(data) {
378377
);
379378
return false;
380379
}
381-
console.log(data)
380+
382381
if (data.error === false) {
383382
toastr.remove();
384383
toastr.success(
@@ -413,7 +412,6 @@ function(data) {
413412
let task = $(this).data('task'),
414413
definition = $('#'+task+'_parameter_value').val().split(';');
415414

416-
console.log($('#'+task+'_parameter_value').val()+" -- "+definition[0]+";"+definition[1]+";"+definition[2])
417415
if (definition[0] === "hourly") {
418416
$('#task-define-modal-parameter-hourly').removeClass('hidden');
419417
$('#task-define-modal-parameter-daily, #task-define-modal-parameter-monthly').addClass('hidden');
@@ -512,7 +510,7 @@ function(data) {
512510
manuelTaskIsRunning = false;
513511
return false;
514512
}
515-
console.log(data);
513+
516514
if (data.error === false) {
517515
toastr.remove();
518516
toastr.success(

‎pages/tasks.php

+8-8
Original file line numberDiff line numberDiff line change
@@ -172,10 +172,10 @@
172172
<span class="badge badge-secondary ml-2" id="sending_emails_job_frequency_badge"></span>
173173
</div>
174174
<div class='col-2'>
175-
<input type='range' class='form-control form-control-sm form-control-range range-slider' id='sending_emails_job_frequency' min='0' max="59" value='<?php echo $SETTINGS['sending_emails_job_frequency'] ?? '2'; ?>'>
175+
<input type='range' class='form-control form-control-sm form-control-range range-slider' id='sending_emails_job_frequency' min='1' max="59" value='<?php echo $SETTINGS['sending_emails_job_frequency'] ?? '2'; ?>'>
176176
</div>
177177
<div class='col-1'>
178-
<input type='text' disabled class='form-control form-control-sm' id='sending_emails_job_frequency_text' value='<?php echo $SETTINGS['sending_emails_job_frequency'] ?? '2'; ?>'>
178+
<input type='number' disabled class='form-control form-control-sm' id='sending_emails_job_frequency_text' value='<?php echo $SETTINGS['sending_emails_job_frequency'] ?? '2'; ?>'>
179179
</div>
180180
</div>
181181

@@ -185,10 +185,10 @@
185185
<span class="badge badge-secondary ml-2" id="user_keys_job_frequency_badge"></span>
186186
</div>
187187
<div class='col-2'>
188-
<input type='range' class='form-control form-control-sm form-control-range range-slider' id='user_keys_job_frequency' min='0' max="59" value='<?php echo $SETTINGS['user_keys_job_frequency'] ?? '1'; ?>'>
188+
<input type='range' class='form-control form-control-sm form-control-range range-slider' id='user_keys_job_frequency' min='1' max="59" value='<?php echo $SETTINGS['user_keys_job_frequency'] ?? '1'; ?>'>
189189
</div>
190190
<div class='col-1'>
191-
<input type='text' disabled class='form-control form-control-sm' id='user_keys_job_frequency_text' value='<?php echo $SETTINGS['user_keys_job_frequency'] ?? '1'; ?>'>
191+
<input type='number' disabled class='form-control form-control-sm' id='user_keys_job_frequency_text' value='<?php echo $SETTINGS['user_keys_job_frequency'] ?? '1'; ?>'>
192192
</div>
193193
</div>
194194

@@ -198,10 +198,10 @@
198198
<span class="badge badge-secondary ml-2" id="items_ops_job_frequency_badge"></span>
199199
</div>
200200
<div class='col-2'>
201-
<input type='range' class='form-control form-control-sm form-control-range range-slider' id='items_ops_job_frequency' min='0' max="59" value='<?php echo $SETTINGS['items_ops_job_frequency'] ?? '1'; ?>'>
201+
<input type='range' class='form-control form-control-sm form-control-range range-slider' id='items_ops_job_frequency' min='1' max="59" value='<?php echo $SETTINGS['items_ops_job_frequency'] ?? '1'; ?>'>
202202
</div>
203203
<div class='col-1'>
204-
<input type='text' disabled class='form-control form-control-sm' id='items_ops_job_frequency_text' value='<?php echo $SETTINGS['items_ops_job_frequency'] ?? '1'; ?>'>
204+
<input type='number' disabled class='form-control form-control-sm' id='items_ops_job_frequency_text' value='<?php echo $SETTINGS['items_ops_job_frequency'] ?? '1'; ?>'>
205205
</div>
206206
</div>
207207

@@ -211,10 +211,10 @@
211211
<span class="badge badge-secondary ml-2" id="items_statistics_job_frequency_badge"></span>
212212
</div>
213213
<div class='col-2'>
214-
<input type='range' class='form-control form-control-sm form-control-range range-slider' id='items_statistics_job_frequency' min='0' max="59" value='<?php echo $SETTINGS['items_statistics_job_frequency'] ?? '5'; ?>'>
214+
<input type='range' class='form-control form-control-sm form-control-range range-slider' id='items_statistics_job_frequency' min='1' max="59" value='<?php echo $SETTINGS['items_statistics_job_frequency'] ?? '5'; ?>'>
215215
</div>
216216
<div class='col-1'>
217-
<input type='text' disabled class='form-control form-control-sm' id='items_statistics_job_frequency_text' value='<?php echo $SETTINGS['items_statistics_job_frequency'] ?? '5'; ?>'>
217+
<input type='number' disabled class='form-control form-control-sm' id='items_statistics_job_frequency_text' value='<?php echo $SETTINGS['items_statistics_job_frequency'] ?? '5'; ?>'>
218218
</div>
219219
</div>
220220

0 commit comments

Comments
 (0)