Index: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG	(revision 535)
+++ trunk/CHANGELOG	(revision 536)
@@ -12,6 +12,9 @@
 
 ------------------------------------- 2.7.0 -------------------------------------
 13-Jan-2008 Christian Sommer
+#	moved administration tools from Settings to the new section Admin-Tools
+
+13-Jan-2008 Christian Sommer
 #	this bugfix closes the ticket 529 (WB upgrades modules with identical version)	
 
 13-Jan-2008 Christian Sommer
Index: trunk/wb/install/save.php
===================================================================
--- trunk/wb/install/save.php	(revision 535)
+++ trunk/wb/install/save.php	(revision 536)
@@ -513,7 +513,7 @@
 	// Insert default data
 	
 	// Admin group
-	$full_system_permissions = 'pages,pages_view,pages_add,pages_add_l0,pages_settings,pages_modify,pages_intro,pages_delete,media,media_view,media_upload,media_rename,media_delete,media_create,addons,modules,modules_view,modules_install,modules_uninstall,templates,templates_view,templates_install,templates_uninstall,languages,languages_view,languages_install,languages_uninstall,settings,settings_basic,settings_advanced,access,users,users_view,users_add,users_modify,users_delete,groups,groups_view,groups_add,groups_modify,groups_delete';
+	$full_system_permissions = 'pages,pages_view,pages_add,pages_add_l0,pages_settings,pages_modify,pages_intro,pages_delete,media,media_view,media_upload,media_rename,media_delete,media_create,addons,modules,modules_view,modules_install,modules_uninstall,templates,templates_view,templates_install,templates_uninstall,languages,languages_view,languages_install,languages_uninstall,settings,settings_basic,settings_advanced,access,users,users_view,users_add,users_modify,users_delete,groups,groups_view,groups_add,groups_modify,groups_delete,admintools';
 	$insert_admin_group = "INSERT INTO `".TABLE_PREFIX."groups` VALUES ('1', 'Administrators', '$full_system_permissions', '', '')";
 	$database->query($insert_admin_group);
 	// Admin user
Index: trunk/wb/languages/EN.php
===================================================================
--- trunk/wb/languages/EN.php	(revision 535)
+++ trunk/wb/languages/EN.php	(revision 536)
@@ -46,6 +46,7 @@
 $MENU['LANGUAGES'] = 'Languages';
 $MENU['PREFERENCES'] = 'Preferences';
 $MENU['SETTINGS'] = 'Settings';
+$MENU['ADMINTOOLS'] = 'Admin-Tools';
 $MENU['ACCESS'] = 'Access';
 $MENU['USERS'] = 'Users';
 $MENU['GROUPS'] = 'Groups';
Index: trunk/wb/admin/groups/get_permissions.php
===================================================================
--- trunk/wb/admin/groups/get_permissions.php	(revision 535)
+++ trunk/wb/admin/groups/get_permissions.php	(revision 536)
@@ -66,16 +66,17 @@
 	} else {
 		$system_permissions['access'] = 0;
 	}
