diff options
| author | Florian Pritz <bluewind@xinu.at> | 2013-08-11 18:57:30 +0200 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2013-08-11 18:57:30 +0200 |
| commit | c44d567d0973a0a73327ccbb9c4dbffd45a8d323 (patch) | |
| tree | 47179dcd8f631412ae8ded24a3d3a76d164dfbb2 /application/views/file | |
| parent | 01482576c809258769846e61fd9e90f7a4757ec4 (diff) | |
| parent | af799b2a184864d6adb6bd224f57cd58bf78154b (diff) | |
Merge branch 'working-split/api-keys' into working
Diffstat (limited to 'application/views/file')
| -rw-r--r-- | application/views/file/client.php | 8 | ||||
| -rw-r--r-- | application/views/file/upload_form.php | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/application/views/file/client.php b/application/views/file/client.php index 19e6a01fb..5e141f141 100644 --- a/application/views/file/client.php +++ b/application/views/file/client.php @@ -13,6 +13,14 @@ machine <?php echo $domain; ?> login my_username password my_secret_password </pre> <p> + If you are using fb-client ≥1.2 you can + <a href="<?php echo site_url("user/apikeys"); ?>">create an API key</a>, + save it in <code>~/.config/fb-client/apikey</code> and remove + your password from <code>.netrc</code>. Please refer to <code>man + 1 fb</code> for further details. +</p> + +<p> If you are using fb-client ≥1.1 you can use <code>~/.config/fb-client/config</code> to upload to a different pastebin URL (https or you own installation). Please refer to diff --git a/application/views/file/upload_form.php b/application/views/file/upload_form.php index 99c1d9e42..841ac3746 100644 --- a/application/views/file/upload_form.php +++ b/application/views/file/upload_form.php @@ -1,4 +1,4 @@ -<?php if (isset($username) && $username) { ?> +<?php if (user_logged_in()) { ?> <div class="well"> <div class="row-fluid"> <div class="span12 text-upload-form"> |