Added optional $requestInstance parameter

[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 efbd9c82e4f4892636dbc4349499604f47aca967..13b210eba54818d47fc5e6be4070f55ed785aaae 100644 (file)
--- a/inc/classes/main/points/class_UserPoints.php
+++ b/inc/classes/main/points/class_UserPoints.php
@@ -4,7 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009, 2010 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -43,7 +43,7 @@ class UserPoints extends BaseFrameworkSystem implements Registerable, BookablePo
         * @param       $userInstance           An instance of a user class
         * @return      $pointsInstance         An instance of this class
         */
-       public final static function createUserPoints (ManageableAccount $userInstance) {
+       public static final function createUserPoints (ManageableAccount $userInstance) {
                // Get a new instance
                $pointsInstance = new UserPoints();
 
@@ -93,10 +93,10 @@ class UserPoints extends BaseFrameworkSystem implements Registerable, BookablePo
        }
 
        /**
-        * Checks wether the user has the required amount of points left for the specified action
+        * Checks whether the user has the required amount of points left for the specified action
         *
         * @param       $action                 The action or configuration entry plus prefix the user wants to perform
-        * @return      $hasRequired    Wether the user has the required points
+        * @return      $hasRequired    Whether the user has the required points
         * @todo        Finish loading part of points
         */
        public function ifUserHasRequiredPoints ($action) {
@@ -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());