-		$system_permissions['users'] = $admin->get_post('users');
-			$system_permissions['users_view'] = $system_permissions['users'];
-			$system_permissions['users_add'] = $system_permissions['users'];
-			$system_permissions['users_modify'] = $system_permissions['users'];
-			$system_permissions['users_delete'] = $system_permissions['users'];
-		$system_permissions['groups'] = $admin->get_post('groups');
-			$system_permissions['groups_view'] = $system_permissions['groups'];
-			$system_permissions['groups_add'] = $system_permissions['groups'];
-			$system_permissions['groups_modify'] = $system_permissions['groups'];
-			$system_permissions['groups_delete'] = $system_permissions['groups'];
+	$system_permissions['users'] = $admin->get_post('users');
+	$system_permissions['users_view'] = $system_permissions['users'];
+	$system_permissions['users_add'] = $system_permissions['users'];
+	$system_permissions['users_modify'] = $system_permissions['users'];
+	$system_permissions['users_delete'] = $system_permissions['users'];
+	$system_permissions['groups'] = $admin->get_post('groups');
+	$system_permissions['groups_view'] = $system_permissions['groups'];
+	$system_permissions['groups_add'] = $system_permissions['groups'];
+	$system_permissions['groups_modify'] = $system_permissions['groups'];
+	$system_permissions['groups_delete'] = $system_permissions['groups'];
+	$system_permissions['admintools'] = $admin->get_post('admintools');
 } else {
 	// Pages
 	$system_permissions['pages_view'] = $admin->get_post('pages_view');
Index: trunk/wb/admin/groups/group_form.html
===================================================================
--- trunk/wb/admin/groups/group_form.html	(revision 535)
+++ trunk/wb/admin/groups/group_form.html	(revision 536)
@@ -64,6 +64,14 @@
 				<label for="groups">{SECTION_GROUPS}</label>
 			</td>
 		</tr>
+		<tr>
+			<td>
+				<input type="checkbox" name="admintools" id="admintools" value="1" {admintools_checked} />
+				<label for="admintools">{SECTION_ADMINTOOLS}</label>
+			</td>
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
 		</table>
 		
 	</td>
Index: trunk/wb/admin/groups/groups.php
===================================================================
--- trunk/wb/admin/groups/groups.php	(revision 535)
+++ trunk/wb/admin/groups/groups.php	(revision 536)
@@ -141,6 +141,7 @@
 									'SECTION_SETTINGS' => $MENU['SETTINGS'],
 									'SECTION_USERS' => $MENU['USERS'],
 									'SECTION_GROUPS' => $MENU['GROUPS'],
+									'SECTION_ADMINTOOLS' => $MENU['ADMINTOOLS'],
 									'TEXT_VIEW' => $TEXT['VIEW'],
 									'TEXT_ADD' => $TEXT['ADD'],
 									'TEXT_LEVEL' => $TEXT['LEVEL'],
Index: trunk/wb/admin/groups/index.php
===================================================================
--- trunk/wb/admin/groups/index.php	(revision 535)
+++ trunk/wb/admin/groups/index.php	(revision 536)
@@ -164,6 +164,7 @@
 								'SECTION_LANGUAGES' => $MENU['LANGUAGES'],
 								'SECTION_USERS' => $MENU['USERS'],
 								'SECTION_GROUPS' => $MENU['GROUPS'],
+								'SECTION_ADMINTOOLS' => $MENU['ADMINTOOLS'],
 								'TEXT_VIEW' => $TEXT['VIEW'],
 								'TEXT_ADD' => $TEXT['ADD'],
 								'TEXT_LEVEL' => $TEXT['LEVEL'],
Index: trunk/wb/admin/settings/tool.php
===================================================================
--- trunk/wb/admin/settings/tool.php	(revision 535)
+++ trunk/wb/admin/settings/tool.php	(nonexistent)
@@ -1,58 +0,0 @@
-<?php
-
-// $Id$
-
-/*
-
- Website Baker Project <http://www.websitebaker.org/>
- Copyright (C) 2004-2008, Ryan Djurovich
-
- Website Baker 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 2 of the License, or
- (at your option) any later version.
-
- Website Baker 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 Website Baker; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-*/
-
-require('../../config.php');
-require_once(WB_PATH.'/framework/class.admin.php');
-require_once(WB_PATH.'/framework/functions.php');
-
-if(!isset($_GET['tool'])) {
-	header("Location: index.php?advanced=yes");
-	exit(0);
-}
-
-// Check if tool is installed
-$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'module' AND function = 'tool' AND directory = '".$_GET['tool']."'");
-if($result->numRows() == 0) {
-	header("Location: index.php?advanced=yes");
-	exit(0);
-}
-$tool = $result->fetchRow();
-
-$admin = new admin('Settings', 'settings_advanced');
-
-?>
-<h4 style="margin: 0; border-bottom: 1px solid #DDD; padding-bottom: 5px;">
-	<a href="<?php echo ADMIN_URL; ?>/settings/index.php?advanced=yes"><?php echo $MENU['SETTINGS']; ?></a>
-	->
-	<a href="<?php echo ADMIN_URL; ?>/settings/index.php?advanced=yes#administration_tools"><?php echo $HEADING['ADMINISTRATION_TOOLS']; ?></a>
-	->
-	<?php echo $tool['name']; ?>
-</h4>
-<?php
-require(WB_PATH.'/modules/'.$tool['directory'].'/tool.php');
-
-$admin->print_footer();
-
-?>
\ No newline at end of file

Property changes on: trunk/wb/admin/settings/tool.php
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-Id
\ No newline at end of property
Index: trunk/wb/admin/settings/index.php
===================================================================
--- trunk/wb/admin/settings/index.php	(revision 535)
+++ trunk/wb/admin/settings/index.php	(revision 536)
@@ -123,20 +123,6 @@
 								 )
 						 );
 
