Index: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG	(revision 941)
+++ trunk/CHANGELOG	(revision 942)
@@ -11,6 +11,11 @@
 ! = Update/Change
 
 ------------------------------------- 2.8.0 -------------------------------------
+21-Feb-2009 Christian Sommer
+#	fixed wrong index in language array
+!	removed some comment lines (changes are tracked by SVN)
+20-Feb-2009 Dietrich Roland Pehlke (aldus)
+!	add additional tr and td tags to the text_no_results message to get valid XHMTL output
 19-Feb-2009 Christian Sommer
 !	addon overview to show advanced options after redirect from reload.php
 #	fixed bug if language folder contains none language files (XX.php) or sub folders
Index: trunk/wb/admin/templates/uninstall.php
===================================================================
--- trunk/wb/admin/templates/uninstall.php	(revision 941)
+++ trunk/wb/admin/templates/uninstall.php	(revision 942)
@@ -72,48 +72,16 @@
 	
 	/**
 	*	Check if the template is still in use by a page ...
-	*
-	*	@version	0.2.0
-	*	@build		5
-	*	@author		aldus
-	*	@since		0.1.0
-	*	@lastchange 2008-10-23
-	*
 	*/
 	$info = $database->query("SELECT page_id, page_title FROM ".TABLE_PREFIX."pages WHERE template='".$file."' order by page_title");
 	
 	if ($info->numRows() > 0) {
-	
 		/**
 		*	Template is still in use, so we're collecting the page-titles
-		*
-		*	@version	0.2.0
-		*	@build		5
-		*	@since		0.1.1
-		*	@lastchange 2008-10-23
-		*
-		*	0.2.0		Codechanges for Websitebaker to use it without the Black-Hawk-Engine
-		*
-		*	0.1.1		add this page <if we found only one> / these pages
-		*
-		*	@notice		All listed pages got linked to "settings.php" so the user can easy change
-		*				the template-settings. Modifications could be made in "page_template_str".
-		*				For additional informations you will have to modify the query, the page_template_str
-		*				and the page_info array.
-		*
-		*	@todo		1 - Additional informations about the pages (modified, modified_by, visibility, etc)
-		*
-		*				2 - What happends about pages, the user is not allowed to edit?
-		*					Marked "red"?
-		*
-		*				3 - Multiple language support here ...
 		*/
 		
 		/**
 		*	The base-message template-string for the top of the message
-		*
-		*	0.1.2	this page/ these pages
-		*
 		*/
 		if (!array_key_exists("CANNOT_UNINSTALL_IN_USE_TMPL", $MESSAGE['GENERIC'])) {
 			$add = $info->numRows() == 1 ? "this page" : "these pages";
Index: trunk/wb/admin/modules/uninstall.php
===================================================================
--- trunk/wb/admin/modules/uninstall.php	(revision 941)
+++ trunk/wb/admin/modules/uninstall.php	(revision 942)
@@ -47,21 +47,9 @@
 
 // Check if the module exists
 if(!is_dir(WB_PATH.'/modules/'.$file)) {
-	$admin->print_error($MESSAGE['MODULES']['NOT_INSTALLED']);
+	$admin->print_error($MESSAGE['GENERIC']['NOT_INSTALLED']);
 }
 
-/**
-*	Check if the module is in use
-*
-*	@version	0.2.0
-*	@build		1
-*	@date		2008-12-29
-*	@author		aldus
-*	@package	Website Baker: Admin - modules
-*	@state		@beta
-*
-*/
-
 if (!function_exists("replace_all")) {
 	function replace_all ($aStr = "", &$aArray ) {
 		foreach($aArray as $k=>$v) $aStr = str_replace("{{".$k."}}", $v, $aStr);
@@ -126,7 +114,7 @@
 
 // Try to delete the module dir
 if(!rm_full_dir(WB_PATH.'/modules/'.$file)) {
-	$admin->print_error($MESSAGE['MODULES']['CANNOT_UNINSTALL']);
+	$admin->print_error($MESSAGE['GENERIC']['CANNOT_UNINSTALL']);
 } else {
 	// Remove entry from DB
 	$database->query("DELETE FROM ".TABLE_PREFIX."addons WHERE directory = '".$file."' AND type = 'module'");