improved wiki

7 files changed, 206 insertions, 189 deletions

diff --git a/h-source/Application/Views/Videocards/catalogue.php b/h-source/Application/Views/Videocards/catalogue.php
index ff9b7fd..3f77e15 100644
--- a/h-source/Application/Views/Videocards/catalogue.php
+++ b/h-source/Application/Views/Videocards/catalogue.php
@@ -50,7 +50,7 @@
 
 			<div class="notebook_vendor">
 				<div class="inner_label"><?php echo gtext("vendor");?>:</div>
-				<div class="inner_value"><?php echo $item['hardware']['vendor'];?></div>
+				<div class="inner_value"><?php echo betterVendor($item['hardware']['vendor']);?></div>
 			</div>
 			
 			<div class="notebook_vendor">
diff --git a/h-source/Application/Views/Videocards/page.php b/h-source/Application/Views/Videocards/page.php
index 68612ad..a9a9b3d 100644
--- a/h-source/Application/Views/Videocards/page.php
+++ b/h-source/Application/Views/Videocards/page.php
@@ -45,7 +45,7 @@
 
 			<div class="notebook_vendor">
 				<div class="inner_label"><?php echo gtext("vendor");?>:</div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['vendor'];?></b></div>
+				<div class="inner_value"><b><?php echo betterVendor($item[$tableName]['vendor']);?></b></div>
 			</div>
 			
 			<div class="notebook_vendor">
diff --git a/h-source/Application/Views/Wiki/climb.php b/h-source/Application/Views/Wiki/climb.php
index bd502d1..c648e7f 100644
--- a/h-source/Application/Views/Wiki/climb.php
+++ b/h-source/Application/Views/Wiki/climb.php
@@ -21,30 +21,32 @@
 ?>
 	<div id="left">
 
-		<div class="position_tree_box">
-			<a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> &raquo; <?php echo $tree;?>
-		</div>
-
-		<div class="notebook_view_title">
-			<?php echo gtext('Make this revision the current revision of the page'); ?> <b><?php echo $tree_name;?></b>
-		</div>
-			
-		<div class="notebook_insert_link">
-			<a title="Back to the history of the page <?php echo $tree_name;?>" href="<?php echo $this->baseUrl."/".$this->controller."/history/$lang/".$id_wiki.$this->viewStatus;?>"><img class="top_left_images" src="<?php echo $this->baseUrl;?>/Public/Img/back-60.png"></a>
-		</div>
+		<?php if (!$isDeleted) { ?>
 		
-		<div class="wiki_external_box">
+			<div class="position_tree_box">
+				<a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> &raquo; <?php echo $tree;?>
+			</div>
 
-			<?php echo $notice;?>
+			<div class="notebook_view_title">
+				<?php echo gtext('Make this revision the current revision of the page'); ?> <b><?php echo $tree_name;?></b>
+			</div>
 
-			<div class="climb_form_ext_box">
+			<div class="notebook_insert_link">
+				<a title="Back to the history of the page <?php echo $tree_name;?>" href="<?php echo $this->baseUrl."/".$this->controller."/history/$lang/".$id_wiki.$this->viewStatus;?>"><img class="top_left_images" src="<?php echo $this->baseUrl;?>/Public/Img/back-60.png"></a>
+			</div>
 
-				<?php if (strcmp($isDeleted,'no') === 0 ) { ?>
-				<form action="<?php echo $this->currPage."/$lang/$id_rev"; ?>" method="POST">
-					<?php echo gtext('I want to make this revision the current revision');?>: <input type="submit" name="confirmAction" value="<?php echo gtext('Confirm');?>">
-				</form>
-				<?php } ?>
+			<div class="wiki_external_box">
 
-			</div>
+				<?php echo $notice;?>
 
-		</div>
\ No newline at end of file
+				<div class="climb_form_ext_box">
+
+					<form action="<?php echo $this->currPage."/$lang/$id_rev"; ?>" method="POST">
+						<?php echo gtext('I want to make this revision the current revision');?>: <input type="submit" name="confirmAction" value="<?php echo gtext('Confirm');?>">
+					</form>
+
+				</div>
+
+			</div>
+			
+		<?php } ?>
\ No newline at end of file
diff --git a/h-source/Application/Views/Wiki/differences.php b/h-source/Application/Views/Wiki/differences.php
index 1709cbf..ee7a795 100644
--- a/h-source/Application/Views/Wiki/differences.php
+++ b/h-source/Application/Views/Wiki/differences.php
@@ -21,41 +21,44 @@
 ?>
 
 	<div id="left">
