{"action":"created","comment":{"url":"https://api.github.com/repos/pi-hole/AdminLTE/pulls/comments/93302283","pull_request_review_id":13827028,"id":93302283,"diff_hunk":"@@ -183,10 +185,15 @@ function setShowBlockedPermitted()\n     }\n \n     function getAllQueries($orderBy) {\n-        global $log,$gravity,$showBlocked,$showPermitted;\n+        global $log,$gravity,$showBlocked,$showPermitted,$whitelist,$blacklist;\n         $allQueries = array(\"data\" => array());\n         $dns_queries = getDnsQueriesAll($log);\n-        $gravity_domains = getGravityDomains($gravity);\n+        $gravity_domains = getDomains($gravity, true);\n+        $whitelist_domains = getDomains($whitelist, false);\n+        $blacklist_domains = getDomains($blacklist, true);\n+\n+        $gravity_domains = array_merge($gravity_domains, $whitelist_domains, $blacklist_domains);","path":"data.php","position":null,"original_position":22,"commit_id":"f9a601c5b0490d2ab8b52bdd13af5787596e15e3","original_commit_id":"4b7f20cfaecbebcc2296aad58975f63a1e0cc6cf","user":{"login":"Mcat12","id":4417660,"avatar_url":"https://avatars.githubusercontent.com/u/4417660?v=3","gravatar_id":"","url":"https://api.github.com/users/Mcat12","html_url":"https://github.com/Mcat12","followers_url":"https://api.github.com/users/Mcat12/followers","following_url":"https://api.github.com/users/Mcat12/following{/other_user}","gists_url":"https://api.github.com/users/Mcat12/gists{/gist_id}","starred_url":"https://api.github.com/users/Mcat12/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Mcat12/subscriptions","organizations_url":"https://api.github.com/users/Mcat12/orgs","repos_url":"https://api.github.com/users/Mcat12/repos","events_url":"https://api.github.com/users/Mcat12/events{/privacy}","received_events_url":"https://api.github.com/users/Mcat12/received_events","type":"User","site_admin":false},"body":"There is really no way to avoid having three arrays, since we have to read in the gravity domains, whitelist, and blacklist.","created_at":"2016-12-20T19:00:44Z","updated_at":"2016-12-20T19:00:44Z","html_url":"https://github.com/pi-hole/AdminLTE/pull/270#discussion_r93302283","pull_request_url":"https://api.github.com/repos/pi-hole/AdminLTE/pulls/270","_links":{"self":{"href":"https://api.github.com/repos/pi-hole/AdminLTE/pulls/comments/93302283"},"html":{"href":"https://github.com/pi-hole/AdminLTE/pull/270#discussion_r93302283"},"pull_request":{"href":"https://api.github.com/repos/pi-hole/AdminLTE/pulls/270"}}},"pull_request":{"url":"https://api.github.com/repos/pi-hole/AdminLTE/pulls/270","id":98798734,"html_url":"https://github.com/pi-hole/AdminLTE/pull/270","diff_url":"https://github.com/pi-hole/AdminLTE/pull/270.diff","patch_url":"https://github.com/pi-hole/AdminLTE/pull/270.patch","issue_url":"https://api.github.com/repos/pi-hole/AdminLTE/issues/270","number":270,"state":"open","locked":false,"title":"Fix Query Log Wrong Status","user":{"login":"Mcat12","id":4417660,"avatar_url":"https://avatars.githubusercontent.com/u/4417660?v=3","gravatar_id":"","url":"https://api.github.com/users/Mcat12","html_url":"https://github.com/Mcat12","followers_url":"https://api.github.com/users/Mcat12/followers","following_url":"https://api.github.com/users/Mcat12/following{/other_user}","gists_url":"https://api.github.com/users/Mcat12/gists{/gist_id}","starred_url":"https://api.github.com/users/Mcat12/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Mcat12/subscriptions","organizations_url":"https://api.github.com/users/Mcat12/orgs","repos_url":"https://api.github.com/users/Mcat12/repos","events_url":"https://api.github.com/users/Mcat12/events{/privacy}","received_events_url":"https://api.github.com/users/Mcat12/received_events","type":"User","site_admin":false},"body":"Changes proposed in this pull request:\r\n\r\n- Make sure the query log takes into account the whitelist and blacklist, because whitelisted entries were showing up as blocked if they were in a list and the same idea for blacklisted entries.\r\n\r\n@pi-hole/dashboard\r\n","created_at":"2016-12-20T18:13:15Z","updated_at":"2016-12-20T19:00:44Z","closed_at":null,"merged_at":null,"merge_commit_sha":"2a33a55f51e68390e0fd49cdc40f11493cc2d381","assignee":null,"assignees":[],"milestone":null,"commits_url":"https://api.github.com/repos/pi-hole/AdminLTE/pulls/270/commits","review_comments_url":"https://api.github.com/repos/pi-hole/AdminLTE/pulls/270/comments","review_comment_url":"https://api.github.com/repos/pi-hole/AdminLTE/pulls/comments{/number}","comments_url":"https://api.github.com/repos/pi-hole/AdminLTE/issues/270/comments","statuses_url":"https://api.github.com/repos/pi-hole/AdminLTE/statuses/f9a601c5b0490d2ab8b52bdd13af5787596e15e3","head":{"label":"pi-hole:fix/QueryLogWrongStatus","ref":"fix/QueryLogWrongStatus","sha":"f9a601c5b0490d2ab8b52bdd13af5787596e15e3","user":{"login":"pi-hole","id":16827203,"avatar_url":"https://avatars.githubusercontent.com/u/16827203?v=3","gravatar_id":"","url":"https://api.github.com/users/pi-hole","html_url":"https://github.com/pi-hole","followers_url":"https://api.github.com/users/pi-hole/followers","following_url":"https://api.github.com/users/pi-hole/following{/other_user}","gists_url":"https://api.github.com/users/pi-hole/gists{/gist_id}","starred_url":"https://api.github.com/users/pi-hole/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/pi-hole/subscriptions","organizations_url":"https://api.github.com/users/pi-hole/orgs","repos_url":"https://api.github.com/users/pi-hole/repos","events_url":"https://api.github.com/users/pi-hole/events{/privacy}","received_events_url":"https://api.github.com/users/pi-hole/received_events","type":"Organization","site_admin":false},"repo":{"id":39698170,"name":"AdminLTE","full_name":"pi-hole/AdminLTE","owner":{"login":"pi-hole","id":16827203,"avatar_url":"https://avatars.githubusercontent.com/u/16827203?v=3","gravatar_id":"","url":"https://api.github.com/users/pi-hole","html_url":"https://github.com/pi-hole","followers_url":"https://api.github.com/users/pi-hole/followers","following_url":"https://api.github.com/users/pi-hole/following{/other_user}","gists_url":"https://api.github.com/users/pi-hole/gists{/gist_id}","starred_url":"https://api.github.com/users/pi-hole/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/pi-hole/subscriptions","organizations_url":"https://api.github.com/users/pi-hole/orgs","repos_url":"https://api.github.com/users/pi-hole/repos","events_url":"https://api.github.com/users/pi-hole/events{/privacy}","received_events_url":"https://api.github.com/users/pi-hole/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/pi-hole/AdminLTE","description":"Pi-hole Dashboard for stats and more","fork":false,"url":"https://api.github.com/repos/pi-hole/AdminLTE","forks_url":"https://api.github.com/repos/pi-hole/AdminLTE/forks","keys_url":"https://api.github.com/repos/pi-hole/AdminLTE/keys{/key_id}","collaborators_url":"https://api.github.com/repos/pi-hole/AdminLTE/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/pi-hole/AdminLTE/teams","hooks_url":"https://api.github.com/repos/pi-hole/AdminLTE/hooks","issue_events_url":"https://api.github.com/repos/pi-hole/AdminLTE/issues/events{/number}","events_url":"https://api.github.com/repos/pi-hole/AdminLTE/events","assignees_url":"https://api.github.com/repos/pi-hole/AdminLTE/assignees{/user}","branches_url":"https://api.github.com/repos/pi-hole/AdminLTE/branches{/branch}","tags_url":"https://api.github.com/repos/pi-hole/AdminLTE/tags","blobs_url":"https://api.github.com/repos/pi-hole/AdminLTE/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/pi-hole/AdminLTE/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/pi-hole/AdminLTE/git/refs{/sha}","trees_url":"https://api.github.com/repos/pi-hole/AdminLTE/git/trees{/sha}","statuses_url":"https://api.github.com/repos/pi-hole/AdminLTE/statuses/{sha}","languages_url":"https://api.github.com/repos/pi-hole/AdminLTE/languages","stargazers_url":"https://api.github.com/repos/pi-hole/AdminLTE/stargazers","contributors_url":"https://api.github.com/repos/pi-hole/AdminLTE/contributors","subscribers_url":"https://api.github.com/repos/pi-hole/AdminLTE/subscribers","subscription_url":"https://api.github.com/repos/pi-hole/AdminLTE/subscription","commits_url":"https://api.github.com/repos/pi-hole/AdminLTE/commits{/sha}","git_commits_url":"https://api.github.com/repos/pi-hole/AdminLTE/git/commits{/sha}","comments_url":"https://api.github.com/repos/pi-hole/AdminLTE/comments{/number}","issue_comment_url":"https://api.github.com/repos/pi-hole/AdminLTE/issues/comments{/number}","contents_url":"https://api.github.com/repos/pi-hole/AdminLTE/contents/{+path}","compare_url":"https://api.github.com/repos/pi-hole/AdminLTE/compare/{base}...{head}","merges_url":"https://api.github.com/repos/pi-hole/AdminLTE/merges","archive_url":"https://api.github.com/repos/pi-hole/AdminLTE/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/pi-hole/AdminLTE/downloads","issues_url":"https://api.github.com/repos/pi-hole/AdminLTE/issues{/number}","pulls_url":"https://api.github.com/repos/pi-hole/AdminLTE/pulls{/number}","milestones_url":"https://api.github.com/repos/pi-hole/AdminLTE/milestones{/number}","notifications_url":"https://api.github.com/repos/pi-hole/AdminLTE/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/pi-hole/AdminLTE/labels{/name}","releases_url":"https://api.github.com/repos/pi-hole/AdminLTE/releases{/id}","deployments_url":"https://api.github.com/repos/pi-hole/AdminLTE/deployments","created_at":"2015-07-25T18:45:30Z","updated_at":"2016-12-19T09:28:35Z","pushed_at":"2016-12-20T18:39:11Z","git_url":"git://github.com/pi-hole/AdminLTE.git","ssh_url":"git@github.com:pi-hole/AdminLTE.git","clone_url":"https://github.com/pi-hole/AdminLTE.git","svn_url":"https://github.com/pi-hole/AdminLTE","homepage":"https://pi-hole.net","size":24099,"stargazers_count":76,"watchers_count":76,"language":"HTML","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":59,"mirror_url":null,"open_issues_count":19,"forks":59,"open_issues":19,"watchers":76,"default_branch":"master"}},"base":{"label":"pi-hole:devel","ref":"devel","sha":"472833cdbd1b43a593829427ca8c9a7135982519","user":{"login":"pi-hole","id":16827203,"avatar_url":"https://avatars.githubusercontent.com/u/16827203?v=3","gravatar_id":"","url":"https://api.github.com/users/pi-hole","html_url":"https://github.com/pi-hole","followers_url":"https://api.github.com/users/pi-hole/followers","following_url":"https://api.github.com/users/pi-hole/following{/other_user}","gists_url":"https://api.github.com/users/pi-hole/gists{/gist_id}","starred_url":"https://api.github.com/users/pi-hole/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/pi-hole/subscriptions","organizations_url":"https://api.github.com/users/pi-hole/orgs","repos_url":"https://api.github.com/users/pi-hole/repos","events_url":"https://api.github.com/users/pi-hole/events{/privacy}","received_events_url":"https://api.github.com/users/pi-hole/received_events","type":"Organization","site_admin":false},"repo":{"id":39698170,"name":"AdminLTE","full_name":"pi-hole/AdminLTE","owner":{"login":"pi-hole","id":16827203,"avatar_url":"https://avatars.githubusercontent.com/u/16827203?v=3","gravatar_id":"","url":"https://api.github.com/users/pi-hole","html_url":"https://github.com/pi-hole","followers_url":"https://api.github.com/users/pi-hole/followers","following_url":"https://api.github.com/users/pi-hole/following{/other_user}","gists_url":"https://api.github.com/users/pi-hole/gists{/gist_id}","starred_url":"https://api.github.com/users/pi-hole/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/pi-hole/subscriptions","organizations_url":"https://api.github.com/users/pi-hole/orgs","repos_url":"https://api.github.com/users/pi-hole/repos","events_url":"https://api.github.com/users/pi-hole/events{/privacy}","received_events_url":"https://api.github.com/users/pi-hole/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/pi-hole/AdminLTE","description":"Pi-hole Dashboard for stats and more","fork":false,"url":"https://api.github.com/repos/pi-hole/AdminLTE","forks_url":"https://api.github.com/repos/pi-hole/AdminLTE/forks","keys_url":"https://api.github.com/repos/pi-hole/AdminLTE/keys{/key_id}","collaborators_url":"https://api.github.com/repos/pi-hole/AdminLTE/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/pi-hole/AdminLTE/teams","hooks_url":"https://api.github.com/repos/pi-hole/AdminLTE/hooks","issue_events_url":"https://api.github.com/repos/pi-hole/AdminLTE/issues/events{/number}","events_url":"https://api.github.com/repos/pi-hole/AdminLTE/events","assignees_url":"https://api.github.com/repos/pi-hole/AdminLTE/assignees{/user}","branches_url":"https://api.github.com/repos/pi-hole/AdminLTE/branches{/branch}","tags_url":"https://api.github.com/repos/pi-hole/AdminLTE/tags","blobs_url":"https://api.github.com/repos/pi-hole/AdminLTE/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/pi-hole/AdminLTE/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/pi-hole/AdminLTE/git/refs{/sha}","trees_url":"https://api.github.com/repos/pi-hole/AdminLTE/git/trees{/sha}","statuses_url":"https://api.github.com/repos/pi-hole/AdminLTE/statuses/{sha}","languages_url":"https://api.github.com/repos/pi-hole/AdminLTE/languages","stargazers_url":"https://api.github.com/repos/pi-hole/AdminLTE/stargazers","contributors_url":"https://api.github.com/repos/pi-hole/AdminLTE/contributors","subscribers_url":"https://api.github.com/repos/pi-hole/AdminLTE/subscribers","subscription_url":"https://api.github.com/repos/pi-hole/AdminLTE/subscription","commits_url":"https://api.github.com/repos/pi-hole/AdminLTE/commits{/sha}","git_commits_url":"https://api.github.com/repos/pi-hole/AdminLTE/git/commits{/sha}","comments_url":"https://api.github.com/repos/pi-hole/AdminLTE/comments{/number}","issue_comment_url":"https://api.github.com/repos/pi-hole/AdminLTE/issues/comments{/number}","contents_url":"https://api.github.com/repos/pi-hole/AdminLTE/contents/{+path}","compare_url":"https://api.github.com/repos/pi-hole/AdminLTE/compare/{base}...{head}","merges_url":"https://api.github.com/repos/pi-hole/AdminLTE/merges","archive_url":"https://api.github.com/repos/pi-hole/AdminLTE/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/pi-hole/AdminLTE/downloads","issues_url":"https://api.github.com/repos/pi-hole/AdminLTE/issues{/number}","pulls_url":"https://api.github.com/repos/pi-hole/AdminLTE/pulls{/number}","milestones_url":"https://api.github.com/repos/pi-hole/AdminLTE/milestones{/number}","notifications_url":"https://api.github.com/repos/pi-hole/AdminLTE/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/pi-hole/AdminLTE/labels{/name}","releases_url":"https://api.github.com/repos/pi-hole/AdminLTE/releases{/id}","deployments_url":"https://api.github.com/repos/pi-hole/AdminLTE/deployments","created_at":"2015-07-25T18:45:30Z","updated_at":"2016-12-19T09:28:35Z","pushed_at":"2016-12-20T18:39:11Z","git_url":"git://github.com/pi-hole/AdminLTE.git","ssh_url":"git@github.com:pi-hole/AdminLTE.git","clone_url":"https://github.com/pi-hole/AdminLTE.git","svn_url":"https://github.com/pi-hole/AdminLTE","homepage":"https://pi-hole.net","size":24099,"stargazers_count":76,"watchers_count":76,"language":"HTML","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":59,"mirror_url":null,"open_issues_count":19,"forks":59,"open_issues":19,"watchers":76,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/pi-hole/AdminLTE/pulls/270"},"html":{"href":"https://github.com/pi-hole/AdminLTE/pull/270"},"issue":{"href":"https://api.github.com/repos/pi-hole/AdminLTE/issues/270"},"comments":{"href":"https://api.github.com/repos/pi-hole/AdminLTE/issues/270/comments"},"review_comments":{"href":"https://api.github.com/repos/pi-hole/AdminLTE/pulls/270/comments"},"review_comment":{"href":"https://api.github.com/repos/pi-hole/AdminLTE/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/pi-hole/AdminLTE/pulls/270/commits"},"statuses":{"href":"https://api.github.com/repos/pi-hole/AdminLTE/statuses/f9a601c5b0490d2ab8b52bdd13af5787596e15e3"}}}}
{"actor":{"display_login":"Mcat12"}}