KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-10-29 18:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updates for change to .me

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2017-02-28 18:38:49 +01:00
parent d67d85781b
commit 5baf8772cc
10 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.htaccess
View File

@@ -5,11 +5,11 @@ RewriteCond %{HTTP_HOST} ^www\.(.*)$ [NC]
RewriteCond %{HTTPS} !=on
RewriteRule ^(.*)$ https://%1/$1 [L]
RewriteCond %{HTTP_HOST} ^(.*zoff.no.*)$
RewriteCond %{HTTP_HOST} ^(.*zoff.me.*)$
RewriteCond %{HTTPS} !=on
RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [L]
RewriteCond %{HTTP_HOST} ^remote.zoff.no
RewriteCond %{HTTP_HOST} ^remote.zoff.me
RewriteCond %{REQUEST_URI} !/public/css
RewriteCond %{REQUEST_URI} !/public/js
RewriteCond %{REQUEST_URI} !/public/dist
@@ -17,15 +17,15 @@ RewriteCond %{REQUEST_URI} !/public/images
RewriteCond %{REQUEST_URI} !/public/font
RewriteRule ^(.*)$ public/php/controller.php [L,NC,QSA]
RewriteCond %{HTTP_HOST} ^bot.zoff.no
RewriteCond %{HTTP_HOST} ^bot.zoff.me
RewriteRule ^(.*)$ /public/php/bot.php [L,NC,QSA]
RewriteCond %{HTTP_HOST} ^zoff.no
RewriteCond %{HTTP_HOST} ^zoff.me
RewriteCond %{REQUEST_URI} /o_callback
RewriteRule ^(.*)$ public/html/callback.html [L,NC,QSA]
RewriteCond %{HTTP_HOST} ^zoff.no
RewriteCond %{HTTP_HOST} ^zoff.me
RewriteCond %{REQUEST_URI} /_embed
RewriteRule ^(.*)$ public/html/embed.html [L,NC,QSA]

2
public/dist/callback.min.js vendored
View File

@@ -1 +1 @@
!function(){function e(e){var t,a=e.substring(1).split("&"),n={};for(var i in a)t=a[i].split("="),2==t.length&&(n[t[0]]=t[1]);return n}window.addEventListener("load",function(){var t,a,n,i=e(window.location.hash),o=window.location.protocol+"//"+window.location.hostname+"/o_callback";if(i.spotify)t="b934ecdd173648f5bcd38738af529d58",a="token",n="playlist-read-private playlist-read-collaborative user-read-private playlist-modify-public",state=i.nonce,window.location.href="https://accounts.spotify.com/authorize?client_id="+t+"&scope="+n+"&show_dialog=false&response_type="+a+"&redirect_uri="+o+"&state="+state;else if(i.youtube)t="944988770273-butsmlr1aotlsskk8lmgvh0etqqekigf.apps.googleusercontent.com",a="token",n="https://www.googleapis.com/auth/youtube",state=i.nonce,window.location.href="https://accounts.google.com/o/oauth2/v2/auth?client_id="+t+"&response_type="+a+"&state="+state+"&redirect_uri="+o+"&scope="+n;else{var s=e(window.location.hash);window.opener.callback(s)}})}();
!function(){function o(o){var t,e=o.substring(1).split("&"),a={};for(var i in e)t=e[i].split("="),2==t.length&&(a[t[0]]=t[1]);return a}window.addEventListener("load",function(){var t,e,a,i=o(window.location.hash),n=window.location.protocol+"//"+window.location.hostname+"/o_callback";if(i.spotify)t="b934ecdd173648f5bcd38738af529d58",e="token",a="playlist-read-private playlist-read-collaborative user-read-private playlist-modify-public",state=i.nonce,window.location.href="https://accounts.spotify.com/authorize?client_id="+t+"&scope="+a+"&show_dialog=false&response_type="+e+"&redirect_uri="+n+"&state="+state;else if(i.youtube)t="944988770273-butsmlr1aotlsskk8lmgvh0etqqekigf.apps.googleusercontent.com",e="token",a="https://www.googleapis.com/auth/youtube",state=i.nonce,window.location.href="https://accounts.google.com/o/oauth2/v2/auth?client_id="+t+"&response_type="+e+"&state="+state+"&redirect_uri="+n+"&scope="+a;else{var s=o(window.location.hash);window.opener.callback(s)}})}();

4
public/dist/embed.min.js vendored
View File

File diff suppressed because one or more lines are too long

6
public/dist/main.min.js vendored
View File

File diff suppressed because one or more lines are too long

6
public/js/helpers.js
View File

