Used more DatabaseWrapperFactory as one instance of each is fine.

[core.git] / inc / classes / main / points / class_UserPoints.php

diff --git a/inc/classes/main/points/class_UserPoints.php b/inc/classes/main/points/class_UserPoints.php
index b9f9d12595eeaaad2f38899a2fa5f5c7b8eab5f8..428868d80ff28b50f697b4da1696113436d4ef68 100644 (file)
--- a/inc/classes/main/points/class_UserPoints.php
+++ b/inc/classes/main/points/class_UserPoints.php
@@ -2,11 +2,11 @@
 /**
  * A class for handling user points which can be real or Internet currency
  *
- * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
+ * @link               http://www.shipsimu.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -58,7 +58,7 @@ class UserPoints extends BaseFrameworkSystem implements Registerable, BookablePo
                $searchInstance->setLimit(1);
 
                // Get a wrapper instance
-               $wrapperInstance = ObjectFactory::createObjectByConfiguredName('user_points_db_wrapper_class');
+               $wrapperInstance = DatabaseWrapperFactory::createWrapperByConfiguredName('user_points_db_wrapper_class');
 
                // Get result back
                $resultInstance = $wrapperInstance->doSelectByCriteria($searchInstance);
@@ -101,7 +101,7 @@ class UserPoints extends BaseFrameworkSystem implements Registerable, BookablePo
         */
        public function ifUserHasRequiredPoints ($action) {
                // Default is that everyone is poor... ;-)
-               $hasRequired = false;
+               $hasRequired = FALSE;
 
                // Get the required points entry
                $requiredPoints = $this->getConfigInstance()->getConfigEntry($action . '_action_points');
@@ -128,7 +128,7 @@ class UserPoints extends BaseFrameworkSystem implements Registerable, BookablePo
         * @param       $amount         Amount of points we shall book
         * @return      void
         */
-       function bookPointsDirectly ($amount) {
+       public function bookPointsDirectly ($amount) {
                // Rewind always
                $this->getResultInstance()->rewind();
 
@@ -166,10 +166,11 @@ class UserPoints extends BaseFrameworkSystem implements Registerable, BookablePo
        /**
         * Adds registration elements to a given dataset instance
         *
-        * @param       $criteriaInstance       An instance of a storeable criteria
+        * @param       $criteriaInstance       An instance of a StoreableCriteria class
+        * @param       $requestInstance        An instance of a Requestable class
         * @return      void
         */
-       public function addElementsToDataSet (StoreableCriteria $criteriaInstance) {
+       public function addElementsToDataSet (StoreableCriteria $criteriaInstance, Requestable $requestInstance = NULL) {
                // Add user id
                $criteriaInstance->addCriteria(UserPointsDatabaseWrapper::DB_COLUMN_POINTS_UID, $this->getUserInstance()->getUserId());