pixeldrain/fnx_web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change direct link to hotlink

Browse Source
This commit is contained in:
Wim Brand
2021-09-27 23:20:35 +02:00
parent 4ab8ecdce0
commit 141c7eab84
3 changed files with 26 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
res/include/md/api_file.md
View File

@@ -7,7 +7,8 @@
### Description ### Description
Upload a file. I recommend that you use the PUT API instead of the POST API. Upload a file. I recommend that you use the PUT API instead of the POST API.
It's easier to use. It's easier to use and the multipart encoding of the POST API can cause
performance issues in certain environments.
### Parameters ### Parameters
@@ -163,9 +164,8 @@ limit will be enabled if a file has three times more downloads than views. The
owner of a file can always download it. When a file is rate limited the user owner of a file can always download it. When a file is rate limited the user
will need to fill out a captcha in order to continue downloading the file. The will need to fill out a captcha in order to continue downloading the file. The
captcha will only appear on the file viewer page (pixeldrain.com/u/{id}). Rate captcha will only appear on the file viewer page (pixeldrain.com/u/{id}). Rate
limiting has been added to prevent the spread of viruses and to stop direct limiting has been added to prevent the spread of viruses and to stop hotlinking.
linking. Direct linking is only allowed when files are uploaded using a Pro Hotlinking is only allowed when files are uploaded using a Pro account.
account.
Pixeldrain also includes a virus scanner. If a virus has been detected in a file Pixeldrain also includes a virus scanner. If a virus has been detected in a file
the user will also have to fill in a captcha to download it. the user will also have to fill in a captcha to download it.

52
res/template/home.html
View File

