X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Freader%2Fclass_ConsoleNewsReader.php;h=1aa4b61543c7361b819ce14d92b60db6074dbb45;hp=0240b74da57e77a262cce8181f67735205b307c1;hb=3cbaa685d35683473f2a13107999108344df2aa7;hpb=7e46f248cc9eb9a3cd540b2e864e053f40a46bcd

diff --git a/inc/classes/main/reader/class_ConsoleNewsReader.php b/inc/classes/main/reader/class_ConsoleNewsReader.php
index 0240b74d..1aa4b615 100644
--- a/inc/classes/main/reader/class_ConsoleNewsReader.php
+++ b/inc/classes/main/reader/class_ConsoleNewsReader.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * A default news reader class reads news from database layer
+ * A console news reader class reads news from database layer
  *
- * @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 - 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
@@ -21,7 +21,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-class DefaultNewsReader extends BaseFrameworkSystem implements ReadableNews, Registerable {
+class ConsoleNewsReader extends BaseFrameworkSystem implements ReadableNews, Registerable {
 	/**
 	 * Protected constructor
 	 *
@@ -30,10 +30,6 @@ class DefaultNewsReader extends BaseFrameworkSystem implements ReadableNews, Reg
 	protected function __construct () {
 		// Call parent constructor
 		parent::__construct(__CLASS__);
-
-		// Clean up a little
-		$this->removeNumberFormaters();
-		$this->removeSystemArray();
 	}
 
 	/**
@@ -42,9 +38,9 @@ class DefaultNewsReader extends BaseFrameworkSystem implements ReadableNews, Reg
 	 * @param	$requestInstance	An instance of a Requestable class
 	 * @return	$readerInstance		An instance of this reader class
 	 */
-	public final static function createDefaultNewsReader (Requestable $requestInstance) {
+	public static final function createConsoleNewsReader (Requestable $requestInstance) {
 		// Get a new instance
-		$readerInstance = new DefaultNewsReader();
+		$readerInstance = new ConsoleNewsReader();
 
 		// Set request instance
 		$readerInstance->setRequestInstance($requestInstance);
@@ -54,26 +50,26 @@ class DefaultNewsReader extends BaseFrameworkSystem implements ReadableNews, Reg
 	}
 
 	/**
-	 * Initializes this reader class by pre-fetching news depending on 'page'
+	 * Initializes this reader class by pre-fetching news depending on 'command'
 	 * (outside or login area), which amount of news and how much to skip
 	 *
 	 * @return	void
 	 */
 	public function initializeReader () {
-		// Get 'page' for saving some calls
-		$page = $this->getRequestInstance()->getRequestElement('page');
+		// Get 'command' for saving some calls
+		$command = $this->getRequestInstance()->getRequestElement('command');
 
 		// First get a wrapper instance
-		$wrapperInstance = ObjectFactory::createObjectByConfiguredName('news_db_wrapper_class');
+		$wrapperInstance = DatabaseWrapperFactory::createWrapperByConfiguredName('news_db_wrapper_class');
 
 		// Next create a searchable criteria instance
 		$criteriaInstance = ObjectFactory::createObjectByConfiguredName('search_criteria_class');
 
-		// Add the page as criteria to it at lease
-		$criteriaInstance->addCriteria('page', $page);
+		// Add the command as criteria to it at lease
+		$criteriaInstance->addCriteria('command', $command);
 
 		// Add limitation from config
-		$criteriaInstance->setLimit($this->getConfigInstance()->readConfig('news_' . $page . '_limit'));
+		$criteriaInstance->setConfiguredLimit('news_' . $command . '_limit');
 
 		// Get a resultInstance back from the database
 		$resultInstance = $wrapperInstance->doSelectByCriteria($criteriaInstance);