-// Insert tools into tool list
-$template->set_block('main_block', 'tool_list_block', 'tool_list');
-$results = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'module' AND function = 'tool'");
-if($results->numRows() > 0) {
-	while($tool = $results->fetchRow()) {
-		$template->set_var('TOOL_NAME', $tool['name']);
-		$template->set_var('TOOL_DIR', $tool['directory']);
-		$template->set_var('TOOL_DESCRIPTION', $tool['description']);
-		$template->parse('tool_list', 'tool_list_block', true);
-	}
-} else {
-	$template->set_var('TOOL_LIST', $TEXT['NONE_FOUND']);	
-}
-
 // Insert language values
 $template->set_block('main_block', 'language_list_block', 'language_list');
 $result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'language' order by directory");
Index: trunk/wb/admin/settings/template.html
===================================================================
--- trunk/wb/admin/settings/template.html	(revision 535)
+++ trunk/wb/admin/settings/template.html	(revision 536)
@@ -643,29 +643,6 @@
 		<input type="password" name="wbmailer_smtp_password" value="{WBMAILER_SMTP_PASSWORD}" />
 	</td>
 </tr>
-<tr class="advanced">
-	<td colspan="3" style="padding-top: 10px;">
-		<a name="administration_tools"></a>
-		<h2>{HEADING_ADMINISTRATION_TOOLS}</h2>
-	</td>
-</tr>
-<tr class="advanced">
-	<td colspan="3">
-		<ul style="margin: 0; padding: 0; margin-left: 20px; margin-bottom: 10px;">
-		<!-- BEGIN tool_list_block -->
-		<li style="padding-bottom: 5px;">
-		<a href="{ADMIN_URL}/settings/tool.php?tool={TOOL_DIR}">{TOOL_NAME}</a>
-		<br />{TOOL_DESCRIPTION}
-		</li>
-		<!-- END tool_list_block -->
-		</ul>
-		{TOOL_LIST}
-	</td>
-	<td>
-		&nbsp;
-	</td>
-	<td>&nbsp;</td>
-</tr>
 <tr>
 	<td>&nbsp;</td>
 	<td>
