--- ./lib/Driver/sql.php-old 2007-11-16 21:37:01.000000000 +0100 +++ ./lib/Driver/sql.php 2007-11-16 21:39:40.000000000 +0100 @@ -97,7 +97,7 @@ ' FROM ' . $this->_params[$realm]['table'] . ' WHERE ' . $this->_params[$realm]['user_col'] . ' = ?' . ' AND ' . $this->_params[$realm]['pass_col'] . ' = ?'; - $values = array($myuser, $this->encryptPassword($password)); + $values = array($myuser, "{MD5}".$this->encryptPassword($password)); $result = $this->_db->query($query, $values); if (!is_a($result, 'PEAR_Error')) { $query = 'INSERT INTO ' . $this->_params[$realm]['table'] . @@ -105,7 +105,7 @@ ' ' . $this->_params[$realm]['user_col'] . ',' . ' ' . $this->_params[$realm]['pass_col'] . ')' . ' VALUES ( ?, ?, ?)'; - $values = array('n', $user, $this->encryptPassword($password)); + $values = array('0', $user, "{MD5}".$this->encryptPassword($password)); $result = $this->_db->query($query, $values); } @@ -116,7 +116,7 @@ ' ' . $this->_params[$realm]['subject'] . ' = ?' . ' WHERE ' . $this->_params[$realm]['user_col'] . ' = ?' . ' AND ' . $this->_params[$realm]['pass_col'] . ' = ?'; - $values = array('y', $mymessage, $mysubject, $myuser, $this->encryptPassword($password)); + $values = array('1', $mymessage, $mysubject, $myuser, "{MD5}".$this->encryptPassword($password)); /* Execute the query. */ $result = $this->_db->query($query, $values); @@ -162,7 +162,7 @@ ' SET ' . $this->_params[$realm]['vacation'] . ' = ?' . ' WHERE ' . $this->_params[$realm]['user_col'] . ' = ?' . ' AND ' . $this->_params[$realm]['pass_col'] . ' = ?'; - $values = array('n', $myuser, $this->encryptPassword($password)); + $values = array('0', $myuser, "{MD5}".$this->encryptPassword($password)); /* Execute the query. */ $result = $this->_db->query($query, $values); @@ -210,7 +210,7 @@ ' FROM ' . $this->_params[$realm]['table'] . ' WHERE ' . $this->_params[$realm]['user_col'] . ' = ?' . ' AND ' . $this->_params[$realm]['pass_col'] . ' = ?'; - $values = array($myuser, $this->encryptPassword($password)); + $values = array($myuser, "{MD5}".$this->encryptPassword($password)); /* Execute the query. */ $result = $this->_db->query($query, $values); --- ./lib/Driver.php-old 2007-11-16 21:41:16.000000000 +0100 +++ ./lib/Driver.php 2007-11-16 21:43:40.000000000 +0100 @@ -104,10 +104,12 @@ // Check vacation flag. if ($current_details['vacation'] == 'y' || - $current_details['vacation'] == 'Y') { + $current_details['vacation'] == 'Y' || + $current_details['vacation'] == '1') { return 'Y'; } elseif ($current_details['vacation'] == 'n' || - $current_details['vacation'] == 'N') { + $current_details['vacation'] == 'N' || + $current_details['vacation'] == '0') { return 'N'; } else { return false;