summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2015-11-02 16:01:11 +0100
committerFlorian Pritz <bluewind@xinu.at>2015-11-02 16:04:54 +0100
commit9eed447539bb2c2bdab13a2306c2be36963df37b (patch)
treed35d80b6ec9ed9eadf46643c055d183078f0bc5b
parenta3d2bc5e08752faac9f9b8c024674edc755bd65e (diff)
view/client: Hardcode URLs
Clients are only hosted on paste.xinu.at and everywhere else the links will point to missing files so they become useless. Signed-off-by: Florian Pritz <bluewind@xinu.at>
-rw-r--r--application/controllers/file.php3
-rw-r--r--application/views/file/client.php6
-rw-r--r--application/views/file_plaintext/client.php2
3 files changed, 4 insertions, 7 deletions
diff --git a/application/controllers/file.php b/application/controllers/file.php
index 7d701b75e..2c68114a7 100644
--- a/application/controllers/file.php
+++ b/application/controllers/file.php
@@ -583,9 +583,6 @@ class File extends MY_Controller {
} else {
$this->data['client_link'] = false;
}
- $this->data['client_link_dir'] = base_url().'data/client/';
- $this->data['client_link_deb'] = base_url().'data/client/deb/';
- $this->data['client_link_slackware'] = base_url().'data/client/slackware/';
if (preg_match('#^https?://(.*?)/.*$#', site_url(), $matches) === 1) {
$this->data["domain"] = $matches[1];
diff --git a/application/views/file/client.php b/application/views/file/client.php
index 31120279d..e868124ab 100644
--- a/application/views/file/client.php
+++ b/application/views/file/client.php
@@ -3,7 +3,7 @@
<p>
Development (git): <?php echo anchor("http://git.server-speed.net/users/flo/fb/"); ?><br />
Latest release: <?php echo $client_link ? anchor($client_link) : "unknown"; ?><br />
- GPG sigs, older versions: <a href="<?php echo $client_link_dir; ?>"><?php echo $client_link_dir; ?></a>
+ GPG sigs, older versions: <?php echo anchor("https://paste.xinu.at/data/client"); ?>
</p>
<p>To authenticate add the following to your ~/.netrc:</p>
@@ -30,9 +30,9 @@ machine <?php echo $domain; ?> login my_username password my_secret_password
<h2>Linux</h2>
<p>
Arch Linux: pacman -S fb-client<br />
- Debian: <?php echo anchor($client_link_deb); ?><br />
+ Debian: <?php echo anchor("https://paste.xinu.at/data/client/deb"); ?><br />
Gentoo: Add <a href="https://git.holgersson.xyz/holgersson-overlay/tree/README">this overlay</a> and run <code>emerge -a fb-client</code><br />
- Slackware: <?php echo anchor($client_link_slackware); ?><br />
+ Slackware: <?php echo anchor("https://paste.xinu.at/data/client/slackware"); ?><br />
OpenSUSE: <?php echo anchor("https://build.opensuse.org/package/show/home:mwilhelmy/fb-client"); ?>
</p>
diff --git a/application/views/file_plaintext/client.php b/application/views/file_plaintext/client.php
index 0ab556df2..a680a0b68 100644
--- a/application/views/file_plaintext/client.php
+++ b/application/views/file_plaintext/client.php
@@ -5,7 +5,7 @@ Shell (binary safe):
Client:
Development (git): http://git.server-speed.net/users/flo/fb
Latest release: <?php echo $client_link."\n"; ?>
-GPG sigs, older versions: <?php echo $client_link_dir."\n"; ?>
+GPG sigs, older versions: https://paste.xinu.at/data/client
To authenticate add the following to your ~/.netrc:
machine paste.xinu.at login my_username password my_secret_password