diff --git a/files/class.loader.php b/files/class.loader.php index 25abfa5..fef0f46 100644 --- a/files/class.loader.php +++ b/files/class.loader.php @@ -82,7 +82,7 @@ public function load($type) { $path = "{$this->css_base}min/{$this->theme}/main.css"; if ($this->generate($path, $this->default_css, 'css')) { $buster = filemtime($this->php_base.$path); - $css_includes = "\n"; + $css_includes = "\n"; } //Build custom CSS file, if required @@ -94,7 +94,7 @@ public function load($type) { if ($this->generate($path, $this->custom_css, 'css')) { $buster = filemtime($this->php_base.$path); - $css_includes .= " \n"; + $css_includes .= " \n"; } } @@ -104,7 +104,7 @@ public function load($type) { $path = "{$this->js_base}min/main.js"; if ($this->generate($path, $this->default_js, 'js')) { $buster = filemtime($this->php_base.$path); - $js_includes = "\n"; + $js_includes = "\n"; } //Build custom JS, if required @@ -116,7 +116,7 @@ public function load($type) { if ($this->generate($path, $this->custom_js, 'js')) { $buster = filemtime($this->php_base.$path); - $js_includes .= " \n"; + $js_includes .= " \n"; } } diff --git a/files/class.profile.php b/files/class.profile.php index 0f5d576..e775ea2 100644 --- a/files/class.profile.php +++ b/files/class.profile.php @@ -465,7 +465,7 @@ public static function getMusic($id) { } public static function getImg($img, $size, $gravatar=false) { - $default = "https://hackthis-10af.kxcdn.com/users/images/{$size}/1:1/no_pic.jpg"; + $default = "https://www.hackthis.co.uk/users/images/{$size}/1:1/no_pic.jpg"; if (!$img) return $default; @@ -473,7 +473,7 @@ public static function getImg($img, $size, $gravatar=false) { if ($gravatar) { return "https://www.gravatar.com/avatar/" . md5(strtolower(trim($img))) . "?d=identicon&s=" . $size; } else { - return "https://hackthis-10af.kxcdn.com/users/images/{$size}/1:1/{$img}"; + return "https://www.hackthis.co.uk/users/images/{$size}/1:1/{$img}"; } } } diff --git a/files/elements/home_articles.php b/files/elements/home_articles.php index 27531b4..570d467 100644 --- a/files/elements/home_articles.php +++ b/files/elements/home_articles.php @@ -14,7 +14,7 @@ ?> thumbnail) && $article->thumbnail): ?> - <?=$article->title;?> thumbnail + <?=$article->title;?> thumbnail video)): ?> <?=$article->title;?> thumbnail diff --git a/files/elements/widgets/ads.php b/files/elements/widgets/ads.php index 8a3b876..95d3b1e 100644 --- a/files/elements/widgets/ads.php +++ b/files/elements/widgets/ads.php @@ -14,7 +14,7 @@
- +
diff --git a/files/init.php b/files/init.php index 21cd5f9..b150c38 100644 --- a/files/init.php +++ b/files/init.php @@ -21,9 +21,9 @@ // Content Security Policy $csp_rules = " - default-src 'self' https://www.hackthis.co.uk:8080 wss://www.hackthis.co.uk:8080 https://themes.googleusercontent.com https://*.facebook.com https://fonts.gstatic.com https://bam.nr-data.net https://hackthis-10af.kxcdn.com; - script-src 'self' data: 'unsafe-inline' 'unsafe-eval' https://*.googleapis.com https://*.google-analytics.com https://www.hackthis.co.uk:8080 https://cdnjs.cloudflare.com https://*.twitter.com https://*.api.twitter.com https://pagead2.googlesyndication.com *.newrelic.com https://www.google.com https://ssl.gstatic.com https://members.internetdefenseleague.org https://netdna.bootstrapcdn.com https://ajax.aspnetcdn.com/ajax/jquery.validate d1l6p2sc9645hc.cloudfront.net https://*.gosquared.com cdn.socket.io d3t63m1rxnixd2.cloudfront.net widget.battleforthenet.com *.newrelic.com https://hackthis-10af.kxcdn.com; - style-src 'self' 'unsafe-inline' https://*.googleapis.com https://netdna.bootstrapcdn.com widget.battleforthenet.com https://hackthis-10af.kxcdn.com; + default-src 'self' https://hackthis.co.uk:8080 wss://hackthis.co.uk:8080 https://themes.googleusercontent.com https://*.facebook.com https://fonts.gstatic.com https://www.hackthis.co.uk; + script-src 'self' 'unsafe-inline' 'unsafe-eval' https://*.googleapis.com https://*.google-analytics.com https://hackthis.co.uk:8080 https://cdnjs.cloudflare.com https://*.twitter.com https://*.api.twitter.com https://pagead2.googlesyndication.com *.newrelic.com https://www.google.com https://ssl.gstatic.com https://members.internetdefenseleague.org https://www.hackthis.co.uk https://cdn.socket.io https://d3t63m1rxnixd2.cloudfront.net; + style-src 'self' 'unsafe-inline' https://*.googleapis.com https://www.hackthis.co.uk; img-src * data:; object-src 'self' https://*.youtube.com https://*.ytimg.com; frame-src 'self' https://googleads.g.doubleclick.net https://*.youtube-nocookie.com https://*.vimeo.com https://kiwiirc.com https://www.google.com https://fightforthefuture.github.io; diff --git a/html/files/css/guest_landing.scss b/html/files/css/guest_landing.scss index acbfb73..a48ebd6 100644 --- a/html/files/css/guest_landing.scss +++ b/html/files/css/guest_landing.scss @@ -1,5 +1,5 @@ body { - background: url('https://hackthis-10af.kxcdn.com/files/images/bg_landing_2.png') no-repeat center top; + background: url('https://www.hackthis.co.uk/files/images/bg_landing_2.png') no-repeat center top; } body.theme-light { diff --git a/html/files/css/icomoon.css b/html/files/css/icomoon.css index dbc7742..d5c01d4 100644 --- a/html/files/css/icomoon.css +++ b/html/files/css/icomoon.css @@ -1,10 +1,10 @@ @font-face { font-family: 'icomoon'; - src:url('https://hackthis-10af.kxcdn.com/files/fonts/icomoon.eot'); - src:url('https://hackthis-10af.kxcdn.com/files/fonts/icomoon.eot?#iefix') format('embedded-opentype'), - url('https://hackthis-10af.kxcdn.com/files/fonts/icomoon.woff') format('woff'), - url('https://hackthis-10af.kxcdn.com/files/fonts/icomoon.ttf') format('truetype'), - url('https://hackthis-10af.kxcdn.com/files/fonts/icomoon.svg#icomoon') format('svg'); + src:url('https://www.hackthis.co.uk/files/fonts/icomoon.eot'); + src:url('https://www.hackthis.co.uk/files/fonts/icomoon.eot?#iefix') format('embedded-opentype'), + url('https://www.hackthis.co.uk/files/fonts/icomoon.woff') format('woff'), + url('https://www.hackthis.co.uk/files/fonts/icomoon.ttf') format('truetype'), + url('https://www.hackthis.co.uk/files/fonts/icomoon.svg#icomoon') format('svg'); font-weight: normal; font-style: normal; } diff --git a/html/files/css/main.scss b/html/files/css/main.scss index a01c6af..222a60f 100644 --- a/html/files/css/main.scss +++ b/html/files/css/main.scss @@ -14,7 +14,7 @@ body { color: $black; repeat: no-repeat; - image: url("https://hackthis-10af.kxcdn.com/files/images/bg2.png"); + image: url("https://www.hackthis.co.uk/files/images/bg2.png"); position: center -32px; } diff --git a/html/index.php b/html/index.php index 904d176..8f94dc8 100644 --- a/html/index.php +++ b/html/index.php @@ -30,7 +30,7 @@ require_once('header.php'); ?>
- HackThis!! - The hackers playground + HackThis!! - The hackers playground