Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2025-04-25 08:40:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Review comments

Browse source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER 2019-07-09 11:41:44 +02:00
parent 3d3fc2947e
commit 5ff9052200
No known key found for this signature in database
GPG key ID: 00135ACBD90B28DD
3 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
advanced/Scripts/database_migration/gravity-db.sh
View file

@ -11,9 +11,12 @@
# Please see LICENSE file for your rights under this license.
upgrade_gravityDB(){
local database auditFile version
local database piholeDir auditFile version
database="${1}"
auditFile="${2}"
piholeDir="${2}"
auditFile="${piholeDir}/auditlog.list"
# Get database version
version="$(sqlite3 "${database}" "SELECT \"value\" FROM \"info\" WHERE \"property\" = 'version';")"
if [[ "$version" == "1" ]]; then

5
advanced/Scripts/webpage.sh
View file

@ -560,8 +560,7 @@ addAudit()
domains=""
for domain in "$@"
do
# Insert only the domain here. The date_added field will be
# filled with its default value (date_added = current timestamp)
# Check domain to be added. Only continue if it is valid
validDomain="$(checkDomain "${domain}")"
if [[ -n "${validDomain}" ]]; then
# Put comma in between domains when there is
@ -574,6 +573,8 @@ addAudit()
domains="${domains}('${domain}')"
fi
done
# Insert only the domain here. The date_added field will be
# filled with its default value (date_added = current timestamp)
sqlite3 "${gravityDBfile}" "INSERT INTO domain_audit (domain) VALUES ${domains};"
}