h-source: added the ClientController and the license.phpfile

14 files changed, 197 insertions, 18 deletions

diff --git a/h-source/Application/Controllers/ClientController.php b/h-source/Application/Controllers/ClientController.php
new file mode 100644
index 0000000..e0ff37e
--- /dev/null
+++ b/h-source/Application/Controllers/ClientController.php
@@ -0,0 +1,48 @@
+<?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 ClientController extends BaseController
+{
+
+	public function __construct($model, $controller, $queryString)
+	{
+		parent::__construct($model, $controller, $queryString);
+	}
+	
+	public function licenseinfo($lang = 'en')
+	{
+		$this->clean();
+		$this->load("license");
+	}
+
+	public function userinfo($lang = 'en')
+	{
+		$this->s['registered']->checkStatus();
+
+		$data['user_status'] = strcmp($this->islogged,'yes') === 0 ? 'logged' : 'not-logged';
+
+		$this->append($data);
+		$this->clean();
+		$this->load('info');
+	}
+
+}
\ No newline at end of file
diff --git a/h-source/Application/Controllers/DownloadController.php b/h-source/Application/Controllers/DownloadController.php
index f79fe7e..744d338 100644
--- a/h-source/Application/Controllers/DownloadController.php
+++ b/h-source/Application/Controllers/DownloadController.php
@@ -52,7 +52,7 @@ class DownloadController extends BaseController
 		$xml .= "\t\t<credits>h-node project</credits>\n";
 		$xml .= "\t\t<link>www.h-node.com</link>\n";
 		$xml .= "\t\t<date>".date("Y-m-d H:m:s")."</date>\n";
-		$xml .= "\t\t<license>The contents of this page are in the Public Domain (see the CC0 page at http://creativecommons.org/publicdomain/zero/1.0/ for detailed information). Anyone is free to copy, modify, publish, use, sell, or distribute the text for any purpose, commercial or non-commercial, and by any means.</license>\n";
+		$xml .= "\t\t<license>".License::getInsideXml()."</license>\n";
 		$xml .= "\t</general_informations>\n";
 		
 		foreach ($res as $row)
diff --git a/h-source/Application/Controllers/HomeController.php b/h-source/Application/Controllers/HomeController.php
index ac492a6..5eff4d9 100644
--- a/h-source/Application/Controllers/HomeController.php
+++ b/h-source/Application/Controllers/HomeController.php
@@ -56,5 +56,5 @@ class HomeController extends BaseController
 		$this->cleverLoad('left');
 		$this->right($lang);
 	}
-	
+
 }
\ No newline at end of file
diff --git a/h-source/Application/Controllers/UsersController.php b/h-source/Application/Controllers/UsersController.php
index b55a461..651b371 100644
--- a/h-source/Application/Controllers/UsersController.php
+++ b/h-source/Application/Controllers/UsersController.php
@@ -118,16 +118,16 @@ class UsersController extends BaseController
 		$this->load('logout');
 	}
 
