summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <machniak@kolabsys.com>2014-11-21 12:11:03 (GMT)
committerAleksander Machniak <machniak@kolabsys.com>2014-11-21 12:11:03 (GMT)
commit1bf3cab3f81f171358ec4f4eaea63ec018ba9981 (patch)
treebc4e5752ea560240803f059296544e391549713c
parent66090da6526f9078914a5a4045d383a98f30f5a5 (diff)
downloadkolab-chwala-1bf3cab3f81f171358ec4f4eaea63ec018ba9981.tar.gz
Small code fixes
-rw-r--r--lib/drivers/kolab/kolab_file_storage.php2
-rw-r--r--lib/drivers/seafile/seafile_file_storage.php4
-rw-r--r--lib/file_locks.php2
-rw-r--r--lib/file_ui.php2
4 files changed, 5 insertions, 5 deletions
diff --git a/lib/drivers/kolab/kolab_file_storage.php b/lib/drivers/kolab/kolab_file_storage.php
index 8e34a1d..f29e74e 100644
--- a/lib/drivers/kolab/kolab_file_storage.php
+++ b/lib/drivers/kolab/kolab_file_storage.php
@@ -140,7 +140,7 @@ class kolab_file_storage implements file_storage
// take the first entry if $host is not found
if (is_array($host)) {
- list($key, $val) = each($default_host);
+ list($key, $val) = each($host);
$host = is_numeric($key) ? $val : $key;
}
}
diff --git a/lib/drivers/seafile/seafile_file_storage.php b/lib/drivers/seafile/seafile_file_storage.php
index 6343b7d..9459fa6 100644
--- a/lib/drivers/seafile/seafile_file_storage.php
+++ b/lib/drivers/seafile/seafile_file_storage.php
@@ -610,7 +610,7 @@ class seafile_file_storage implements file_storage
'created' => $file['created'] ? $file['created']->format('U') : 0,
);
- unset($files[$idx]);
+ unset($entries[$idx]);
}
// @TODO: pagination, search (by filename, mimetype)
@@ -833,7 +833,7 @@ class seafile_file_storage implements file_storage
}
}
- foreach ($this->libraries as $library) {
+ foreach ($libraries as $library) {
if ($library['virtual'] || $library['encrypted']) {
continue;
}
diff --git a/lib/file_locks.php b/lib/file_locks.php
index 7b7a40b..56651a8 100644
--- a/lib/file_locks.php
+++ b/lib/file_locks.php
@@ -254,7 +254,7 @@ class file_locks {
. " WHERE `uri` = ? AND `token` = ?",
$uri, $lock['token']);
- return $this->db->affected_rows();
+ return $this->db->affected_rows($stmt);
}
/**
diff --git a/lib/file_ui.php b/lib/file_ui.php
index 13d6f92..970aef3 100644
--- a/lib/file_ui.php
+++ b/lib/file_ui.php
@@ -189,7 +189,7 @@ class file_ui extends file_locale
if (($language = $this->get_language()) && $language != 'en_US') {
$_SESSION['user']['language'] = $language;
- $session_config['language'] = $language;
+// $session_config['language'] = $language;
}
/*
// Configure API session