Skip to content

Commit 630cfd6

Browse files
committed
Fix linting error introduced by PHP-CS-Fixer v3.17.0
Signed-off-by: Christian König <ckoenig@posteo.de>
1 parent bf51243 commit 630cfd6

File tree

3 files changed

+20
-20
lines changed

3 files changed

+20
-20
lines changed

scripts/pi-hole/php/database.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,12 @@ function SQLite3_connect($filename, $mode = SQLITE3_OPEN_READONLY)
7373
/**
7474
* Add domains to a given table.
7575
*
76-
* @param $db object The SQLite3 database connection object
77-
* @param $table string The target table
78-
* @param $domains array Array of domains (strings) to be added to the table
79-
* @param $wildcardstyle boolean Whether to format the input domains in legacy wildcard notation
80-
* @param $returnnum boolean Whether to return an integer or a string
81-
* @param $type integer The target type (0 = exact whitelist, 1 = exact blacklist, 2 = regex whitelist, 3 = regex blacklist)
76+
* @param $db object The SQLite3 database connection object
77+
* @param $table string The target table
78+
* @param $domains array Array of domains (strings) to be added to the table
79+
* @param $wildcardstyle boolean Whether to format the input domains in legacy wildcard notation
80+
* @param $returnnum boolean Whether to return an integer or a string
81+
* @param $type integer The target type (0 = exact whitelist, 1 = exact blacklist, 2 = regex whitelist, 3 = regex blacklist)
8282
* @param mixed|null $comment
8383
*
8484
* @return string Success/error and number of processed domains
@@ -199,11 +199,11 @@ function add_to_table($db, $table, $domains, $comment = null, $wildcardstyle = f
199199
/**
200200
* Remove domains from a given table.
201201
*
202-
* @param $db object The SQLite3 database connection object
203-
* @param $table string The target table
204-
* @param $domains array Array of domains (strings) to be removed from the table
202+
* @param $db object The SQLite3 database connection object
203+
* @param $table string The target table
204+
* @param $domains array Array of domains (strings) to be removed from the table
205205
* @param $returnnum boolean Whether to return an integer or a string
206-
* @param $type integer The target type (0 = exact whitelist, 1 = exact blacklist, 2 = regex whitelist, 3 = regex blacklist)
206+
* @param $type integer The target type (0 = exact whitelist, 1 = exact blacklist, 2 = regex whitelist, 3 = regex blacklist)
207207
*
208208
* @return string Success/error and number of processed domains
209209
*/

scripts/pi-hole/php/password.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@ function verifyPassword($pwhash, $use_api = false)
7171

7272
// Login successful, redirect the user to the original requested page
7373
if (
74-
$_SERVER['REQUEST_METHOD'] === 'POST' &&
75-
strlen($_SERVER['SCRIPT_NAME']) >= 10 &&
76-
substr_compare($_SERVER['SCRIPT_NAME'], '/login.php', -10) === 0
74+
$_SERVER['REQUEST_METHOD'] === 'POST'
75+
&& strlen($_SERVER['SCRIPT_NAME']) >= 10
76+
&& substr_compare($_SERVER['SCRIPT_NAME'], '/login.php', -10) === 0
7777
) {
7878
header('Location: '.$redirect_url);
7979
exit;

scripts/pi-hole/php/teleporter.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ function archive_add_file($path, $name, $subdir = '')
3434
/**
3535
* Add the contents of a table to the archive.
3636
*
37-
* @param $name string The name of the file in the archive to save the table to
37+
* @param $name string The name of the file in the archive to save the table to
3838
* @param $table string The table to export
39-
* @param $type integer Type of domains to store
39+
* @param $type integer Type of domains to store
4040
*/
4141
function archive_add_table($name, $table, $type = -1)
4242
{
@@ -66,7 +66,7 @@ function archive_add_table($name, $table, $type = -1)
6666
/**
6767
* Restore the contents of a table from an uploaded archive.
6868
*
69-
* @param $file object The file in the archive to restore the table from
69+
* @param $file object The file in the archive to restore the table from
7070
* @param $table string The table to import
7171
* @param $flush boolean Whether to flush the table before importing the archived data
7272
*
@@ -214,9 +214,9 @@ function archive_restore_table($file, $table, $flush = false)
214214
/**
215215
* Create table rows from an uploaded archive file.
216216
*
217-
* @param $file object The file in the archive to import
218-
* @param $table string The target table
219-
* @param $flush boolean Whether to flush the table before importing the archived data
217+
* @param $file object The file in the archive to import
218+
* @param $table string The target table
219+
* @param $flush boolean Whether to flush the table before importing the archived data
220220
* @param $wildcardstyle boolean Whether to format the input domains in legacy wildcard notation
221221
*
222222
* @return int Number of processed rows from the imported file
@@ -270,7 +270,7 @@ function archive_insert_into_table($file, $table, $flush = false, $wildcardstyle
270270
* Flush table if requested. This subroutine flushes each table only once.
271271
*
272272
* @param $table string The target table
273-
* @param $type integer Type of item to flush in table (applies only to domainlist table)
273+
* @param $type integer Type of item to flush in table (applies only to domainlist table)
274274
*/
275275
function flush_table($table, $type = null)
276276
{

0 commit comments

Comments
 (0)