-	public function info($lang = 'en')
-	{
-		$this->s['registered']->checkStatus();
-
-		$data['user_status'] = strcmp($this->islogged,'yes') === 0 ? 'logged' : 'not-logged';
-
-		$this->append($data);
-		$this->clean();
-		$this->load('info');
-	}
+// 	public function info($lang = 'en')
+// 	{
+// 		$this->s['registered']->checkStatus();
+// 
+// 		$data['user_status'] = strcmp($this->islogged,'yes') === 0 ? 'logged' : 'not-logged';
+// 
+// 		$this->append($data);
+// 		$this->clean();
+// 		$this->load('info');
+// 	}
 	
 	public function add($lang = 'en')
 	{
diff --git a/h-source/Application/Include/languages.php b/h-source/Application/Include/languages.php
index a967ec0..87f6eb3 100644
--- a/h-source/Application/Include/languages.php
+++ b/h-source/Application/Include/languages.php
@@ -215,6 +215,7 @@ class Lang
 				"No bluetooth devices found"	=>	"Non è stato trovato alcun dispositivo bluetooth",
 				"learn how to find it" =>	"scopri come individuarlo",
 				"Download the xml file of all the <b>bluetooth devices</b> in the database" => "Scarica il file xml di tutti i <b>dispositivi bluetooth</b> presenti nel database",
+				"License information"	=>	"Informazioni sulla licenza",
 			),
 		'es'	=>	array
 			(
diff --git a/h-source/Application/Include/license.php b/h-source/Application/Include/license.php
new file mode 100644
index 0000000..b1a1999
--- /dev/null
+++ b/h-source/Application/Include/license.php
@@ -0,0 +1,83 @@
+<?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 License
+{
+
+	//license notice that does appear at the bottom of each hardware and wiki page
+	public static $bottom = array(
+		'en'	=>	"The contents of this page are in the Public Domain. (see the <a href='http://creativecommons.org/publicdomain/zero/1.0/'>CC0 page</a> for detailed information). Anyone is free to copy, modify, publish, use, sell, or distribute the text for any purpose, commercial or non-commercial, and by any means.",
+		'it'	=>	"Il contenuti di questa pagina sono di Pubblico Dominio. (leggi la <a href='http://creativecommons.org/publicdomain/zero/1.0/deed.it'>pagina CC0</a> per informazioni dettagliate). Chiunque è libero di copiare, modificare, pubblicare, usare, vendere, o distribuire tale contenuto per qualsiasi fine, commerciale o non commerciale, e con ogni mezzo.",
+	);
+
+	//license notice that does appear inside the xml download page
+	public static $insideXml = array(
+		'en'	=>	"The contents of this page are in the Public Domain. (see the CC0 page at http://creativecommons.org/publicdomain/zero/1.0/ for detailed information). Anyone is free to copy, modify, publish, use, sell, or distribute the text for any purpose, commercial or non-commercial, and by any means.",
+		'it'	=>	"Il contenuti di questa pagina sono di Pubblico Dominio. (leggi la pagina CC0 all'indirizzo 'http://creativecommons.org/publicdomain/zero/1.0/deed.it' per informazioni dettagliate). Chiunque è libero di copiare, modificare, pubblicare, usare, vendere, o distribuire tale contenuto per qualsiasi fine, commerciale o non commerciale, e con ogni mezzo.",
+	);
+
+	//license notice that does appear before the submission of each hardware and wiki page
+	public static $submissionNotice = array(
+		'en'	=>	"Any text submitted by you will be put in the Public Domain (see the <a href='http://creativecommons.org/publicdomain/zero/1.0/'>CC0 page</a> for detailed information).",
+		'it'	=>	"Ogni testo da te inviato diventerà di Pubblico Dominio. (leggi la <a href='http://creativecommons.org/publicdomain/zero/1.0/deed.it'>pagina CC0</a> per informazioni dettagliate).",
+	);
+
+	//get the bottom notice
+	public static function getBottom()
+	{
+		if (array_key_exists(Lang::$current,self::$bottom))
+		{
+			return self::$bottom[Lang::$current];
+		}
+		else
+		{
+			return self::$bottom['en'];
+		}
+	}
+
+	//get the submission notice
+	public static function getSubmissionNotice()
+	{
+		if (array_key_exists(Lang::$current,self::$submissionNotice))
+		{
+			return self::$submissionNotice[Lang::$current];
+		}
+		else
+		{
+			return self::$submissionNotice['en'];
+		}
+	}
+
+	//get the license notice insidethe xml download page
+	public static function getInsideXml()
+	{
+		if (array_key_exists(Lang::$current,self::$insideXml))
+		{
+			return self::$insideXml[Lang::$current];
+		}
+		else
+		{
+			return self::$insideXml['en'];
+		}
+	}
+	
+}
\ No newline at end of file
diff --git a/h-source/Application/Include/vendors.php b/h-source/Application/Include/vendors.php
index d56a62a..97a6851 100644
--- a/h-source/Application/Include/vendors.php
+++ b/h-source/Application/Include/vendors.php
@@ -1,5 +1,25 @@
 <?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 Vendors
 {
 
diff --git a/h-source/Application/Views/info.php b/h-source/Application/Views/Client/info.php
index 00d2927..00d2927 100644
--- a/h-source/Application/Views/info.php
+++ b/h-source/Application/Views/Client/info.php
diff --git a/h-source/Application/Views/Client/license.php b/h-source/Application/Views/Client/license.php
new file mode 100644
index 0000000..387fb6e
--- /dev/null
+++ b/h-source/Application/Views/Client/license.php
@@ -0,0 +1,25 @@
+<?php if (!defined('EG')) die('Direct access not allowed!'); ?>
+<?php echo "<?xml version='1.0' encoding='UTF-8'?>\n";?>
+<license_info>
+	<?php echo License::getSubmissionNotice();?>
+</license_info>
+
+<?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/Wiki/form.php b/h-source/Application/Views/Wiki/form.php
index b3f7578..5949cf0 100644
--- a/h-source/Application/Views/Wiki/form.php
+++ b/h-source/Application/Views/Wiki/form.php
@@ -63,8 +63,8 @@
 		<?php } ?>
 
 		<div class="top_licence_notice">
-			<div><b>License Informations:</b></div>
-			Any text submitted by you will be put in the Public Domain (see the <a href="http://creativecommons.org/publicdomain/zero/1.0/">CC0 page</a> for detailed information).
+			<div><b><?php echo gtext("License information");?>:</b></div>
+			<?php echo License::getSubmissionNotice();?>
 		</div>
 		
 		<?php echo $notice;?>
diff --git a/h-source/Application/Views/bottom_left.php b/h-source/Application/Views/bottom_left.php
index 62bf77e..545a6ea 100644
--- a/h-source/Application/Views/bottom_left.php
+++ b/h-source/Application/Views/bottom_left.php
@@ -22,7 +22,7 @@
 
 	<?php if (strcmp($this->action,'talk') !== 0) { ?>
 	<div class="bottom_licence_notice">
-		The contents of this page are in the Public Domain. (see the <a href="http://creativecommons.org/publicdomain/zero/1.0/">CC0 page</a> for detailed information). Anyone is free to copy, modify, publish, use, sell, or distribute the text for any purpose, commercial or non-commercial, and by any means.
+		<?php echo License::getBottom();?>
 	</div>
 	<?php } ?>
 	
diff --git a/h-source/Application/Views/license_notice.php b/h-source/Application/Views/license_notice.php
index 6d42465..85f5420 100644
--- a/h-source/Application/Views/license_notice.php
+++ b/h-source/Application/Views/license_notice.php
@@ -21,6 +21,6 @@
 ?>
 
 	<div class="top_licence_notice">
-		<div><b>License Informations:</b></div>
-		Any text submitted by you will be put in the Public Domain (see the <a href="http://creativecommons.org/publicdomain/zero/1.0/">CC0 page</a> for detailed information).
+		<div><b><?php echo gtext("License information");?>:</b></div>
+		<?php echo License::getSubmissionNotice();?>
 	</div>
\ No newline at end of file
diff --git a/h-source/Config/Autoload.php b/h-source/Config/Autoload.php
index 940bb0c..67f32ec 100644
--- a/h-source/Config/Autoload.php
+++ b/h-source/Config/Autoload.php
@@ -19,6 +19,7 @@ class Autoload
 		'hardware.php',
 		'languages.php',
 		'vendors.php',
+		'license.php',
 	);
 
 }
\ No newline at end of file
diff --git a/h-source/Config/Route.php b/h-source/Config/Route.php
index 5cb6195..b7ddf68 100644
--- a/h-source/Config/Route.php
+++ b/h-source/Config/Route.php
@@ -41,7 +41,6 @@ class Route
 		'users,change',
 		'users,forgot',
 		'users,notice',
-		'users,info',
 		'meet,user',
 		'meet,contributions',
 		'meet,hardware',
@@ -164,6 +163,8 @@ class Route
 		'bluetooth,differences',
 		'bluetooth,climb',
 		'bluetooth,talk',
+		'client,licenseinfo',
+		'client,userinfo',
 	);
 	
 	//it can be 'yes' or 'no'