Index: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG	(revision 803)
+++ trunk/CHANGELOG	(revision 804)
@@ -13,6 +13,7 @@
 ------------------------------------- 2.7.0 -------------------------------------
 05-Apr-2008 Thomas Hornik
 !	some small fixes: group_id/groups_id-handling, safe_mode-query in install, better work-around for issue with phplib and code-module (removed {})
+#	fixed viewing_groups-handling in /admin/pages/add.php
 05-Apr-2008 Christian Sommer
 !	added workaround for template parser class
 !	moved functions to edit module CSS files into the WB core to avoid duplication of code
Index: trunk/wb/admin/pages/index.php
===================================================================
--- trunk/wb/admin/pages/index.php	(revision 803)
+++ trunk/wb/admin/pages/index.php	(revision 804)
@@ -41,14 +41,11 @@
 <script type="text/javascript" language="javascript">
 function toggle_viewers() {
 	if(document.add.visibility.value == 'private') {
-		document.getElementById('private_viewers').style.display = 'block';
-		document.getElementById('registered_viewers').style.display = 'none';
+		document.getElementById('viewers').style.display = 'block';
 	} else if(document.add.visibility.value == 'registered') {
-		document.getElementById('private_viewers').style.display = 'none';
-		document.getElementById('registered_viewers').style.display = 'block';
+		document.getElementById('viewers').style.display = 'block';
 	} else {
-		document.getElementById('private_viewers').style.display = 'none';
-		document.getElementById('registered_viewers').style.display = 'none';
+		document.getElementById('viewers').style.display = 'none';
 	}
 }
 function toggle_visibility(id){
Index: trunk/wb/admin/pages/add.php
===================================================================
--- trunk/wb/admin/pages/add.php	(revision 803)
+++ trunk/wb/admin/pages/add.php	(revision 804)
@@ -40,19 +40,13 @@
 $admin_groups = $admin->get_post('admin_groups');
 $viewing_groups = $admin->get_post('viewing_groups');
 
-// work-around: $viewing_groups contains group-numbers for both private _and_ registered - keep group-numbers which appears twice only
-$view_groups=array();
-if($viewing_groups===NULL)
-	$viewing_groups=array();
-foreach($viewing_groups as $a) {
-	if(isset($view_groups[$a])) $view_groups[$a]++;
-	else $view_groups[$a] = 1;
+// add Admin to admin and viewing-groups
+$admin_groups[] = 1;
+if($visibility == 'private' || $visibility == 'registered') {
+	$viewing_groups[] = 1;
+} else {
+	$viewing_groups = array(1);
 }
-$viewing_groups=array();
-foreach($view_groups as $k=>$v) {
-	if($v==2)
-		$viewing_groups[]=$k;
-}
 
 if ($parent!=0) {
 	if (!$admin->get_page_permission($parent,'admin'))
@@ -66,17 +60,6 @@
 	$admin->print_error($MESSAGE['PAGES']['BLANK_PAGE_TITLE']);
 }
 
-// Setup admin groups
-$admin_groups[] = 1;
-//if(!in_array(1, $admin->get_groups_id())) {
-//	$admin_groups[] = implode(",",$admin->get_groups_id());
-//}
-// Setup viewing groups
-$viewing_groups[] = 1;
-//if(!in_array(1, $admin->get_groups_id())) {
-//	$viewing_groups[] = implode(",",$admin->get_groups_id());
-//}
-
 // Check to see if page created has needed permissions
 if(!in_array(1, $admin->get_groups_id())) {
 	$admin_perm_ok = false;
Index: trunk/wb/admin/pages/template.html
===================================================================
--- trunk/wb/admin/pages/template.html	(revision 803)
+++ trunk/wb/admin/pages/template.html	(revision 804)
@@ -27,20 +27,7 @@
 		</ul>
 	</td>
 	<td rowspan="6" valign="top" style="padding-left: 20px; padding-top: 8px;">
-		<div id="private_viewers" style="display: none;">
-			{TEXT_PRIVATE_VIEWERS}:
-			<ul style="list-style-type: none; margin: 0; padding: 0;">
-				<!-- BEGIN group_list_block2 -->
-				<li>
-				<input type="checkbox" name="viewing_groups[]" id="viewing_group_{ID}" value="{ID}"{CHECKED}{DISABLED} />
-				<label for="viewing_group_{TOGGLE}">{NAME}</label>
-				</li>
-				<!-- END group_list_block2 -->
-			</ul>
-		</div>
-	</td>
-	<td rowspan="6" valign="top" style="padding-left: 20px; padding-top: 8px;">
-		<div id="registered_viewers" style="display: none;">
+		<div id="viewers" style="display: none;">
 			{TEXT_REGISTERED_VIEWERS}:
 			<ul style="list-style-type: none; margin: 0; padding: 0;">
 				<!-- BEGIN group_list_block2 -->