added RSS - part 3

9 files changed, 75 insertions, 5 deletions

diff --git a/h-source/Application/Controllers/RssController.php b/h-source/Application/Controllers/RssController.php
index 359c651..2be8425 100644
--- a/h-source/Application/Controllers/RssController.php
+++ b/h-source/Application/Controllers/RssController.php
@@ -38,4 +38,13 @@ class RssController extends SpecialController
 		$this->load('modifications');
 	}
 
+	public function notapproved($lang = 'en')
+	{
+		$this->shift(1);
+		
+		$this->pagelist($lang,'notapproved');
+		$this->clean();
+		$this->load('notapproved');
+	}
+	
 }
\ No newline at end of file
diff --git a/h-source/Application/Include/languages.php b/h-source/Application/Include/languages.php
index 32eac28..5dd3858 100644
--- a/h-source/Application/Include/languages.php
+++ b/h-source/Application/Include/languages.php
@@ -247,6 +247,8 @@ class Lang
 				/*0209*/"No ethernet devices found"	=>	"Non è stata trovata alcuna scheda ethernet",
 				/*0210*/"free bios"	=>	"bios libero?",
 				/*0211*/"You are not a registered user or you have not logged in. Your contribution won't be published until an administrator approves it. If you want your contributions to be automatically published please log in or create an account."	=>	"Noi sei un utente registrato oppure non hai eseguito il login. Il tuo contributo non verrà pubblicato finché un amministratore non l'avrà approvato. Se desideri che il tuo contributo sia automaticamente pubblicato per favore esegui il login oppure crea un account.",
+				/*0212*/"has been inserted by an anonymous user, it has to be approved by an administrator in order to be published"	=>	"è stato inserito da un utente anonimo, deve essere approvato da un amministratore per essere pubblicato",
+				/*0213*/"you can also subscribe to the feed in order to receive the new modifications that need a moderation"	=>	"puoi anche iscriverti al feed per ricevere le nuove modifiche che richiedono una moderazione",
 			),
 		'es'	=>	array
 			(
diff --git a/h-source/Application/Include/myFunctions.php b/h-source/Application/Include/myFunctions.php
index 1505512..bf8793a 100644
--- a/h-source/Application/Include/myFunctions.php
+++ b/h-source/Application/Include/myFunctions.php
@@ -84,6 +84,11 @@ function smartDate($uglyDate = null, $lang = 'en')
 	return $smDate;
 }
 
+function pubDateFormat($uglyDate = null)
+{
+	return date('r',strtotime($uglyDate));
+}
+
 function sanitizeString($string)
 {
 	$string = preg_match('/^[a-zA-Z0-9\-\_\.\+\s]+$/',$string) ? sanitizeAll($string) : 'undef';
diff --git a/h-source/Application/Views/My/panel.php b/h-source/Application/Views/My/panel.php
index 0f50f36..0116134 100644
--- a/h-source/Application/Views/My/panel.php
+++ b/h-source/Application/Views/My/panel.php
@@ -38,7 +38,7 @@
 			<ul>
 				<li><a href="<?php echo Url::getRoot('special/adminactions/'.$lang);?>"><?php echo gtext("Actions carried out by administrators");?></a></li>
 				<li><a href="<?php echo Url::getRoot('special/deleted/'.$lang);?>"><?php echo gtext("List of hidden device pages");?></a></li>
-				<li><a href="<?php echo Url::getRoot('special/notapproved/'.$lang);?>"><?php echo gtext("Device pages that have to be approved");?></a></li>
+				<li><a href="<?php echo Url::getRoot('special/notapproved/'.$lang);?>"><?php echo gtext("Device pages that have to be approved");?></a> ( <a class="not_bold" href="<?php echo $this->baseUrl."/rss/notapproved/$lang";?>"><?php echo gtext('you can also subscribe to the feed in order to receive the new modifications that need a moderation');?></a> )</li>
 			</ul>
 		</div>
 		<?php } ?>
diff --git a/h-source/Application/Views/Rss/modifications.php b/h-source/Application/Views/Rss/modifications.php
index 02e7197..e1a89b4 100644
--- a/h-source/Application/Views/Rss/modifications.php
+++ b/h-source/Application/Views/Rss/modifications.php
@@ -17,6 +17,7 @@ $translations = array('insert'=>'inserted','update'=>'updated');
 	<title><?php echo $row['hardware']['model'];?></title>
 	<description><![CDATA[<?php echo gtext('the model')." ".$row['hardware']['model']." ".gtext('has been '.$translations[$row['history']['action']].' by')." ".$u->getUser($row['history']['created_by']);?>]]></description>
 	<link><?php echo $this->baseUrl."/".Hardware::$typeToController[$row['hardware']['type']]."/view/$lang/".$row['hardware']['id_hard']."/".encodeUrl($row['hardware']['model']);?></link>