-	
-		<div class="position_tree_box">
-			<a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> &raquo; <?php echo $tree;?>
-		</div>
-
-		<?php if ($showDiff === true) { ?>
-		<div class="notebook_view_title">
-			Differences between the revision of <b><?php echo smartDate($update_new);?></b>, created by <b><?php echo getLinkToUser($u->getUser($created_by));?></b>, and the revision of <b><?php echo smartDate($update_old);?></b>
-		</div>
-		<?php } ?>
-			
-		<div class="notebook_insert_link">
-			<a title="Back to the history of the page <?php echo $tree_name;?>" href="<?php echo $this->baseUrl."/".$this->controller."/history/$lang/".$id_wiki.$this->viewStatus;?>"><img class="top_left_images" src="<?php echo $this->baseUrl;?>/Public/Img/back-60.png"></a>
-		</div>
+
+		<?php if (!$isDeleted) { ?>
 		
-		<div class="wiki_external_box">
+			<div class="position_tree_box">
+				<a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> &raquo; <?php echo $tree;?>
+			</div>
 
-			<div class="diff_color_notice">
-				<b>Notice</b>: the text in <del>red</del> has been deleted from the previous revision, the text in <ins>green</ins> has been added in this revision and the text in <span class="gray_text_notice">gray</span> has not been changed.
+			<?php if ($showDiff === true) { ?>
+			<div class="notebook_view_title">
+				Differences between the revision of <b><?php echo smartDate($update_new);?></b>, created by <b><?php echo getLinkToUser($u->getUser($created_by));?></b>, and the revision of <b><?php echo smartDate($update_old);?></b>
 			</div>
+			<?php } ?>
 
-			<?php foreach ($diffArray as $label => $text) { ?>
+			<div class="notebook_insert_link">
+				<a title="Back to the history of the page <?php echo $tree_name;?>" href="<?php echo $this->baseUrl."/".$this->controller."/history/$lang/".$id_wiki.$this->viewStatus;?>"><img class="top_left_images" src="<?php echo $this->baseUrl;?>/Public/Img/back-60.png"></a>
+			</div>
 
-			<div class="diff_ext_box">
+			<div class="wiki_external_box">
 
-				<div class="diff_item_label">
-					<?php echo gtext("differences in the entry");?>: <b><?php echo $label;?></b>
+				<div class="diff_color_notice">
+					<b>Notice</b>: the text in <del>red</del> has been deleted from the previous revision, the text in <ins>green</ins> has been added in this revision and the text in <span class="gray_text_notice">gray</span> has not been changed.
 				</div>
 
-				<div class="diff_item_text">
-					<?php echo in_array($label,$fieldsWithBreaks) ? nl2br($text) : $text;?>
-				</div>
+				<?php foreach ($diffArray as $label => $text) { ?>
 
-			</div>
+				<div class="diff_ext_box">
 
-			<?php } ?>
+					<div class="diff_item_label">
+						<?php echo gtext("differences in the entry");?>: <b><?php echo $label;?></b>
+					</div>
+
+					<div class="diff_item_text">
+						<?php echo in_array($label,$fieldsWithBreaks) ? nl2br($text) : $text;?>
+					</div>
+
+				</div>
 
-		</div>
+				<?php } ?>
+
+			</div>
+		<?php } ?>
diff --git a/h-source/Application/Views/Wiki/history.php b/h-source/Application/Views/Wiki/history.php
index ec394f4..b2e2ab5 100644
--- a/h-source/Application/Views/Wiki/history.php
+++ b/h-source/Application/Views/Wiki/history.php
@@ -22,49 +22,53 @@
 
 	<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."/wiki/page/$lang";?>">Wiki</a> &raquo; <a href="<?php echo $this->baseUrl."/wiki/page/$lang/".encodeUrl($tree_name);?>"><?php echo $tree_name;?></a> &raquo; <?php echo gtext('History');?>
