summaryrefslogtreecommitdiffstats
path: root/application/controllers/file.php
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2012-04-09 00:27:17 +0200
committerFlorian Pritz <bluewind@xinu.at>2012-04-09 20:48:04 +0200
commit40970e2cb0480cd0016a0a4f88b69d33b9c95c22 (patch)
treedeeb775f5fbf6cb4b6709fbb55605cce4d66740f /application/controllers/file.php
parentccf2d88f9e17bc2884d31cee9ce4ae2ab563b8c1 (diff)
muser: fix handling of cli clients without account
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to 'application/controllers/file.php')
-rw-r--r--application/controllers/file.php11
1 files changed, 2 insertions, 9 deletions
diff --git a/application/controllers/file.php b/application/controllers/file.php
index 8de08b77b..ca58c8c0e 100644
--- a/application/controllers/file.php
+++ b/application/controllers/file.php
@@ -36,14 +36,7 @@ class File extends CI_Controller {
$this->var->latest_client = trim(file_get_contents(FCPATH.'data/client/latest'));
}
- // official client uses "fb-client/$version" as useragent
- $clients = array("fb-client", "libcurl", "pyfb");
- foreach ($clients as $client) {
- if (isset($_SERVER['HTTP_USER_AGENT']) && strpos($_SERVER['HTTP_USER_AGENT'], $client) !== false) {
- $this->var->cli_client = true;
- break;
- }
- }
+ $this->var->cli_client = $this->file_mod->is_cli_client();
if ($this->var->cli_client) {
$this->var->view_dir = "file_plaintext";
@@ -51,7 +44,7 @@ class File extends CI_Controller {
$this->var->view_dir = "file";
}
- if (isset($_SERVER['PHP_AUTH_USER']) && isset($_SERVER['PHP_AUTH_PW'])) {
+ if (isset($_SERVER['PHP_AUTH_USER']) && isset($_SERVER['PHP_AUTH_PW']) && $_SERVER['PHP_AUTH_USER'] && $_SERVER['PHP_AUTH_PW']) {
if (!$this->muser->login($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW'])) {
// TODO: better message
echo "login failed.\n";