+	<pubDate><?php echo pubDateFormat($row['history']['creation_date']);?></pubDate>
 </item>
 
 <?php } ?>
diff --git a/h-source/Application/Views/Rss/notapproved.php b/h-source/Application/Views/Rss/notapproved.php
new file mode 100644
index 0000000..8def7c5
--- /dev/null
+++ b/h-source/Application/Views/Rss/notapproved.php
@@ -0,0 +1,41 @@
+<?php if (!defined('EG')) die('Direct access not allowed!'); ?>
+<?php echo "<?xml version='1.0' encoding='UTF-8'?>\n";?>
+<rss version="2.0">
+
+<channel>
+<title>www.h-node.com</title>
+<link>http://www.h-node.com</link>
+<description><?php echo gtext("Device pages that have to be approved");?></description>
+
+<?php foreach ($table as $row) { ?>
+<item>
+	<title><?php echo $row['hardware']['model'];?></title>
+	<description><![CDATA[<?php echo gtext('the model')." ".$row['hardware']['model']." ".gtext("has been inserted by an anonymous user, it has to be approved by an administrator in order to be published");?>]]></description>
+	<link><?php echo $this->baseUrl."/".Hardware::$typeToController[$row['hardware']['type']]."/view/$lang/".$row['hardware']['id_hard']."/".encodeUrl($row['hardware']['model']);?></link>
+	<pubDate><?php echo pubDateFormat($row['hardware']['update_date']);?></pubDate>
+</item>
+
+<?php } ?>
+
+</channel>
+</rss>
+
+<?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/>.
+?>
\ No newline at end of file
diff --git a/h-source/Application/Views/right.php b/h-source/Application/Views/right.php
index 778bdc0..d2de8d0 100644
--- a/h-source/Application/Views/right.php
+++ b/h-source/Application/Views/right.php
@@ -148,7 +148,7 @@
 		</div>
 
 		<div class="rss_right_box">
-			<img src="<?php echo $this->baseUrl."/Public/Img/Crystal/rss.png";?>"> <div class="rss_right_box_text">RSS feeds</div>
+			<img src="<?php echo $this->baseUrl."/Public/Img/Crystal/rss.png";?>"> <div class="rss_right_box_text"><a href="<?php echo $this->baseUrl."/rss/modifications/$lang";?>">RSS feeds</a></div>
 		</div>
 		
 		<div class="right_box_ext_box">
diff --git a/h-source/Config/Route.php b/h-source/Config/Route.php
index 34dd039..d60371a 100644
--- a/h-source/Config/Route.php
+++ b/h-source/Config/Route.php
@@ -163,6 +163,7 @@ class Route
 		'webcams,climb',
 		'webcams,talk',
 		'rss,modifications',
+		'rss,notapproved',
 		'special,modifications',
 		'special,modactions',
 		'special,adminactions',
diff --git a/h-source/Public/Css/main.css b/h-source/Public/Css/main.css
index a159733..43c130a 100644
--- a/h-source/Public/Css/main.css
+++ b/h-source/Public/Css/main.css
@@ -1815,6 +1815,11 @@ span.entry_label_small
 	color:#DC143C;
 	font-weight:bold;
 }
+#admin_box ul li a.not_bold
+{
+	color:#000;
+	font-weight:normal;
+}
 #moderator_box ul li a
 {
 	color:#FF4500;
@@ -1842,10 +1847,11 @@ span.entry_label_small
 	padding:5px;
 	overflow:hidden;
 	height:32px;
-	background-color:#000;
+	background-color:#C7DAEF;
 	color:#FFF;
 /* 	border:1px solid #E0FFFF; */
 }
+
 .rss_right_box img
 {
 	float:left;
@@ -1853,10 +1859,15 @@ span.entry_label_small
 .rss_right_box_text
 {
 	float:left;
-	margin:5px;
+	margin:5px 10px;
 	font-weight:bold;
 }
-
+.rss_right_box_text a
+{
+	color:#000;
+/* 	text-decoration:none; */
+	font-weight:normal;
+}
 /*
 Start - temporarily added due to transformation of help pages
 2011-05-29 joeko