Skip to content

Commit bcb7a13

Browse files
ata-no-oneata-no-one
committed
Test timeout, indentation
1 parent 3d18f8a commit bcb7a13

2 files changed

Lines changed: 40 additions & 41 deletions

File tree

‎templates/operator.php‎

Lines changed: 39 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* SPDX-FileCopyrightText: 2025 G DATA CyberDefense AG <vaas@gdata.de>
45
* SPDX-License-Identifier: AGPL-3.0-or-later
@@ -16,63 +17,63 @@
1617
<tr class="basic_settings">
1718
<td>
1819
<div title="<?php p($l->t('Files scanned as "Malicious" are moved to this folder. '
19-
. 'They can still be downloaded etc. there, but this helps to prevent accidental use.'));?>"
20-
class="visible">
21-
<label for="quarantine_folder"><?php p($l->t('Quarantine folder'));?></label>
20+
. 'They can still be downloaded etc. there, but this helps to prevent accidental use.')); ?>"
21+
class="visible">
22+
<label for="quarantine_folder"><?php p($l->t('Quarantine folder')); ?></label>
2223
</div>
2324
</td>
2425
<td class="input_field">
25-
<input id="quarantine_folder" type="text" name="quarantineFolder"
26-
value="<?php p($_['quarantineFolder']); ?>"/>
26+
<input id="quarantine_folder" type="text" name="quarantineFolder"
27+
value="<?php p($_['quarantineFolder']); ?>" />
2728
</td>
2829
</tr>
2930
<tr class="basic_settings">
3031
<td>
3132
<div title="<?php p($l->t('Comma-separated allow list values. Can be paths, folders, '
32-
. 'file names or file types. Wildcards are not supported.'));?>"
33-
class="visible">
34-
<label for="scanOnlyThis"><?php p($l->t('Scan only this'));?></label>
33+
. 'file names or file types. Wildcards are not supported.')); ?>"
34+
class="visible">
35+
<label for="scanOnlyThis"><?php p($l->t('Scan only this')); ?></label>
3536
</div>
3637
</td>
3738
<td class="input_field">
38-
<input id="scanOnlyThis" type="text" name="scanOnlyThis"
39-
value="<?php p($_['scanOnlyThis']); ?>"/>
39+
<input id="scanOnlyThis" type="text" name="scanOnlyThis"
40+
value="<?php p($_['scanOnlyThis']); ?>" />
4041
</td>
4142
</tr>
4243
<tr class="basic_settings">
4344
<td>
4445
<div title="<?php p($l->t('Comma-separated block list values. Can be paths, folders, '
45-
. 'file names or file types. Wildcards are not supported.'));?>"
46-
class="visible">
47-
<label for="doNotScanThis"><?php p($l->t('Do not scan this'));?></label>
46+
. 'file names or file types. Wildcards are not supported.')); ?>"
47+
class="visible">
48+
<label for="doNotScanThis"><?php p($l->t('Do not scan this')); ?></label>
4849
</div>
4950
</td>
5051
<td class="input_field">
51-
<input id="doNotScanThis" type="text" name="doNotScanThis"
52-
value="<?php p($_['doNotScanThis']); ?>"/>
52+
<input id="doNotScanThis" type="text" name="doNotScanThis"
53+
value="<?php p($_['doNotScanThis']); ?>" />
5354
</td>
5455
</tr>
5556
<tr class="notify_mails">
5657
<td>
5758
<div title="<?php p($l->t('Mail addresses for notifications when malicious files are found '
58-
. 'or a user tries to upload them. Must be comma-separated.'));?>"
59-
class="visible">
60-
<label for="notify_mails"><?php p($l->t('Notify Mails'));?></label>
59+
. 'or a user tries to upload them. Must be comma-separated.')); ?>"
60+
class="visible">
61+
<label for="notify_mails"><?php p($l->t('Notify Mails')); ?></label>
6162
</div>
6263
</td>
6364
<td class="input_field">
64-
<input id="notify_mails" type="text" name="notify_mails"
65-
value="<?php p($_['notifyMail']); ?>"/>
65+
<input id="notify_mails" type="text" name="notify_mails"
66+
value="<?php p($_['notifyMail']); ?>" />
6667
</td>
6768
</tr>
6869
</table>
69-
<input class="submit-button" id="operator_submit" type="submit" value="<?php p($l->t('Save'));?>" />
70+
<input class="submit-button" id="operator_submit" type="submit" value="<?php p($l->t('Save')); ?>" />
7071
<span id="operator_save_msg"></span>
7172
<div class="warning">
72-
<strong>Caution:</strong> The use of the <em>"Scan only this"</em> and <em>"Do not scan this"</em>
73-
settings should be approached with caution. Using these settings allows malicious users to upload
74-
and distribute malicious content via the Nextcloud instance. It is recommended that you carefully
75-
consider the implications of these settings and use them in a way that does not jeopardize the
73+
<strong>Caution:</strong> The use of the <em>"Scan only this"</em> and <em>"Do not scan this"</em>
74+
settings should be approached with caution. Using these settings allows malicious users to upload
75+
and distribute malicious content via the Nextcloud instance. It is recommended that you carefully
76+
consider the implications of these settings and use them in a way that does not jeopardize the
7677
security of your system and data.
7778
</div>
7879
</fieldset>
@@ -81,10 +82,10 @@ class="visible">
8182
<table class="file_scan_options">
8283
<tr id="scan_option_auto_scan">
8384
<td>
84-
<input id="auto_scan_files" class="toggle-round" type="checkbox" name="autoScanFiles"/>
85+
<input id="auto_scan_files" class="toggle-round" type="checkbox" name="autoScanFiles" />
8586
<label for="auto_scan_files"></label>
8687
</td>
87-
<td><label for="auto_scan"><?php p($l->t('Automatic file scanning'));?></label></td>
88+
<td><label for="auto_scan"><?php p($l->t('Automatic file scanning')); ?></label></td>
8889
</tr>
8990
<tr>
9091
<td>
@@ -93,9 +94,9 @@ class="visible">
9394
</td>
9495
<td>
9596
<div title="<?php p($l->t('If the scan result is "Malicious", this is added to the front '
96-
. 'of the file name. Increases the visibility of malicious content.'));?>"
97-
class="visible">
98-
<label><?php p($l->t('Set prefix for malicious files'));?></label>
97+
. 'of the file name. Increases the visibility of malicious content.')); ?>"
98+
class="visible">
99+
<label><?php p($l->t('Set prefix for malicious files')); ?></label>
99100
</div>
100101
</td>
101102
</tr>
@@ -106,9 +107,9 @@ class="visible">
106107
</td>
107108
<td>
108109
<div title="<?php p($l->t('Files that have not yet been scanned will no longer be tagged "Unscanned", '
109-
. 'but they will still be scanned if "Automatic file scanning" is switched on.'));?>"
110-
class="visible">
111-
<label><?php p($l->t('Disable Unscanned tag'));?></label>
110+
. 'but they will still be scanned if "Automatic file scanning" is switched on.')); ?>"
111+
class="visible">
112+
<label><?php p($l->t('Disable Unscanned tag')); ?></label>
112113
</div>
113114
</td>
114115
</tr>
@@ -119,15 +120,15 @@ class="visible">
119120
</td>
120121
<td>
121122
<div title="<?php p($l->t('If a user tries to upload an infected file an email is send '
122-
. 'to all \'Notify Mails\' receiver'));?>"
123-
class="visible">
124-
<label><?php p($l->t('Send mails on infected file upload'));?></label>
123+
. 'to all \'Notify Mails\' receiver')); ?>"
124+
class="visible">
125+
<label><?php p($l->t('Send mails on infected file upload')); ?></label>
125126
</div>
126127
</td>
127128
</tr>
128129
</table>
129130
<h3>
130-
<label><?php p($l->t('Files scanned: '));?></label>
131+
<label><?php p($l->t('Files scanned: ')); ?></label>
131132
<label id="scan_counter"></label>
132133
</h3>
133-
</div>
134+
</div>

‎tests/integration/phpunit.xml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
77
-->
88

99
<phpunit bootstrap="bootstrap.php"
10-
timeoutForSmallTests="900"
11-
timeoutForMediumTests="900"
12-
timeoutForLargeTests="900"
10+
defaultTimeLimit="60"
1311
displayDetailsOnTestsThatTriggerDeprecations="true"
1412
>
1513
<testsuite name='G DATA Antivirus Integration Tests'>

0 commit comments

Comments
 (0)