removed useless settings

7 files changed, 29 insertions, 191 deletions

diff --git a/appinfo/app.php b/appinfo/app.php
index 69a4db3a8..a6534bdc0 100644
--- a/appinfo/app.php
+++ b/appinfo/app.php
@@ -52,6 +52,7 @@ $api->addNavigationEntry(array(
 ));
 
 
-\OCP\Backgroundjob::addRegularTask( 'OCA\News\Backgroundjob\Task', 'run');
+$api->addRegularTask('OCA\News\Backgroundjob\Task', 'run');
+$api->registerAdmin('settings/admin');
 
 
diff --git a/appinfo/routes.php b/appinfo/routes.php
index 4397b4750..903f04d06 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -194,6 +194,17 @@ $this->create('news_usersettings_read_hide', '/usersettings/read/hide')->post()-
 );
 
 
+/**
+ * Settings
+ */
+$this->create('news_setings_auto_purge_limit', '/settings/autopurgelimit')
+->post()->action(
+	function($params){
+		App::main('SettingsController', 'setAutoPurgeLimit', $params,
+		          new DIContainer());
+	}
+);
+
 
 /**
  * Feed API
diff --git a/controller/settingscontroller.php b/controller/settingscontroller.php
deleted file mode 100644
index 2c307b801..000000000
--- a/controller/settingscontroller.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-/**
-* ownCloud - News
-*
-* @author Alessandro Cosentino
-* @author Bernhard Posselt
-* @copyright 2012 Alessandro Cosentino cosenal@gmail.com
-* @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Affero General Public
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-
-namespace OCA\News\Controller;
-
-use \OCA\AppFramework\Controller\Controller;
-use \OCA\AppFramework\Core\API;
-use \OCA\AppFramework\Http\Request;
-
-
-class SettingsController extends Controller {
-
-
-	public function __construct(API $api, Request $request){
-		parent::__construct($api, $request);
-	}
-
-
-	/**
-	 * @CSRFExemption
-	 */
-	public function index(){
-		$purgeLimit = (int) $this->api->getAppValue('purgeLimit');
-
-		$params = array(
-			'purgeLimit' => $purgeLimit
-		);
-		return $this->render('admin', $params);
-	}
-
-
-	/**
-	 * @Ajax
-	 */
-	public function setAutoPurgeLimit(){
-		$purgeLimit = (int) $this->params('purgeLimit');
-		$this->api->setAppValue('purgeLimit', $purgeLimit);
-
-		return $this->renderJSON();
-	}
-
-
-
-}
\ No newline at end of file
diff --git a/dependencyinjection/dicontainer.php b/dependencyinjection/dicontainer.php
index 7a172a73a..6dfc0308c 100644
--- a/dependencyinjection/dicontainer.php
+++ b/dependencyinjection/dicontainer.php
@@ -92,6 +92,7 @@ class DIContainer extends BaseContainer {
 					$c['ItemBl']);
 		});
 
+
 		/**
 		 * Business Layer
 		 */
