banananetwork
/
postfixadmin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

move to use db_assoc() rather than db_array() (code assumes assoc. array)

Browse Source
pull/154/head
David Goodwin 8 years ago
parent c147eb053b
commit 152975d05c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File

4
model/PFAHandler.php
Unescape Escape View File

@ -808,7 +808,7 @@ abstract class PFAHandler {
$result = db_query($query); $result = db_query($query);
if ($result['rows'] == 1) { if ($result['rows'] == 1) {
$row = db_array($result['result']); $row = db_assoc($result['result']);
$crypt_password = pacrypt($password, $row['password']); $crypt_password = pacrypt($password, $row['password']);
if ($row['password'] == $crypt_password) { if ($row['password'] == $crypt_password) {
@ -853,7 +853,7 @@ abstract class PFAHandler {
$result = db_query($query); $result = db_query($query);
if ($result['rows'] == 1) { if ($result['rows'] == 1) {
$row = db_array($result['result']); $row = db_assoc($result['result']);
$crypt_token = pacrypt($token, $row['token']); $crypt_token = pacrypt($token, $row['token']);
if ($row['token'] == $crypt_token) { if ($row['token'] == $crypt_token) {

2
model/VacationHandler.php
Unescape Escape View File

@ -149,7 +149,7 @@ class VacationHandler extends PFAHandler {
return false; return false;
} }
$row = db_array($result['result']); $row = db_assoc($result['result']);
$boolean = ($row['active'] == db_get_boolean(true)); $boolean = ($row['active'] == db_get_boolean(true));
# TODO: only return true and store the db result array in $this->whatever for consistency with the other classes # TODO: only return true and store the db result array in $this->whatever for consistency with the other classes
return array( return array(

Write Preview
Loading…
Cancel
Save