Merge branch 'development' into h-node

2 files changed, 0 insertions, 87 deletions

diff --git a/h-source/Application/Views/Desktop/Rss/modifications.php b/h-source/Application/Views/Desktop/Rss/modifications.php
deleted file mode 100644
index 0a9100b..0000000
--- a/h-source/Application/Views/Desktop/Rss/modifications.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?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><?php echo Website::$generalName;?></title>
-<link><?php echo Url::getRoot();?></link>
-<description><?php echo gtext("Database modifications");?></description>
-
-<?php
-$u = new UsersModel();
-$translations = array('insert'=>'inserted','update'=>'updated');
-?>
-
-<?php foreach ($table as $row) { ?>
-<item>
-	<title><?php echo $row['hardware']['model'];?></title>
-	<description><![CDATA[<?php echo "$statusnetText ".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 } ?>
-
-</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/Desktop/Rss/notapproved.php b/h-source/Application/Views/Desktop/Rss/notapproved.php
deleted file mode 100644
index dec338b..0000000
--- a/h-source/Application/Views/Desktop/Rss/notapproved.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?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><?php echo Website::$generalName;?></title>
-<link><?php echo Url::getRoot();?></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