Merge branch 'development' into h-node

9 files changed, 0 insertions, 427 deletions

diff --git a/h-source/Application/Views/Desktop/Meet/contributions.php b/h-source/Application/Views/Desktop/Meet/contributions.php
deleted file mode 100644
index 43f56dd..0000000
--- a/h-source/Application/Views/Desktop/Meet/contributions.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php if (!defined('EG')) die('Direct access not allowed!'); ?>
-
-<?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/>.
-?>
-
-	<div id="left">
-	
-		<div class="position_tree_box">
-			<a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> &raquo; <a href="<?php echo $this->baseUrl."/meet/user/$lang/$meet_username";?>"><?php echo gtext("meet");?> <b><?php echo $meet_username;?></b></a> &raquo; <?php echo gtext("contributions");?>
-		</div>
-		
-		<div class="contrib_explain_box">
-			<?php echo gtext("contributions of");?> <?php echo $meet_username;?>
-		</div>
-		
-		<div class="external_users_contrib">
-		
-			<!--hardware contributions-->
-			<?php if ($hasHardware) { ?>
-			<div class="user_hardware_pages">
-				<a href="<?php echo $this->baseUrl."/meet/hardware/$lang/$meet_username";?>">hardware inserted/updated by <b><?php echo $meet_username;?></b></a>
-			</div>
-			<?php } ?>
-			
-			<!--talk messages submitted (hardware pages)-->
-			<?php if ($hasTalk) { ?>
-			<div class="user_hardware_pages">
-				<a href="<?php echo $this->baseUrl."/meet/talk/$lang/$meet_username".$this->viewStatus;?>">talk messages submitted by <b><?php echo $meet_username;?></b> (hardware pages)</a>
-			</div>
-			<?php } ?>
-			
-			<!--issues opened-->
-			<?php if ($hasIssues) { ?>
-			<div class="user_hardware_pages">
-				<a href="<?php echo $this->baseUrl."/meet/issues/$lang/$meet_username".$this->viewStatus;?>">issues opened by <b><?php echo $meet_username;?></b></a>
-			</div>
-			<?php } ?>
-			
-			<!--messages submitted-->
-			<?php if ($hasMessages) { ?>
-			<div class="user_hardware_pages">
-				<a href="<?php echo $this->baseUrl."/meet/messages/$lang/$meet_username".$this->viewStatus;?>">messages submitted by <b><?php echo $meet_username;?></b></a>
-			</div>
-			<?php } ?>
-
-			<!--messages submitted-->
-			<?php if ($hasWiki) { ?>
-			<div class="user_hardware_pages">
-				<a href="<?php echo $this->baseUrl."/meet/wiki/$lang/$meet_username".$this->viewStatus;?>">wiki pages inserted/updated by <b><?php echo $meet_username;?></b></a>
-			</div>
-			<?php } ?>
-
-			<!--talk messages submitted (wiki pages)-->
-			<?php if ($hasWikiTalk) { ?>
-			<div class="user_hardware_pages">
-				<a href="<?php echo $this->baseUrl."/meet/wikitalk/$lang/$meet_username".$this->viewStatus;?>">talk messages submitted by <b><?php echo $meet_username;?></b> (wiki pages)</a>
-			</div>
-			<?php } ?>
-			
-		</div>
-	
-	</div>
\ No newline at end of file
diff --git a/h-source/Application/Views/Desktop/Meet/hardware.php b/h-source/Application/Views/Desktop/Meet/hardware.php
deleted file mode 100644
index b0fdfa1..0000000
--- a/h-source/Application/Views/Desktop/Meet/hardware.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php if (!defined('EG')) die('Direct access not allowed!'); ?>
-
-<?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/>.
-?>
-
-	<?php
-
-	$name = $item['hardware']['model'];
-	$type = $item['hardware']['type'];
-	$id_hard = $item['hardware']['id_hard'];
-
-	?>
-	<?php echo $type;?>	<a href="<?php echo $this->baseUrl."/".Hardware::getControllerFromType($type)."/view/$lang/$id_hard/".encodeUrl($name);?>"><?php echo $name;?></a>
\ No newline at end of file
diff --git a/h-source/Application/Views/Desktop/Meet/issues.php b/h-source/Application/Views/Desktop/Meet/issues.php
deleted file mode 100644
index 2e88d5f..0000000
--- a/h-source/Application/Views/Desktop/Meet/issues.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php if (!defined('EG')) die('Direct access not allowed!'); ?>
-
-<?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/>.
-?>
-
-	<?php
-
-	$i_date = $item['issues']['creation_date'];
-	$i_title = $item['issues']['title'];
-	$i_id = $item['issues']['id_issue'];
-
-	?>
-
-	<?php echo "<a href='".$this->baseUrl."/issues/view/$lang/$i_id'>".$i_title."</a> at ".smartDate($i_date);?>
\ No newline at end of file
diff --git a/h-source/Application/Views/Desktop/Meet/list_template.php b/h-source/Application/Views/Desktop/Meet/list_template.php
deleted file mode 100644
index 2c2f6d3..0000000
--- a/h-source/Application/Views/Desktop/Meet/list_template.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php if (!defined('EG')) die('Direct access not allowed!'); ?>
-
-<?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/>.
-?>
-
-	<div id="left">
-	
-		<div class="position_tree_box">
-			<a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> &raquo; <a href="<?php echo $this->baseUrl."/meet/user/$lang/$meet_username";?>">meet <b><?php echo $meet_username;?></b></a> &raquo; <a href="<?php echo $this->baseUrl."/meet/contributions/$lang/$meet_username";?>">contributions</a> &raquo; <?php echo $tree_last_string;?>
-		</div>
-		
-		<div class="contrib_explain_box">
-			<?php echo $page_explanation_title;?> <?php echo $meet_username;?>
-		</div>
-		
-		<div class="external_users_contrib">
-			<?php foreach ($table as $item) {?>
-			<div class="users_contrib_item">
-
-				<div class="contribution_item">
-					<?php include(ROOT . '/Application/Views/' .$subfolder. "/Meet/".$this->action.".php");?>
-				</div>
-				
-			</div>
-			<?php } ?>
-		</div>
-
-		<?php if (strcmp($this->action,'hardware') !== 0) {?>
-		<div class="history_page_list">
-			<?php echo gtext("page list");?>: <?php echo $pageList;?>
-		</div>
-		<?php } ?>
-	</div>
\ No newline at end of file
diff --git a/h-source/Application/Views/Desktop/Meet/meet.php b/h-source/Application/Views/Desktop/Meet/meet.php
deleted file mode 100644
index f0e31b3..0000000
--- a/h-source/Application/Views/Desktop/Meet/meet.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php if (!defined('EG')) die('Direct access not allowed!'); ?>
-
-<?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/>.
-?>
-
-	<div id="left">
-	
-		<div class="position_tree_box">
-			<a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> &raquo; <?php echo gtext("meet");?> <b><?php echo $meet_username;?></b>
-		</div>
-		
-		<?php if ($isadmin) { ?>
-		<div class="moderator_box">
-			<?php if ($isBlocked) { ?>
-				This user has been blocked
-				
-				<a id="<?php echo $meet_id_user;?>" class="unblock_user block_general" href="<?php echo $this->baseUrl."/home/index/$lang";?>"><img src="<?php echo $this->baseUrl;?>/Public/Img/H2O/im-user.png">unblock the user</a>
-				
-			<?php } else {	?>
-			
-				<a id="<?php echo $meet_id_user;?>" class="block_user block_general" href="<?php echo $this->baseUrl."/home/index/$lang";?>"><img src="<?php echo $this->baseUrl;?>/Public/Img/H2O/im-ban-user.png">block the user</a>
-				
-			<?php } ?>
-			
-			<!--view details-->
-			<div class="show_hidden_box_ext">
-				<div class="md_type">user</div>
-				<a id="<?php echo $meet_id_user;?>" class="hidden_message_view_details" href="<?php echo $this->baseUrl."/home/index/$lang";?>">view details</a>
-				<div class="moderation_details_box"></div>
-			</div>
-			
-		</div>
-		<?php } ?>
-		
-		<div class="meet_contrib_link">
-			<u><?php echo gtext("Public profile of");?> <?php echo $meet_username;?></u>. <?php echo gtext("See all the contributions of");?> <a href="<?php echo $this->baseUrl."/meet/contributions/$lang/$meet_username";?>"> <b><?php echo $meet_username;?></b></a>
-		</div>
-	
-		<?php foreach ($table as $item) {?>
-		<div class="users_meet_box">
-
-			<div class="meet_item">
-				<div class="meet_item_inner">Username:</div> <?php echo $item['regusers']['username'];?>
-			</div>
-			
-			<?php if (strcmp($item['profile']['website'],'') !== 0) { ?>
-			<div class="meet_item">
-				<div class="meet_item_inner"><?php echo gtext("My website");?>:</div> <?php echo vitalizeUrl($item['profile']['website']);?>
-			</div>
-			<?php } ?>
-			
-			<?php if (strcmp($item['profile']['real_name'],'') !== 0) { ?>
-			<div class="meet_item">
-				<div class="meet_item_inner"><?php echo gtext("My real name");?>:</div> <?php echo $item['profile']['real_name'];?>
-			</div>
-			<?php } ?>
-
-			<?php if (strcmp($item['profile']['publish_mail'],'yes') === 0) { ?>
-			<div class="meet_item">
-				<div class="meet_item_inner"><?php echo gtext("My e-mail address");?>:</div> <?php echo $item['regusers']['e_mail'];?>
-			</div>
-			<?php } ?>
-			
-			<?php if (strcmp($item['profile']['where_you_are'],'') !== 0) { ?>
-			<div class="meet_item">
-				<div class="meet_item_inner"><?php echo gtext("I'm from");?>:</div> <?php echo $item['profile']['where_you_are'];?>
-			</div>
-			<?php } ?>
-			
-			<?php if (strcmp($item['profile']['birth_date'],'') !== 0) { ?>
-			<div class="meet_item">
-				<div class="meet_item_inner"><?php echo gtext("Birthdate");?>:</div> <?php echo $item['profile']['birth_date'];?>
-			</div>
-			<?php } ?>
-
-			<?php if (strcmp($item['profile']['fav_distro'],'') !== 0) { ?>
-			<div class="meet_item">
-				<div class="meet_item_inner"><?php echo gtext("My favourite distribution");?>:</div> <?php echo $item['profile']['fav_distro'];?>
-			</div>
-			<?php } ?>
-
-			<?php if (strcmp($item['profile']['projects'],'') !== 0) { ?>
-			<div class="meet_item">
-				<div class="meet_item_inner"><?php echo gtext("Free software projects I'm working on");?>:</div> <div><?php echo nl2br($item['profile']['projects']);?></div>
-			</div>
-			<?php } ?>
-			
-			<?php if (strcmp($item['profile']['description'],'') !== 0) { ?>
-			<div class="meet_item">
-				<div class="meet_item_inner"><?php echo gtext("My description");?>:</div> <div><?php echo nl2br($item['profile']['description']);?></div>
-			</div>
-			<?php } ?>
-			
-		</div>
-		<?php } ?>
-	
-	</div>
\ No newline at end of file
diff --git a/h-source/Application/Views/Desktop/Meet/messages.php b/h-source/Application/Views/Desktop/Meet/messages.php
deleted file mode 100644
index f85686b..0000000
--- a/h-source/Application/Views/Desktop/Meet/messages.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php if (!defined('EG')) die('Direct access not allowed!'); ?>
-
-<?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/>.
-?>
-
-	<?php
-
-	$m_date = $item['messages']['creation_date'];
-	$m_id = $item['messages']['id_mes'];
-	$i_id = $item['messages']['id_issue'];
-
-	?>
-
-	<?php echo "<a href='".$this->baseUrl."/issues/view/$lang/$i_id#message-$m_id'>".smartDate($m_date)."</a>";?> submitted to the issue <b><?php echo $item['issues']['title'];?></b>
\ No newline at end of file
diff --git a/h-source/Application/Views/Desktop/Meet/talk.php b/h-source/Application/Views/Desktop/Meet/talk.php
deleted file mode 100644
index 9ddc5b3..0000000
--- a/h-source/Application/Views/Desktop/Meet/talk.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php if (!defined('EG')) die('Direct access not allowed!'); ?>
-
-<?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/>.
-?>
-
-	<?php
-
-	$t_date = $item['talk']['creation_date'];
-	$t_title = $item['talk']['title'];
-	$t_id = $item['talk']['id_hard'];
-	$t_id_talk = $item['talk']['id_talk'];
-	$controller = Hardware::getControllerFromType($item['hardware']['type']);
-	?>
-
-	<?php echo "<a href='".$this->baseUrl."/$controller/talk/$lang/$t_id#talk-$t_id_talk'>".$t_title."</a> at ".smartDate($t_date);?>
\ No newline at end of file
diff --git a/h-source/Application/Views/Desktop/Meet/wiki.php b/h-source/Application/Views/Desktop/Meet/wiki.php
deleted file mode 100644
index 1ec339e..0000000
--- a/h-source/Application/Views/Desktop/Meet/wiki.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php if (!defined('EG')) die('Direct access not allowed!'); ?>
-
-<?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/>.
-?>
-
-	<?php
-
-	$name = $item['wiki']['title'];
-	$id_wiki = $item['wiki']['id_wiki'];
-
-	?>
-	<a href="<?php echo $this->baseUrl."/wiki/page/$lang/".encodeUrl($name);?>"><?php echo $name;?></a>
\ No newline at end of file
diff --git a/h-source/Application/Views/Desktop/Meet/wikitalk.php b/h-source/Application/Views/Desktop/Meet/wikitalk.php
deleted file mode 100644
index 351960d..0000000
--- a/h-source/Application/Views/Desktop/Meet/wikitalk.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php if (!defined('EG')) die('Direct access not allowed!'); ?>
-
-<?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/>.
-?>
-
-	<?php
-
-	$t_date = $item['wiki_talk']['creation_date'];
-	$t_title = $item['wiki_talk']['title'];
-	$t_id = $item['wiki_talk']['id_wiki'];
-	$t_id_talk = $item['wiki_talk']['id_talk'];
-	?>
-
-	<?php echo "<a href='".$this->baseUrl."/wiki/talk/$lang/$t_id#wiki-talk-$t_id_talk'>".$t_title."</a> at ".smartDate($t_date);?>
\ No newline at end of file