Index: trunk/wb/admin/admintools/tool.php
===================================================================
--- trunk/wb/admin/admintools/tool.php	(nonexistent)
+++ trunk/wb/admin/admintools/tool.php	(revision 536)
@@ -0,0 +1,56 @@
+<?php
+
+// $Id: tool.php 519 2007-12-23 14:37:02Z Ruebenwurzel $
+
+/*
+
+ Website Baker Project <http://www.websitebaker.org/>
+ Copyright (C) 2004-2008, Ryan Djurovich
+
+ Website Baker 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 2 of the License, or
+ (at your option) any later version.
+
+ Website Baker 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 Website Baker; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+*/
+
+require('../../config.php');
+require_once(WB_PATH.'/framework/class.admin.php');
+require_once(WB_PATH.'/framework/functions.php');
+
+$admin = new admin('admintools', 'admintools');
+
+if(!isset($_GET['tool'])) {
+	header("Location: index.php");
+	exit(0);
+}
+
+// Check if tool is installed
+$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'module' AND function = 'tool' AND directory = '".$_GET['tool']."'");
+if($result->numRows() == 0) {
+	header("Location: index.php");
+	exit(0);
+}
+$tool = $result->fetchRow();
+
+?>
+<h4 style="margin: 0; border-bottom: 1px solid #DDD; padding-bottom: 5px;">
+	<a href="<?php echo ADMIN_URL; ?>/admintools/index.php"><?php echo $HEADING['ADMINISTRATION_TOOLS']; ?></a>
+	->
+	<?php echo $tool['name']; ?>
+</h4>
+<?php
+require(WB_PATH.'/modules/'.$tool['directory'].'/tool.php');
+
+$admin->print_footer();
+
+?>
\ No newline at end of file
Index: trunk/wb/admin/admintools/index.php
===================================================================
--- trunk/wb/admin/admintools/index.php	(nonexistent)
+++ trunk/wb/admin/admintools/index.php	(revision 536)
@@ -0,0 +1,62 @@
+<?php
+
+// $Id: index.php 519 2007-12-23 14:37:02Z doc $
+
+/*
+
+ Website Baker Project <http://www.websitebaker.org/>
+ Copyright (C) 2004-2008, Ryan Djurovich
+
+ Website Baker 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 2 of the License, or
+ (at your option) any later version.
+
+ Website Baker 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 Website Baker; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+*/
+
+require('../../config.php');
+require_once(WB_PATH.'/framework/class.admin.php');
+$admin = new admin('admintools', 'admintools');
+
+// Include the WB functions file
+require_once(WB_PATH.'/framework/functions.php');
+
+// Create new template object
+$template = new Template(ADMIN_PATH.'/admintools');
+$template->set_file('page', 'template.html');
+$template->set_block('page', 'main_block', 'main');
+
+// Insert required template variables
+$template->set_var('ADMIN_URL', ADMIN_URL);
+$template->set_var('HEADING_ADMINISTRATION_TOOLS', $HEADING['ADMINISTRATION_TOOLS']);
+
+// Insert tools into tool list
+$template->set_block('main_block', 'tool_list_block', 'tool_list');
+$results = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'module' AND function = 'tool'");
+if($results->numRows() > 0) {
+	while($tool = $results->fetchRow()) {
+		$template->set_var('TOOL_NAME', $tool['name']);
+		$template->set_var('TOOL_DIR', $tool['directory']);
+		$template->set_var('TOOL_DESCRIPTION', $tool['description']);
+		$template->parse('tool_list', 'tool_list_block', true);
+	}
+} else {
+	$template->set_var('TOOL_LIST', $TEXT['NONE_FOUND']);	
+}
+
+// Parse template objects output
+$template->parse('main', 'main_block', false);
+$template->pparse('output', 'page');
+
+$admin->print_footer();
+
+?>
\ No newline at end of file
Index: trunk/wb/admin/admintools/template.html
===================================================================
--- trunk/wb/admin/admintools/template.html	(nonexistent)
+++ trunk/wb/admin/admintools/template.html	(revision 536)
@@ -0,0 +1,43 @@
+</div><!-- BEGIN main_block -->
+
+<style>
+.tool_table td {
+	vertical-align: top;
+	text-align: left;
+}
+</style>
+
+<form name="admin_tools" action="save.php" method="post">
+
+<table cellpadding="3" cellspacing="0" border="0" align="center" width="100%" class="tool_table">
+
+<tr class="advanced">
+	<td colspan="3" style="padding-top: 10px;">
+		<a name="administration_tools"></a>
+		<h2>{HEADING_ADMINISTRATION_TOOLS}</h2>
+	</td>
+</tr>
+<tr>
+	<td colspan="3">
+		<ul style="margin: 0; padding: 0; margin-left: 20px; margin-bottom: 10px;">
+		<!-- BEGIN tool_list_block -->
+		<li style="padding-bottom: 5px;">
+		<a href="{ADMIN_URL}/admintools/tool.php?tool={TOOL_DIR}">{TOOL_NAME}</a>
+		<br />{TOOL_DESCRIPTION}
+		</li>
+		<!-- END tool_list_block -->
+		</ul>
+		{TOOL_LIST}
+	</td>
+	<td>
+		&nbsp;
+	</td>
+	<td>&nbsp;</td>
+</tr>
+</table>
+
+</form>
+
+
+
+<!-- END main_block -->
\ No newline at end of file
Index: trunk/wb/framework/class.admin.php
===================================================================
--- trunk/wb/framework/class.admin.php	(revision 535)
+++ trunk/wb/framework/class.admin.php	(revision 536)
@@ -127,6 +127,7 @@
 					array(ADMIN_URL.'/addons/index.php', '', $MENU['ADDONS'], 'addons', 1),
 					array(ADMIN_URL.'/preferences/index.php', '', $MENU['PREFERENCES'], 'preferences', 0),
 					array(ADMIN_URL.'/settings/index.php', '', $MENU['SETTINGS'], 'settings', 1),
+					array(ADMIN_URL.'/admintools/index.php', '', $MENU['ADMINTOOLS'], 'admintools', 1),
 					array(ADMIN_URL.'/access/index.php', '', $MENU['ACCESS'], 'access', 1),
 					array('http://www.websitebaker.org/help/'.WB_VERSION, '_blank', $MENU['HELP'], 'help', 0),
 					array($view_url, '_blank', $MENU['VIEW'], 'view', 0),
