From 7dd59cf1f5c5452d31669ca196405ac77da3ab00 Mon Sep 17 00:00:00 2001
From: Antonio Gallo <tonicucoz@gmail.com>
Date: Sun, 24 Jul 2011 17:06:13 +0000
Subject: added RSS - part 1

---
 h-source/Application/Controllers/RssController.php | 41 ++++++++++++++++++++++
 .../Application/Controllers/SpecialController.php  |  2 +-
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 h-source/Application/Controllers/RssController.php

(limited to 'h-source/Application/Controllers')

diff --git a/h-source/Application/Controllers/RssController.php b/h-source/Application/Controllers/RssController.php
new file mode 100644
index 0000000..359c651
--- /dev/null
+++ b/h-source/Application/Controllers/RssController.php
@@ -0,0 +1,41 @@
+<?php 
+
+// h-source, a web software to build a community of people that want to share their hardware information.
+// Copyright (C) 2010  Antonio Gallo (h-source-copyright.txt)
+//
+// This file is part of h-source
+//
+// h-source is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// h-source 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 General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with h-source.  If not, see <http://www.gnu.org/licenses/>.
+
+if (!defined('EG')) die('Direct access not allowed!');
+
+class RssController extends SpecialController
+{
+
+	public function __construct($model, $controller, $queryString)
+	{
+		parent::__construct($model, $controller, $queryString);
+		
+		$data['title'] = 'RSS - '.Website::$generalName;
+		$this->append($data);
+	}
+
+	public function modifications($lang = 'en')
+	{
+		parent::modifications($lang);
+		$this->clean();
+		$this->load('modifications');
+	}
+
+}
\ No newline at end of file
diff --git a/h-source/Application/Controllers/SpecialController.php b/h-source/Application/Controllers/SpecialController.php
index 3776a18..480c0fa 100644
--- a/h-source/Application/Controllers/SpecialController.php
+++ b/h-source/Application/Controllers/SpecialController.php
@@ -110,7 +110,7 @@ class SpecialController extends BaseController
 
 		$this->helper('Pages','special/'.$this->action.'/'.$this->lang,'page');
 
-		$this->m['HistoryModel']->clear()->inner('hardware')->on('hardware.id_hard=history.id')->select()->where($whereClauseArray)->orderBy('id_history desc');
+		$this->m['HistoryModel']->clear()->select('history.*,hardware.*')->inner('hardware')->on('hardware.id_hard=history.id')->where($whereClauseArray)->orderBy('id_history desc');
 
 		$recordNumber = $this->m['HistoryModel']->rowNumber();
 		$page = $this->viewArgs['page'];
-- 
cgit v1.2.3