-		</div>
-
-		<div class="notebook_view_title">
-			<?php echo gtext('History of the wiki page'); ?> <b><?php echo $tree_name;?></b>
-		</div>
-			
-		<div class="notebook_insert_link">
-			<a title="Back to the page <?php echo $tree_name;?>" href="<?php echo $this->baseUrl."/".$this->controller."/page/$lang/".encodeUrl($tree_name);?>"><img class="top_left_images" src="<?php echo $this->baseUrl;?>/Public/Img/back-60.png"></a>
-		</div>
+		<?php if (!$isDeleted) { ?>
 		
-		<div class="wiki_external_box">
-			
-			<ul class="page_history">
-
-				<?php if ($this->viewArgs['page'] === 1) { ?>
-				<?php foreach ($rev1 as $rev) { ?>
-				<li class="page_history_current_item"><b><?php echo gtext("Current revision");?>:</b> <?php echo smartDate($rev['wiki']['update_date']);?> by <?php echo $u->getLinkToUserFromId($rev['wiki']['created_by']);?> (<a href="<?php echo $this->baseUrl."/".$this->controller."/differences/$lang/$id/0".$this->viewStatus;?>">diff</a>)</li>
-				<?php } ?>
-				<?php } ?>
-				
-				<?php foreach ($rev2 as $rev) { ?>
-				<li class="page_history_item">
-				
-					<a href="<?php echo $this->baseUrl."/".$this->controller."/revision/$lang/".$rev['wiki_revisions']['id_rev'].$this->viewStatus;?>"><?php echo smartDate($rev['wiki_revisions']['update_date']);?></a> by <?php echo $u->getLinkToUserFromId($rev['wiki_revisions']['created_by']);?>
-				
-					<?php if (strcmp($rev['wiki_revisions']['id_rev'],$firstRev) !== 0) {?>
-					(<a href="<?php echo $this->baseUrl."/".$this->controller."/differences/$lang/$id/".$rev['wiki_revisions']['id_rev'].$this->viewStatus;?>">diff</a>)
+			<div class="position_tree_box">
+				<a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> &raquo; <a href="<?php echo $this->baseUrl."/wiki/page/$lang";?>">Wiki</a> &raquo; <a href="<?php echo $this->baseUrl."/wiki/page/$lang/".encodeUrl($tree_name);?>"><?php echo $tree_name;?></a> &raquo; <?php echo gtext('History');?>
+			</div>
+
+			<div class="notebook_view_title">
+				<?php echo gtext('History of the wiki page'); ?> <b><?php echo $tree_name;?></b>
+			</div>
+
+			<div class="notebook_insert_link">
+				<a title="Back to the page <?php echo $tree_name;?>" href="<?php echo $this->baseUrl."/".$this->controller."/page/$lang/".encodeUrl($tree_name);?>"><img class="top_left_images" src="<?php echo $this->baseUrl;?>/Public/Img/back-60.png"></a>
+			</div>
+
+			<div class="wiki_external_box">
+
+				<ul class="page_history">
+
+					<?php if ($this->viewArgs['page'] === 1) { ?>
+					<?php foreach ($rev1 as $rev) { ?>
+					<li class="page_history_current_item"><b><?php echo gtext("Current revision");?>:</b> <?php echo smartDate($rev['wiki']['update_date']);?> by <?php echo $u->getLinkToUserFromId($rev['wiki']['created_by']);?> (<a href="<?php echo $this->baseUrl."/".$this->controller."/differences/$lang/$id/0".$this->viewStatus;?>">diff</a>)</li>
+					<?php } ?>
 					<?php } ?>
-					
-					<?php if ($islogged === 'yes' and !$isBlocked) { ?>
-					(<a href="<?php echo $this->baseUrl.'/'.$this->controller.'/climb/'.$lang.'/'.$rev['wiki_revisions']['id_rev'].$this->viewStatus;?>"><?php echo gtext('Make current'); ?></a>)
+
+					<?php foreach ($rev2 as $rev) { ?>
+					<li class="page_history_item">
+
+						<a href="<?php echo $this->baseUrl."/".$this->controller."/revision/$lang/".$rev['wiki_revisions']['id_rev'].$this->viewStatus;?>"><?php echo smartDate($rev['wiki_revisions']['update_date']);?></a> by <?php echo $u->getLinkToUserFromId($rev['wiki_revisions']['created_by']);?>
+
+						<?php if (strcmp($rev['wiki_revisions']['id_rev'],$firstRev) !== 0) {?>
+						(<a href="<?php echo $this->baseUrl."/".$this->controller."/differences/$lang/$id/".$rev['wiki_revisions']['id_rev'].$this->viewStatus;?>">diff</a>)
+						<?php } ?>
+
+						<?php if ($islogged === 'yes' and !$isBlocked) { ?>
+						(<a href="<?php echo $this->baseUrl.'/'.$this->controller.'/climb/'.$lang.'/'.$rev['wiki_revisions']['id_rev'].$this->viewStatus;?>"><?php echo gtext('Make current'); ?></a>)
+						<?php } ?>
+
+					</li>
 					<?php } ?>
-				
-				</li>
-				<?php } ?>
-				
-			</ul>
+
+				</ul>
+
+			</div>
+
+			<div class="history_page_list">
+				<?php echo gtext("page list");?>: <?php echo $pageList;?>
+			</div>
 			
-		</div>
-		
-		<div class="history_page_list">
-			<?php echo gtext("page list");?>: <?php echo $pageList;?>
-		</div>
+		<?php } ?>
 
diff --git a/h-source/Application/Views/Wiki/page.php b/h-source/Application/Views/Wiki/page.php
index d386704..1580d67 100644
--- a/h-source/Application/Views/Wiki/page.php
+++ b/h-source/Application/Views/Wiki/page.php
@@ -57,16 +57,18 @@
 			<div class="view_page_back_button">
 				<a title="Insert a new wiki page" href="<?php echo $this->baseUrl."/".$this->controller."/insert/$lang";?>"><img class="top_left_images" src="<?php echo $this->baseUrl;?>/Public/Img/new-60.png"></a>
 			</div>
-			
-			<div class="view_page_history_button">
-				<a title="talk page" href="<?php echo $this->baseUrl."/".$this->controller."/talk/$lang/$id_wiki";?>"><img class="top_left_note_image" src="<?php echo $this->baseUrl;?>/Public/Img/talk-60.png"></a>
-			</div>
 
-			<div class="view_page_history_button">
-				<a title="history page" href="<?php echo $this->baseUrl."/".$this->controller."/history/$lang/$id_wiki";?>"><img class="top_left_note_image" src="<?php echo $this->baseUrl;?>/Public/Img/history-60.png"></a>
-			</div>
+			<?php if (!$isDeleted) { ?>
+				<div class="view_page_history_button">
+					<a title="talk page" href="<?php echo $this->baseUrl."/".$this->controller."/talk/$lang/$id_wiki";?>"><img class="top_left_note_image" src="<?php echo $this->baseUrl;?>/Public/Img/talk-60.png"></a>
+				</div>
+
+				<div class="view_page_history_button">
+					<a title="history page" href="<?php echo $this->baseUrl."/".$this->controller."/history/$lang/$id_wiki";?>"><img class="top_left_note_image" src="<?php echo $this->baseUrl;?>/Public/Img/history-60.png"></a>
+				</div>
+			<?php } ?>
 
-			<?php if (strcmp($isDeleted,'no') === 0 and !$isBlocked) { ?>
+			<?php if (!$isDeleted and !$isBlocked) { ?>
 			<div class="view_page_update_button">
 				<form action="<?php echo $this->baseUrl."/".$this->controller."/update/$lang";?>" method="POST">
 					<input title="edit page" class="update_submit_class" type="image" src="<?php echo $this->baseUrl;?>/Public/Img/edit-60.png" value="xedit">
@@ -76,10 +78,12 @@
 			<?php } ?>
 		</div>
 
-		<div class="talk_numb_ext_wiki">
-			<a href="<?php echo $this->baseUrl."/".$this->controller."/talk/$lang/$id_wiki";?>">talk messages: <?php echo $talk_number;?></a>
-		</div>
-
+		<?php if (!$isDeleted) { ?>
+			<div class="talk_numb_ext_wiki">
+				<a href="<?php echo $this->baseUrl."/".$this->controller."/talk/$lang/$id_wiki";?>">talk messages: <?php echo $talk_number;?></a>
+			</div>
+		<?php } ?>
+		
 		<?php } else if ( strcmp($this->action,'revision') === 0 ) { ?>
 
 		<div class="position_tree_box">
@@ -98,15 +102,15 @@
 
 		<div class="wiki_external_box">
 
-			<?php if ( strcmp($isDeleted,'yes') === 0 ) { ?>
+			<?php if ( $isDeleted ) { ?>
 
 				<div class="revision_alert">
-					<?php echo gtext('This wiki page has been hidden'); ?>
+					<?php echo gtext('This wiki page has been deleted'); ?>
 				</div>
 
 			<?php } ?>
 			
-			<?php if ( strcmp($isDeleted,'no') === 0) { ?>
+			<?php if (!$isDeleted) { ?>
 			
 				<!--if revision-->
 				<?php if (strcmp($this->action,'revision') === 0) { ?>
diff --git a/h-source/Application/Views/Wiki/talk.php b/h-source/Application/Views/Wiki/talk.php
index 724b273..3e26527 100644
--- a/h-source/Application/Views/Wiki/talk.php
+++ b/h-source/Application/Views/Wiki/talk.php
@@ -44,126 +44,130 @@
 			<a title="Back to the page <?php echo $tree_name;?>" href="<?php echo $this->baseUrl."/".$this->controller."/page/$lang/".encodeUrl($tree_name);?>"><img class="top_left_images" src="<?php echo $this->baseUrl;?>/Public/Img/back-60.png"></a>
 		</div>
 
-		<?php if (!$isBlocked) { ?>
-		
-			<div class="wiki_external_box">
+		<?php if (!$isDeleted) { ?>
+			<?php if (!$isBlocked) { ?>
 
-				<?php foreach ($table as $message) { ?>
+				<div class="wiki_external_box">
 
-					<?php if (strcmp($message['wiki_talk']['deleted'],'no') === 0) { ?>
+					<?php foreach ($table as $message) { ?>
 
-						<a name="wiki-talk-<?php echo $message['wiki_talk']['id_talk'];?>"></a>
-						<div class="talk_message_item">
+						<?php if (strcmp($message['wiki_talk']['deleted'],'no') === 0) { ?>
 
-							<div class="talk_message_item_title_date">
-								<?php if ($ismoderator) { ?>
-									<a id="<?php echo $message['wiki_talk']['id_talk'];?>" class="hide_wiki_talk hide_general" href="<?php echo $this->baseUrl."/home/index/$lang";?>"><img src="<?php echo $this->baseUrl;?>/Public/Img/Crystal/button_cancel.png">hide</a>
-								<?php } ?>
+							<a name="wiki-talk-<?php echo $message['wiki_talk']['id_talk'];?>"></a>
+							<div class="talk_message_item">
+
+								<div class="talk_message_item_title_date">
+									<?php if ($ismoderator) { ?>
+										<a id="<?php echo $message['wiki_talk']['id_talk'];?>" class="hide_wiki_talk hide_general" href="<?php echo $this->baseUrl."/home/index/$lang";?>"><img src="<?php echo $this->baseUrl;?>/Public/Img/Crystal/button_cancel.png">hide</a>
+									<?php } ?>
+
+									<div class="talk_message_item_title">
+										<?php echo $message['wiki_talk']['title'];?>
+									</div>
 
-								<div class="talk_message_item_title">
-									<?php echo $message['wiki_talk']['title'];?>
+									<div class="talk_message_item_date">
+										by <?php echo getLinkToUser($u->getUser($message['wiki_talk']['created_by']));?>, <?php echo smartDate($message['wiki_talk']['creation_date']);?>
+									</div>
 								</div>
 
-								<div class="talk_message_item_date">
-									by <?php echo getLinkToUser($u->getUser($message['wiki_talk']['created_by']));?>, <?php echo smartDate($message['wiki_talk']['creation_date']);?>
+								<div class="talk_message_item_content">
+									<?php echo decodeWikiText($message['wiki_talk']['message']);?>
 								</div>
-							</div>
 
-							<div class="talk_message_item_content">
-								<?php echo decodeWikiText($message['wiki_talk']['message']);?>
-							</div>
+								<?php if ($ismoderator) { ?>
+								<!--view details-->
+								<div class="show_hidden_box_ext">
+									<div class="md_type">wiki_talk</div>
+									<a id="<?php echo $message['wiki_talk']['id_talk'];?>" class="hidden_message_view_details" href="<?php echo $this->baseUrl."/home/index/$lang";?>">view details</a>
+									<div class="moderation_details_box"></div>
+								</div>
+							<?php } ?>
 
-							<?php if ($ismoderator) { ?>
-							<!--view details-->
-							<div class="show_hidden_box_ext">
-								<div class="md_type">wiki_talk</div>
-								<a id="<?php echo $message['wiki_talk']['id_talk'];?>" class="hidden_message_view_details" href="<?php echo $this->baseUrl."/home/index/$lang";?>">view details</a>
-								<div class="moderation_details_box"></div>
 							</div>
-						<?php } ?>
-
-						</div>
-
-					<?php } else { ?>
-
-						<?php if ($ismoderator) { ?>
-							<a name="wiki-talk-<?php echo $message['wiki_talk']['id_talk'];?>"></a>
-							<div class="talk_message_item_hidden">
-								this message has been deleted
 
-									<a id="<?php echo $message['wiki_talk']['id_talk'];?>" class="show_wiki_talk hide_general" href="<?php echo $this->baseUrl."/home/index/$lang";?>"><img src="<?php echo $this->baseUrl;?>/Public/Img/Crystal/button_ok.png">make visible</a>
+						<?php } else { ?>
 
-									<!--view details-->
-									<div class="show_hidden_box_ext">
-										<div class="md_type">wiki_talk</div>
-
-										<a id="<?php echo $message['wiki_talk']['id_talk'];?>" class="hidden_message_view_details" href="<?php echo $this->baseUrl."/home/index/$lang";?>">view details</a>
-
-										<div class="details_of_hidden_message">
-											<div class="details_of_hidden_message_inner">
-												<div class="talk_message_item_date">
-													submitted by <?php echo getLinkToUser($u->getUser($message['wiki_talk']['created_by']));?>, <?php echo smartDate($message['wiki_talk']['creation_date']);?>
-												</div>
-												<div class="message_view_description_hidden">
-													<?php echo decodeWikiText($message['wiki_talk']['message']);?>
+							<?php if ($ismoderator) { ?>
+								<a name="wiki-talk-<?php echo $message['wiki_talk']['id_talk'];?>"></a>
+								<div class="talk_message_item_hidden">
+									this message has been deleted
+
+										<a id="<?php echo $message['wiki_talk']['id_talk'];?>" class="show_wiki_talk hide_general" href="<?php echo $this->baseUrl."/home/index/$lang";?>"><img src="<?php echo $this->baseUrl;?>/Public/Img/Crystal/button_ok.png">make visible</a>
+
+										<!--view details-->
+										<div class="show_hidden_box_ext">
+											<div class="md_type">wiki_talk</div>
+
+											<a id="<?php echo $message['wiki_talk']['id_talk'];?>" class="hidden_message_view_details" href="<?php echo $this->baseUrl."/home/index/$lang";?>">view details</a>
+
+											<div class="details_of_hidden_message">
+												<div class="details_of_hidden_message_inner">
+													<div class="talk_message_item_date">
+														submitted by <?php echo getLinkToUser($u->getUser($message['wiki_talk']['created_by']));?>, <?php echo smartDate($message['wiki_talk']['creation_date']);?>
+													</div>
+													<div class="message_view_description_hidden">
+														<?php echo decodeWikiText($message['wiki_talk']['message']);?>
+													</div>
 												</div>
+												<div class="moderation_details_box"></div>
 											</div>
-											<div class="moderation_details_box"></div>
 										</div>
-									</div>
 
 
-							</div>
+								</div>
+							<?php } ?>
+
 						<?php } ?>
 
 					<?php } ?>
+				</div>
 
-				<?php } ?>
-			</div>
+				<?php if ($islogged === 'yes') { ?>
 
-			<?php if ($islogged === 'yes') { ?>
+					<div class="talk_form_external_box">
+						<div class="talk_login_notice">
+							<a name="form">Add a message</a>
+						</div>
 
-				<div class="talk_form_external_box">
-					<div class="talk_login_notice">
-						<a name="form">Add a message</a>
-					</div>
+						<?php echo $notice;?>
 
-					<?php echo $notice;?>
+						<div class="notebooks_insert_form">
+							<form action="<?php echo $this->baseUrl."/".$this->controller."/talk/$lang/$id_wiki";?>#form" method="POST">
 
-					<div class="notebooks_insert_form">
-						<form action="<?php echo $this->baseUrl."/".$this->controller."/talk/$lang/$id_wiki";?>#form" method="POST">
+								<div class="edit_form">
 
-							<div class="edit_form">
+									<div class="form_entry">
+										<div class="entry_label">Title:</div>
+										<?php echo Html_Form::input('title',$values['title'],'talk_input_entry');?>
+									</div>
 
-								<div class="form_entry">
-									<div class="entry_label">Title:</div>
-									<?php echo Html_Form::input('title',$values['title'],'talk_input_entry');?>
-								</div>
+									<div class="form_entry">
+										<div class="entry_label">Message:</div>
+										<?php echo Html_Form::textarea('message',$values['message'],'talk_textarea_entry','bb_code');?>
+									</div>
+
+									<input type="submit" name="insertAction" value="Save">
 
-								<div class="form_entry">
-									<div class="entry_label">Message:</div>
-									<?php echo Html_Form::textarea('message',$values['message'],'talk_textarea_entry','bb_code');?>
 								</div>
 
-								<input type="submit" name="insertAction" value="Save">
+							</form>
+						</div>
+					</div>
 
-							</div>
+				<?php } else { ?>
 
-						</form>
+					<div class="talk_login_notice">
+						<a name="form"><?php echo gtext("You have to");?> <a href="<?php echo $this->baseUrl."/users/login/$lang?redirect=".$currPos.$queryString;?>">login</a> <?php echo gtext("in order to add a message");?></a>
 					</div>
-				</div>
 
-			<?php } else { ?>
+				<?php } ?>
 
-				<div class="talk_login_notice">
-					<a name="form"><?php echo gtext("You have to");?> <a href="<?php echo $this->baseUrl."/users/login/$lang?redirect=".$currPos.$queryString;?>">login</a> <?php echo gtext("in order to add a message");?></a>
+			<?php } else { ?>
+				<!--is blocked-->
+				<div class="wiki_external_box">
+					<?php echo gtext('This wiki page has been blocked'); ?>
 				</div>
-
 			<?php } ?>
-
-		<?php } else { ?>
-			<div class="wiki_external_box">
-				<?php echo gtext('This wiki page has been blocked'); ?>
-			</div>
+			<!--close deleted-->
 		<?php } ?>
 	</div>
\ No newline at end of file