Skip to content
This repository was archived by the owner on Oct 30, 2019. It is now read-only.

Changed urls to be reachable from local and updated schema.sql for ut… #219

Open
HTfeuerstein wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Changed urls to be reachable from local and updated schema.sql for ut… #219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e5c5fcb
Changed urls to be reachable from local and updated schema.sql for ut…
HTfeuerstein Dec 10, 2017
f9e90c8
Merge branch 'master' into master
HTfeuerstein May 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions files/class.loader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "<link rel='stylesheet' href='https://hackthis-10af.kxcdn.com{$path}?{$buster}' type='text/css'/>\n";
$css_includes = "<link rel='stylesheet' href='https://www.hackthis.co.uk{$path}?{$buster}' type='text/css'/>\n";
}

//Build custom CSS file, if required
Expand All @@ -94,7 +94,7 @@ public function load($type) {

if ($this->generate($path, $this->custom_css, 'css')) {
$buster = filemtime($this->php_base.$path);
$css_includes .= " <link rel='stylesheet' href='https://hackthis-10af.kxcdn.com{$path}?{$buster}' type='text/css'/>\n";
$css_includes .= " <link rel='stylesheet' href='https://www.hackthis.co.uk{$path}?{$buster}' type='text/css'/>\n";
}
}

Expand All @@ -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 = "<script type='text/javascript' src='https://hackthis-10af.kxcdn.com{$path}?{$buster}'></script>\n";
$js_includes = "<script type='text/javascript' src='https://www.hackthis.co.uk{$path}?{$buster}'></script>\n";
}

//Build custom JS, if required
Expand All @@ -116,7 +116,7 @@ public function load($type) {

if ($this->generate($path, $this->custom_js, 'js')) {
$buster = filemtime($this->php_base.$path);
$js_includes .= " <script type='text/javascript' src='https://hackthis-10af.kxcdn.com{$path}?{$buster}'></script>\n";
$js_includes .= " <script type='text/javascript' src='https://www.hackthis.co.uk{$path}?{$buster}'></script>\n";
}
}

Expand Down
4 changes: 2 additions & 2 deletions files/class.profile.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,15 +465,15 @@ 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;

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}";
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion files/elements/home_articles.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
?>
<a href='<?=$article->slug;?>' class="col span_8 <?=isset($article->thumbnail) || isset($article->video)?'img':'';?> thumbnail" data-overlay="<?=$article->category;?>">
<?php if (isset($article->thumbnail) && $article->thumbnail): ?>
<img src="https://hackthis-10af.kxcdn.com/images/200/4:3/<?=$article->thumbnail;?>" alt="<?=$article->title;?> thumbnail">
<img src="https://www.hackthis.co.uk/images/200/4:3/<?=$article->thumbnail;?>" alt="<?=$article->title;?> thumbnail">
<?php elseif (isset($article->video)): ?>
<img src="https://img.youtube.com/vi/<?=$article->video;?>/0.jpg" alt="<?=$article->title;?> thumbnail">
<?php endif; ?>
Expand Down
2 changes: 1 addition & 1 deletion files/elements/widgets/ads.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<article class="widget">
<div class="center">
<a href='<?=$link;?>' class='hide-external'>
<img src='https://hackthis-10af.kxcdn.com/files/images/sidebar/<?=$image;?>.png'/>
<img src='https://www.hackthis.co.uk/files/images/sidebar/<?=$image;?>.png'/>
</a>
</div>
</article>
6 changes: 3 additions & 3 deletions files/init.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion html/files/css/guest_landing.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
10 changes: 5 additions & 5 deletions html/files/css/icomoon.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion html/files/css/main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion html/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
require_once('header.php');
?>
<div class='row header'>
<img src="https://hackthis-10af.kxcdn.com/files/images/logo_landing.png" alt="HackThis!! - The hackers playground">
<img src="https://www.hackthis.co.uk/files/images/logo_landing.png" alt="HackThis!! - The hackers playground">
</div>
<?php
if (isset($_GET['deleted'])) {
Expand Down
Loading