diff --git a/templates/admin.php b/templates/admin.php
new file mode 100644
index 000000000..84282a9d6
--- /dev/null
+++ b/templates/admin.php
@@ -0,0 +1,14 @@
+<?php \OCP\Util::addScript('news', 'public/admin'); ?>
+
+
+<fieldset class="personalblock">
+	<legend><strong><?php p($l->t('News Settings')); ?></strong></legend>
+
+	<p><?php p($l->t('To prevent the news app to amount a lot of unread items this setting can be used to automatically delete those items.')); ?></p>
+	<lable for="auto-purge">
+		<?php p($l->t('Set the maximum number of feed items that should be unread and not starred.')); ?>
+	</label>
+	<input id="news-auto-purge-limit" type="text" disabled="disabled" 
+       value="<?php p($_['purgeLimit']); ?>" name="auto-purge" />
+
+</fieldset>
diff --git a/tests/controller/SettingsControllerTest.php b/tests/controller/SettingsControllerTest.php
deleted file mode 100644
index f2d9ca712..000000000
--- a/tests/controller/SettingsControllerTest.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-
-/**
-* ownCloud - News
-*
-* @author Alessandro Copyright
-* @author Bernhard Posselt
-* @copyright 2012 Alessandro Cosentino cosenal@gmail.com
-* @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Affero General Public
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-
-namespace OCA\News\Controller;
-
-use \OCA\AppFramework\Http\Request;
-use \OCA\AppFramework\Http\JSONResponse;
-use \OCA\AppFramework\Http\TemplateResponse;
-use \OCA\AppFramework\Utility\ControllerTestUtility;
-
-
-require_once(__DIR__ . "/../classloader.php");
-
-
-class SettingsControllerTest extends ControllerTestUtility {
-
-	private $api;
-	private $request;
-	private $controller;
-
-
-	/**
-	 * Gets run before each test
-	 */
-	public function setUp(){
-		$this->api = $this->getAPIMock();
-		$this->request = new Request();
-		$this->controller = new SettingsController($this->api, $this->request);
-		$this->user = 'becka';
-	}
-
-
-	private function getPostController($postValue, $url=array()){
-		$post = array(
-			'post' => $postValue,
-			'urlParams' => $url
-		);
-
-		$request = $this->getRequest($post);
-		return new SettingsController($this->api, $request);
-	}
-
-
-	public function testIndexAnnotations(){
-		$methodName = 'index';
-		$annotations = array('CSRFExemption');
-		$this->assertAnnotations($this->controller, $methodName, $annotations);
-	}
-
-
-	public function testSetAutoPurgeLimitAnnotations(){
-		$methodName = 'setAutoPurgeLimit';
-		$annotations = array('Ajax');
-		$this->assertAnnotations($this->controller, $methodName, $annotations);
-	}
-
-
-	public function testIndexReturnsAdminTemplate(){
-		$this->api->expects($this->once())
-			->method('getAppValue')
-			->with($this->equalTo('purgeLimit'))
-			->will($this->returnValue('30'));
-
-		$response = $this->controller->index();
-		$params = $response->getParams();
-
-		$this->assertEquals('admin', $response->getTemplateName());
-		$this->assertEquals(30, $params['purgeLimit']);
-	}
-
-
-	public function testIndexSetsLimitToNullIfValueIsNotSet(){
-		$this->api->expects($this->once())
-			->method('getAppValue')
-			->with($this->equalTo('purgeLimit'))
-			->will($this->returnValue(null));
-
-		$response = $this->controller->index();
-		$params = $response->getParams();
-
-		$this->assertEquals(0, $params['purgeLimit']);
-	}
-
-
-	public function testSetAutoPurgeLimit(){
-		$post = array(
-			'purgeLimit' => '10'
-		);
-		$this->controller = $this->getPostController($post);
-
-		$this->api->expects($this->once())
-			->method('setAppValue')
-			->with($this->equalTo('purgeLimit'), 
-				$this->equalTo(10));	
-
-		$response = $this->controller->setAutoPurgeLimit();			
-
-		$this->assertTrue($response instanceof JSONResponse);
-	}
-
-}
diff --git a/tests/controller/TwitterFetcherTest.php b/tests/controller/TwitterFetcherTest.php
index 00d5aa1ab..f74ed1877 100644
--- a/tests/controller/TwitterFetcherTest.php
+++ b/tests/controller/TwitterFetcherTest.php
@@ -51,7 +51,7 @@ class TwitterFetcherTest extends \OCA\AppFramework\Utility\TestUtility {
 			'twitter.com/GeorgeTakei'
 		);
 		foreach($urls as $url){
-			$this->assertTrue($this->twitter->canHandle($url));
+			$this->assertTrue($this->twitter->canHandle($url), $url);
 		}
 	}