diff options
| author | Aleksander Machniak <alec@alec.pl> | 2013-05-06 12:07:05 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2013-05-06 12:07:05 +0200 |
| commit | c027ba7709a86c23038428de15ffed503e67c522 (patch) | |
| tree | a452d21c0a296edb2d8febd7c7712f40ea3535ed /plugins | |
| parent | 3a0dc87856cc0c2a47649e58e930621506e64cbf (diff) | |
Fix bugs caught by static analysis
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/acl/acl.php | 5 | ||||
| -rw-r--r-- | plugins/password/drivers/sql.php | 2 |
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 { |