Continued CSV parsing:

[core.git] / inc / classes / main / database / wrapper / class_UserPointsDatabaseWrapper.php

diff --git a/inc/classes/main/database/wrapper/class_UserPointsDatabaseWrapper.php b/inc/classes/main/database/wrapper/class_UserPointsDatabaseWrapper.php
index ef5922538865ea0f4e3147b1dc45e78760c8abfe..5f01b2995b45f2ce2b10ca4ee6ac49bf93f37ae6 100644 (file)
--- a/inc/classes/main/database/wrapper/class_UserPointsDatabaseWrapper.php
+++ b/inc/classes/main/database/wrapper/class_UserPointsDatabaseWrapper.php
@@ -2,11 +2,11 @@
 /**
  * A database wrapper for user points classes
  *
- * @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 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2014 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
@@ -25,24 +25,24 @@ class UserPointsDatabaseWrapper extends BaseDatabaseWrapper implements BookableP
        /**
         * Constants for database table names
         */
-       const DB_TABLE_USER_POINTS = "user_points";
+       const DB_TABLE_USER_POINTS = 'user_points';
 
        /**
         * Name of the user->points column
         */
-       const DB_COLUMN_POINTS_UID = "points_uid";
+       const DB_COLUMN_POINTS_UID = 'points_uid';
 
        /**
         * Name of the points column
         */
-       const DB_COLUMN_POINTS = "points";
+       const DB_COLUMN_POINTS = 'points';
 
        /**
         * Protected constructor
         *
         * @return      void
         */
-       protected function __construct() {
+       protected function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);
        }
@@ -52,7 +52,7 @@ class UserPointsDatabaseWrapper extends BaseDatabaseWrapper implements BookableP
         *
         * @return      $wrapperInstance        An instance of the created wrapper class
         */
-       public final static function createUserPointsDatabaseWrapper () {
+       public static final function createUserPointsDatabaseWrapper () {
                // Get a new instance
                $wrapperInstance = new UserPointsDatabaseWrapper();
 
@@ -77,10 +77,10 @@ class UserPointsDatabaseWrapper extends BaseDatabaseWrapper implements BookableP
                $dataSetInstance->setUniqueKey(self::DB_COLUMN_POINTS_UID);
 
                // Add registration elements to the dataset
-               $pointsInstance->addElementsToDataSet($dataSetInstance);
+               $pointsInstance->addElementsToDataSet($dataSetInstance, NULL);
 
                // "Insert" this request instance completely into the database
-               $this->getDatabaseInstance()->queryInsertDataSet($dataSetInstance);
+               $this->queryInsertDataSet($dataSetInstance);
        }
 
        /**
@@ -94,7 +94,7 @@ class UserPointsDatabaseWrapper extends BaseDatabaseWrapper implements BookableP
                $dataSetInstance = ObjectFactory::createObjectByConfiguredName('dataset_criteria_class', array(self::DB_TABLE_USER_POINTS));
 
                // Add all update criteria to the database set
-               $resultInstance->addElementsToDataSet($dataSetInstance);
+               $resultInstance->addElementsToDataSet($dataSetInstance, NULL);
 
                // Add seach criteria
                $dataSetInstance->setSearchInstance($resultInstance->getUpdateInstance()->getSearchInstance());