cvs: pearweb /include/Damblan Karma.php

cellog Thu May 24 18:22:17 2007 UTC

Modified files:
/pearweb/include/Damblan Karma.php
Log:
fix issues found in unit testing

# testing complete

http://cvs.php.net/viewvc.cgi/pearwe...&diff_format=u
Index: pearweb/include/Damblan/Karma.php
diff -u pearweb/include/Damblan/Karma.php:1.24 pearweb/include/Damblan/Karma.php:1.25
--- pearweb/include/Damblan/Karma.php:1.24 Wed Feb 28 00:21:11 2007
+++ pearweb/include/Damblan/Karma.php Thu May 24 18:22:16 2007
@@ -15,7 +15,7 @@
+----------------------------------------------------------------------+
| Author: Martin Jansen <mj@php.net> |
+----------------------------------------------------------------------+
- $Id: Karma.php,v 1.24 2007/02/28 00:21:11 cellog Exp $
+ $Id: Karma.php,v 1.25 2007/05/24 18:22:16 cellog Exp $
*/

/**
@@ -26,11 +26,13 @@
* single-sign-on system some time in the future.
*
* @author Martin Jansen <mj@php.net>
- * @version $Revision: 1.24 $
+ * @version $Revision: 1.25 $
*/
class Damblan_Karma
{
- var $_dbh;
+ private $_dbh;
+ private $_logger;
+ private $_observer;

/**
* Constructor
@@ -38,9 +40,11 @@
* @access public
* @param object Instance of PEAR:B
*/
- function Damblan_Karma(&$dbh)
+ function Damblan_Karma($dbh, $logger = null, $observer = null)
{
$this->_dbh = $dbh;
+ $this->_logger = $logger;
+ $this->_observer = $observer;
}

/**
@@ -119,7 +123,9 @@
{
global $auth_user;

- $this->_requireKarma();
+ if (!$this->_requireKarma()) {
+ return false;
+ }

// Abort if the karma level has already been granted to the user
if ($this->has($user, $level)) {
@@ -129,6 +135,9 @@
}

$id = $this->_dbh->nextId("karma");
+ if (DB::isError($id)) {
+ return false;
+ }

$query = "INSERT INTO karma VALUES (?, ?, ?, ?, NOW())";
$sth = $this->_dbh->query($query, array($id, $user, $level, $auth_user->handle));
@@ -153,7 +162,9 @@
{
global $auth_user;

- $this->_requireKarma();
+ if (!$this->_requireKarma()) {
+ return false;
+ }

$query = "DELETE FROM karma WHERE user = ? AND level = ?";
$sth = $this->_dbh->query($query, array($user, $level));
@@ -241,20 +252,20 @@

static $logger, $observer;

- if (!isset($logger)) {
- $logger = new Damblan_Log;
+ if (!$this->_logger) {
+ $this->_logger = new Damblan_Log;
}
- if (!DEVBOX && !isset($observer)) {
- $observer = new Damblan_Log_Mail;
- $observer->setRecipients("pear-group@php.net");
- $observer->setHeader("From", "\"PEAR Karma Manager\" <pear-sys@php.net>");
- $observer->setHeader("Reply-To", "<pear-group@php.net>");
- $observer->setHeader("Subject", "[PEAR Group] Karma update");
- $logger->attach($observer);
+ if (!DEVBOX && !$this->_observer) {
+ $this->_observer = new Damblan_Log_Mail;
+ $this->_observer->setRecipients("pear-group@php.net");
+ $this->_observer->setHeader("From", "\"PEAR Karma Manager\" <pear-sys@php.net>");
+ $this->_observer->setHeader("Reply-To", "<pear-group@php.net>");
+ $this->_observer->setHeader("Subject", "[PEAR Group] Karma update");
+ $this->_logger->attach($this->_observer);
}

$text = $admin_user . ' has updated karma for ' . $user . ': ' . $action;
- $logger->log($text);
+ $this->_logger->log($text);
}
}
?>