@@ -229,15 +229,15 @@ var Helper = {
$("#contact-container").html("Mail has been sent, we'll be back with you shortly.")
}else{
$("#contact-container").empty();
$("#contact-container").html("Something went wrong, sorry about that. You could instead try with your own mail-client: <a title='Open in client' href='mailto:contact@zoff.me?Subject=Contact%20Zoff'>contact@zoff.me</a>")
$("#contact-container").html("Something went wrong, sorry about that. You could instead try with your own mail-client: <a title='Open in client' href='mailto:contact@zoff.no?Subject=Contact%20Zoff'>contact@zoff.no</a>")
}
}
});
/*from = $("#contact-form-from").val();
message = $("#contact-form-message").val();
$("#contact-container").empty();
newWindow = window.open("mailto:contact@zoff.me?Subject=Contact%20Zoff&Body=" + message, "_blank");
$("#contact-container").html("Something went wrong, sorry about that. You could instead try with your own mail-client: <a title='Open in client' href='mailto:contact@zoff.me?Subject=Contact%20Zoff&Body=" + message + "'>contact@zoff.me</a>");
newWindow = window.open("mailto:contact@zoff.no?Subject=Contact%20Zoff&Body=" + message, "_blank");
$("#contact-container").html("Something went wrong, sorry about that. You could instead try with your own mail-client: <a title='Open in client' href='mailto:contact@zoff.no?Subject=Contact%20Zoff&Body=" + message + "'>contact@zoff.no</a>");
setTimeout(function(){newWindow.close();},500);*/
}
}

2
public/php/controller.php
View File

@@ -16,7 +16,7 @@
</a>
</div>
<ul class="right hide-on-med-and-down">
<li><a class="waves-effect green" title="Remote control a Zoff player" href="https://remote.zoff.no">Remote</a></li>
<li><a class="waves-effect green" title="Remote control a Zoff player" href="https://remote.zoff.me">Remote</a></li>
<li><a class="modal-trigger waves-effect waves-orange" onclick="$('#about').modal('open')">About</a></li>
</ul>
</div>

6
public/php/frontpage.php
View File

@@ -20,10 +20,10 @@ if(isset($_GET['chan'])){
<img id="zicon" src="public/images/z.svg" alt="zoff" title="Zoff" />
</a>
<div id="frontpage-viewer-counter" data-position="bottom" data-delay="5" data-tooltip="Total viewers" class="noselect tooltipped" title="Divided among all channels. Hidden or not"></div>
<!--<a href="//zoff.no" class="brand-logo brand-mobile hide-on-med-and-up">Zoff</a>-->
<!--<a href="//zoff.me" class="brand-logo brand-mobile hide-on-med-and-up">Zoff</a>-->
<ul class="right hide-on-med-and-down">
<li><a class="header-buttons waves-effect waves-cyan" id="offline-mode" title="Private mode" href="#">Private</a></li>
<li><a class="header-buttons waves-effect waves-green" title="Remote control a Zoff player" href="https://remote.zoff.no">Remote</a></li>
<li><a class="header-buttons waves-effect waves-green" title="Remote control a Zoff player" href="https://remote.zoff.me">Remote</a></li>
<li><a class="header-buttons modal-trigger waves-effect waves-orange" onclick="$('#about').modal('open')">About</a></li>
</ul>
</div>
@@ -82,7 +82,7 @@ if(isset($_GET['chan'])){
<h5>Create a radio channel, collaborate and listen</h5>
<form class="channel-finder">
<div class="input-field">
<p class="prefix">zoff.no/</p>
<p class="prefix">zoff.me/</p>
<input
class="room-namer autocomplete desktop-search"
type="text"

4
public/php/header.php
View File

@@ -13,8 +13,8 @@
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="mobile-web-app-capable" content="yes">
<meta name="theme-color" content="#2D2D2D" />
<meta property="og:image" content="https://zoff.no/public/images/favicon.png" />
<meta property="og:url" content="https://zoff.no" />
<meta property="og:image" content="https://zoff.me/public/images/favicon.png" />
<meta property="og:url" content="https://zoff.me" />
<meta property="og:title" content="Zoff"/>
<meta property="og:description" content="The Shared (free) YouTube radio."/>
<meta property="og:type" content="website"/>

2
public/php/mail.php
View File

@@ -7,7 +7,7 @@
$headers = "From: " . $from . "\r\n";
if(filter_var($from, FILTER_VALIDATE_EMAIL) && $message != ""){
$result = mail("contact@zoff.no", "ZOFF: Contact from form", $message, $headers);
$result = mail("contact@zoff.me", "ZOFF: Contact from form", $message, $headers);
if($result == FALSE){
echo "failure";

4
public/php/panel.php
View File

@@ -149,12 +149,12 @@
</label>
</div>
<div><a id="code-link" target="_blank">
<img id="code-qr" alt="QR code for control" title="Link to control this Zoff player" src="https://chart.googleapis.com/chart?chs=221x221&amp;cht=qr&amp;choe=UTF-8&amp;chld=L%7C1&amp;chl=http://zoff.no" />
<img id="code-qr" alt="QR code for control" title="Link to control this Zoff player" src="https://chart.googleapis.com/chart?chs=221x221&amp;cht=qr&amp;choe=UTF-8&amp;chld=L%7C1&amp;chl=http://zoff.me" />
<h4 id="code-text">ABBADUR</h4>
</a></div>
<p>
You can control this Zoff instance from another device by going to <b>https://remote.zoff.no/</b>
You can control this Zoff instance from another device by going to <b>https://remote.zoff.me/</b>
</p>
</li>
</ul>