@@ -192,7 +192,9 @@
</div> </div>
<div> <div>
<div class="feat_label"> <div class="feat_label">
<a href="javascript:void(0);" onclick="return explainDirectLinking();">Direct linking</a> <a href="javascript:void(0);" onclick="return explainDirectLinking();">
Hotlinking
</a>
</div> </div>
<div class="feat_normal"> <div class="feat_normal">
Rate limiting mode will be enabled when a file has 3 Rate limiting mode will be enabled when a file has 3
@@ -286,7 +288,7 @@
<div class="feat_pro features_cell round_tr"> <div class="feat_pro features_cell round_tr">
<div><span class="text_highlight">20 GB</span> max file size (18.63 GiB)<br/></div> <div><span class="text_highlight">20 GB</span> max file size (18.63 GiB)<br/></div>
<div><span class="text_highlight">120 days</span> file expiry</div> <div><span class="text_highlight">120 days</span> file expiry</div>
<div><span class="text_highlight">2 TB</span> direct link bandwidth<br/></div> <div><span class="text_highlight">2 TB</span> hotlink bandwidth<br/></div>
<div><span class="text_highlight">2 TB</span> storage space<br/></div> <div><span class="text_highlight">2 TB</span> storage space<br/></div>
</div> </div>
</div> </div>
@@ -303,7 +305,7 @@
<div class="feat_pro features_cell"> <div class="feat_pro features_cell">
<div><span class="text_highlight">20 GB</span> max file size<br/></div> <div><span class="text_highlight">20 GB</span> max file size<br/></div>
<div><span class="text_highlight">240 days</span> file expiry</div> <div><span class="text_highlight">240 days</span> file expiry</div>
<div><span class="text_highlight">4 TB</span> direct link bandwidth<br/></div> <div><span class="text_highlight">4 TB</span> hotlink bandwidth<br/></div>
<div><span class="text_highlight">4 TB</span> storage space<br/></div> <div><span class="text_highlight">4 TB</span> storage space<br/></div>
</div> </div>
</div> </div>
@@ -320,7 +322,7 @@
<div class="feat_pro features_cell"> <div class="feat_pro features_cell">
<div><span class="text_highlight">20 GB</span> max file size<br/></div> <div><span class="text_highlight">20 GB</span> max file size<br/></div>
<div><span class="text_highlight">480 days</span> file expiry</div> <div><span class="text_highlight">480 days</span> file expiry</div>
<div><span class="text_highlight">8 TB</span> direct link bandwidth<br/></div> <div><span class="text_highlight">8 TB</span> hotlink bandwidth<br/></div>
<div><span class="text_highlight">8 TB</span> storage space<br/></div> <div><span class="text_highlight">8 TB</span> storage space<br/></div>
</div> </div>
</div> </div>
@@ -337,7 +339,7 @@
<div class="feat_pro features_cell"> <div class="feat_pro features_cell">
<div><span class="text_highlight">20 GB</span> max file size<br/></div> <div><span class="text_highlight">20 GB</span> max file size<br/></div>
<div><span class="text_highlight">Files never expire</span></div> <div><span class="text_highlight">Files never expire</span></div>
<div><span class="text_highlight">16 TB</span> direct link bandwidth<br/></div> <div><span class="text_highlight">16 TB</span> hotlink bandwidth<br/></div>
<div><span class="text_highlight">16 TB</span> storage space<br/></div> <div><span class="text_highlight">16 TB</span> storage space<br/></div>
</div> </div>
</div> </div>
@@ -354,7 +356,7 @@
<div class="feat_pro features_cell"> <div class="feat_pro features_cell">
<div><span class="text_highlight">20 GB</span> max file size<br/></div> <div><span class="text_highlight">20 GB</span> max file size<br/></div>
<div><span class="text_highlight">Files never expire</span></div> <div><span class="text_highlight">Files never expire</span></div>
<div><span class="text_highlight">32 TB</span> direct link bandwidth<br/></div> <div><span class="text_highlight">32 TB</span> hotlink bandwidth<br/></div>
<div><span class="text_highlight">32 TB</span> storage space<br/></div> <div><span class="text_highlight">32 TB</span> storage space<br/></div>
</div> </div>
</div> </div>
@@ -373,7 +375,7 @@
<div class="feat_pro features_cell"> <div class="feat_pro features_cell">
<div><span class="text_highlight">20 GB</span> max file size<br/></div> <div><span class="text_highlight">20 GB</span> max file size<br/></div>
<div><span class="text_highlight">Files never expire</span></div> <div><span class="text_highlight">Files never expire</span></div>
<div><span class="text_highlight">48 TB</span> direct link bandwidth<br/></div> <div><span class="text_highlight">48 TB</span> hotlink bandwidth<br/></div>
<div><span class="text_highlight">48 TB</span> storage space<br/></div> <div><span class="text_highlight">48 TB</span> storage space<br/></div>
</div> </div>
</div> </div>
@@ -392,7 +394,7 @@
<div class="feat_pro features_cell"> <div class="feat_pro features_cell">
<div><span class="text_highlight">20 GB</span> max file size<br/></div> <div><span class="text_highlight">20 GB</span> max file size<br/></div>
<div><span class="text_highlight">Files never expire</span></div> <div><span class="text_highlight">Files never expire</span></div>
<div><span class="text_highlight">64 TB</span> direct link bandwidth<br/></div> <div><span class="text_highlight">64 TB</span> hotlink bandwidth<br/></div>
<div><span class="text_highlight">64 TB</span> storage space<br/></div> <div><span class="text_highlight">64 TB</span> storage space<br/></div>
</div> </div>
</div> </div>
@@ -411,7 +413,7 @@
<div class="feat_pro features_cell"> <div class="feat_pro features_cell">
<div><span class="text_highlight">20 GB</span> max file size<br/></div> <div><span class="text_highlight">20 GB</span> max file size<br/></div>
<div><span class="text_highlight">Files never expire</span></div> <div><span class="text_highlight">Files never expire</span></div>
<div><span class="text_highlight">96 TB</span> direct link bandwidth<br/></div> <div><span class="text_highlight">96 TB</span> hotlink bandwidth<br/></div>
<div><span class="text_highlight">96 TB</span> storage space<br/></div> <div><span class="text_highlight">96 TB</span> storage space<br/></div>
</div> </div>
</div> </div>
@@ -430,30 +432,11 @@
<div class="feat_pro features_cell round_br"> <div class="feat_pro features_cell round_br">
<div><span class="text_highlight">20 GB</span> max file size<br/></div> <div><span class="text_highlight">20 GB</span> max file size<br/></div>
<div><span class="text_highlight">Files never expire</span></div> <div><span class="text_highlight">Files never expire</span></div>
<div><span class="text_highlight">128 TB</span> direct link bandwidth<br/></div> <div><span class="text_highlight">128 TB</span> hotlink bandwidth<br/></div>
<div><span class="text_highlight">128 TB</span> storage space<br/></div> <div><span class="text_highlight">128 TB</span> storage space<br/></div>
</div> </div>
</div> </div>
</div> </div>
<!--
<br/>
<h2>Premium</h2>
<div class="highlight_dark">
Pixeldrain Premium is still in development and not generally
available yet. Stay tuned.
</div>
<p>
Premium is more catered toward content delivery. This plan
enables the Buckets feature which provides a more structured way
to manage your files on pixeldrain. Buckets allow direct linking
to files without running into rate limiting.
</p>
<p>
When you choose for Premium you will also get all the benefits
of the Pro subscription. A base rate of €2 per month will be
billed regardless of your usage.
</p>
-->
</div></div> </div></div>
<template id="tpl_file_expiry"> <template id="tpl_file_expiry">
@@ -495,6 +478,11 @@
of the file and a frame where you can view the file if it's an of the file and a frame where you can view the file if it's an
image, video, audio, PDF or text file. image, video, audio, PDF or text file.
</p> </p>
<p>
More information about <a
href="https://en.wikipedia.org/wiki/Inline_linking"
target="_blank">Hotlinking on Wikipedia</a>.
</p>
<h3>Rate limiting</h3> <h3>Rate limiting</h3>
<p> <p>
It's also possible to link directly to a file instead of the It's also possible to link directly to a file instead of the
@@ -507,7 +495,7 @@
from the file viewer page. On the file viewer you will see a from the file viewer page. On the file viewer you will see a
CAPTCHA to fill in when you click the download button. CAPTCHA to fill in when you click the download button.
</p> </p>
<h3>Direct downloading with a Pro subscription</h3> <h3>Hotlinking with a Pro subscription</h3>
<p> <p>
When you have a Pro subscription you will get a monthly When you have a Pro subscription you will get a monthly
bandwidth cap for all the files on your account combined. Normal bandwidth cap for all the files on your account combined. Normal
@@ -549,14 +537,14 @@
} }
function explainDirectLinking() { function explainDirectLinking() {
let m = new Modal( let m = new Modal(
document.body, null, "Direct Linking Bandwidth", "800px", "auto" document.body, null, "Hotlinking Bandwidth", "800px", "auto"
) )
m.cloneTemplate("tpl_direct_linking") m.cloneTemplate("tpl_direct_linking")
m.open() m.open()
return false return false
} }
if (window.location.hash === "#direct_linking") { if (window.location.hash === "#direct_linking" || window.location.hash === "#hotlinking") {
explainDirectLinking() explainDirectLinking()
} }
</script> </script>

4
svelte/src/user_home/Home.svelte
View File

@@ -155,11 +155,11 @@ onDestroy(() => {
<div id="storage_progress" class="progress_bar_inner" style="width: {storage_percent*100}%;"></div> <div id="storage_progress" class="progress_bar_inner" style="width: {storage_percent*100}%;"></div>
</div> </div>
<br/> <br/>
Direct link bandwidth: Hotlink bandwidth:
{formatDataVolume(direct_link_bandwidth_used, 3)} {formatDataVolume(direct_link_bandwidth_used, 3)}
out of out of
{formatDataVolume(window.user.subscription.direct_linking_bandwidth, 3)} {formatDataVolume(window.user.subscription.direct_linking_bandwidth, 3)}
(<a href="/#direct_linking">More information about direct linking</a>) (<a href="/#hotlinking">More information about hotlinking</a>)
<br/> <br/>
<div class="progress_bar_outer"> <div class="progress_bar_outer">
<div id="direct_bandwidth_progress" class="progress_bar_inner" style="width: {direct_link_percent*100}%;"></div> <div id="direct_bandwidth_progress" class="progress_bar_inner" style="width: {direct_link_percent*100}%;"></div>