summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/acl/acl.php5
-rw-r--r--plugins/password/drivers/sql.php2
2 files changed, 4 insertions, 3 deletions
diff --git a/plugins/acl/acl.php b/plugins/acl/acl.php
index 938287b1a..8879a6050 100644
--- a/plugins/acl/acl.php
+++ b/plugins/acl/acl.php
@@ -433,8 +433,9 @@ class acl extends rcube_plugin
$acl = trim(rcube_utils::get_input_value('_acl', rcube_utils::INPUT_GPC));
$oldid = trim(rcube_utils::get_input_value('_old', rcube_utils::INPUT_GPC));
- $acl = array_intersect(str_split($acl), $this->rights_supported());
- $users = $oldid ? array($user) : explode(',', $user);
+ $acl = array_intersect(str_split($acl), $this->rights_supported());
+ $users = $oldid ? array($user) : explode(',', $user);
+ $result = 0;
foreach ($users as $user) {
$user = trim($user);
diff --git a/plugins/password/drivers/sql.php b/plugins/password/drivers/sql.php
index e02bff146..de9ea0a3f 100644
--- a/plugins/password/drivers/sql.php
+++ b/plugins/password/drivers/sql.php
@@ -183,7 +183,7 @@ class rcube_sql_password
$res = $db->query($sql, $sql_vars);
if (!$db->is_error()) {
- if (strtolower(substr(trim($query),0,6))=='select') {
+ if (strtolower(substr(trim($sql),0,6)) == 'select') {
if ($result = $db->fetch_array($res))
return PASSWORD_SUCCESS;
} else {