Index: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG	(revision 554)
+++ trunk/CHANGELOG	(revision 555)
@@ -12,6 +12,7 @@
 
 ------------------------------------- 2.7.0 -------------------------------------
 18-Jan-2008 Matthias Gallas
+!	Revoked parts of changeset 547 and again introduced changeset 540
 +	Added keywords to new files
 18-Jan-2008 Thomas Hornik
 +	added new module-based search-function
Index: trunk/wb/admin/pages/settings2.php
===================================================================
--- trunk/wb/admin/pages/settings2.php	(revision 554)
+++ trunk/wb/admin/pages/settings2.php	(revision 555)
@@ -123,7 +123,7 @@
 // Work-out what the link should be
 if($parent == '0') {
 	$link = '/'.page_filename($menu_title);
-	$filename = WB_PATH.PAGES_DIRECTORY.'/'.page_filename($menu_title).'.php'; 
+	$filename = WB_PATH.PAGES_DIRECTORY.'/'.page_filename($menu_title).PAGE_EXTENSION; 
 } else {
 	$parent_section = '';
 	$parent_titles = array_reverse(get_parent_titles($parent));
@@ -132,7 +132,7 @@
 	}
 	if($parent_section == '/') { $parent_section = ''; }
 	$link = '/'.$parent_section.page_filename($menu_title);
-	$filename = WB_PATH.PAGES_DIRECTORY.'/'.$parent_section.page_filename($menu_title).'.php';  
+	$filename = WB_PATH.PAGES_DIRECTORY.'/'.$parent_section.page_filename($menu_title).PAGE_EXTENSION;  
 }
 
 // Check if a page with same page filename exists
@@ -168,7 +168,7 @@
 	// First check if we need to create a new file
 	if($old_link != $link) {
 		// Delete old file
-		$old_filename = WB_PATH.PAGES_DIRECTORY.$old_link.'.php';
+		$old_filename = WB_PATH.PAGES_DIRECTORY.$old_link.PAGE_EXTENSION;
 		if(file_exists($old_filename)) {
 			unlink($old_filename);
 		}
@@ -194,11 +194,11 @@
 					// Update level and link
 					$database->query("UPDATE ".TABLE_PREFIX."pages SET link = '$new_sub_link', level = '$new_sub_level' WHERE page_id = '".$sub['page_id']."' LIMIT 1");
 					// Re-write the access file for this page
-					$old_subpage_file = WB_PATH.PAGES_DIRECTORY.$new_sub_link.'.php';
+					$old_subpage_file = WB_PATH.PAGES_DIRECTORY.$new_sub_link.PAGE_EXTENSION;
 					if(file_exists($old_subpage_file)) {
 						unlink($old_subpage_file);
 					}
-					create_access_file(WB_PATH.PAGES_DIRECTORY.$new_sub_link.'.php', $sub['page_id'], $new_sub_level);
+					create_access_file(WB_PATH.PAGES_DIRECTORY.$new_sub_link.PAGE_EXTENSION, $sub['page_id'], $new_sub_level);
 				}
 			}
 		}
Index: trunk/wb/admin/pages/add.php
===================================================================
--- trunk/wb/admin/pages/add.php	(revision 554)
+++ trunk/wb/admin/pages/add.php	(revision 555)
@@ -68,7 +68,7 @@
 // Work-out what the link and page filename should be
 if($parent == '0') {
 	$link = '/'.page_filename($title);
-	$filename = WB_PATH.PAGES_DIRECTORY.'/'.page_filename($title).'.php';
+	$filename = WB_PATH.PAGES_DIRECTORY.'/'.page_filename($title).PAGE_EXTENSION;
 } else {
 	$parent_section = '';
 	$parent_titles = array_reverse(get_parent_titles($parent));
@@ -77,13 +77,13 @@
 	}
 	if($parent_section == '/') { $parent_section = ''; }
 	$link = '/'.$parent_section.page_filename($title);
-	$filename = WB_PATH.PAGES_DIRECTORY.'/'.$parent_section.page_filename($title).'.php';
+	$filename = WB_PATH.PAGES_DIRECTORY.'/'.$parent_section.page_filename($title).PAGE_EXTENSION;
 	make_dir(WB_PATH.PAGES_DIRECTORY.'/'.$parent_section);
 }
 
 // Check if a page with same page filename exists
 $get_same_page = $database->query("SELECT page_id FROM ".TABLE_PREFIX."pages WHERE link = '$link'");
-if($get_same_page->numRows() > 0 OR file_exists(WB_PATH.PAGES_DIRECTORY.$link.'.php') OR file_exists(WB_PATH.PAGES_DIRECTORY.$link.'/')) {
+if($get_same_page->numRows() > 0 OR file_exists(WB_PATH.PAGES_DIRECTORY.$link.PAGE_EXTENSION) OR file_exists(WB_PATH.PAGES_DIRECTORY.$link.'/')) {
 	$admin->print_error($MESSAGE['PAGES']['PAGE_EXISTS']);
 }
 
Index: trunk/wb/framework/class.admin.php
===================================================================
--- trunk/wb/framework/class.admin.php	(revision 554)
+++ trunk/wb/framework/class.admin.php	(revision 555)
@@ -116,7 +116,7 @@
 			// extract page link from the database
 			$result = @$database->query("SELECT link FROM " .TABLE_PREFIX ."pages WHERE page_id = '" .(int) $_GET['page_id'] ."'");
 			$row = @$result->fetchRow();
-			if($row) $view_url .= PAGES_DIRECTORY .$row['link']. '.php';
+			if($row) $view_url .= PAGES_DIRECTORY .$row['link']. PAGE_EXTENSION;
 		}
 
 		// Create the menu
Index: trunk/wb/framework/class.wb.php
===================================================================
--- trunk/wb/framework/class.wb.php	(revision 554)
+++ trunk/wb/framework/class.wb.php	(revision 555)
@@ -153,7 +153,7 @@
 	function page_link($link){
 		// Check for :// in the link (used in URL's) as well as mailto:
 		if(strstr($link, '://') == '' AND substr($link, 0, 7) != 'mailto:') {
-			return WB_URL.PAGES_DIRECTORY.$link.'.php';
+			return WB_URL.PAGES_DIRECTORY.$link.PAGE_EXTENSION;
 		} else {
 			return $link;
 		}
Index: trunk/wb/framework/class.frontend.php
===================================================================
--- trunk/wb/framework/class.frontend.php	(revision 554)
+++ trunk/wb/framework/class.frontend.php	(revision 555)
@@ -206,7 +206,7 @@
 				// Check if the user is authenticated
 				if($this->is_authenticated() == false) {
 					// User needs to login first
-					header("Location: ".WB_URL."/account/login".PAGE_EXTENSION.'?redirect='.$this->link);
+					header("Location: ".WB_URL."/account/login.php?redirect=".$this->link);
 					exit(0);
 				} else {
 					// User isnt allowed on this page so tell them
Index: trunk/wb/index.php
===================================================================
--- trunk/wb/index.php	(revision 554)
+++ trunk/wb/index.php	(revision 555)
@@ -70,7 +70,7 @@
 			$res=$query_link->fetchRow();
 			$target_page_link = $res['link'];
 			// redirect
-			header('Location: '.WB_URL.PAGES_DIRECTORY.$target_page_link.'.php');
+			header('Location: '.WB_URL.PAGES_DIRECTORY.$target_page_link.PAGE_EXTENSION);
 			exit;
 		}
 	}