[ros-diffs] [frik85] 19938: RosCMS update:

RosCMS update:

* improve pages and content "view/edit/save" functions
* improve "group members" interface
* and some minor changes
Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin.php
Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_content_edit.php
Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_pages_edit.php
Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_pages_save.php
Modified:
trunk/web/reactos.org/htdocs/roscms/inc/admin_user_accounts.php
Added:
trunk/web/reactos.org/htdocs/roscms/inc/admin_user_group_members.php
Added:
trunk/web/reactos.org/htdocs/roscms/inc/admin_user_group_members_edit.ph
p
Deleted:
trunk/web/reactos.org/htdocs/roscms/inc/admin_user_group_memebers.php
Modified:
trunk/web/reactos.org/htdocs/roscms/inc/inc_description_table.php
Modified: trunk/web/reactos.org/htdocs/roscms/inc/website_status.php
  _____  

Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin.php
--- trunk/web/reactos.org/htdocs/roscms/inc/admin.php	2005-12-06
19:43:53 UTC (rev 19937)
+++ trunk/web/reactos.org/htdocs/roscms/inc/admin.php	2005-12-06
19:57:28 UTC (rev 19938)
@@ -147,7 +147,24 @@

 				include("inc/admin_user_groups.php"); 
 				break;
 			case "usrgrpmbr":
-
include("inc/admin_user_group_memebers.php"); 
+				if ($rpm_sec2=="view" || $rpm_sec2=="")
{
+
include("inc/admin_user_group_members.php"); 
+				}
+				else if ($rpm_sec2=="edit") {
+
include("inc/admin_user_group_members_edit.php"); 
+				}
+				else if ($rpm_sec2=="add") {
+
include("inc/admin_user_group_members_edit.php"); 
+				}
+				else if ($rpm_sec2=="save") {
+
include("inc/admin_user_group_members_edit.php"); 
+				}
+				else if ($rpm_sec2=="insert") {
+
include("inc/admin_user_group_members_edit.php"); 
+				}
+				else if ($rpm_sec2=="delete") {
+
include("inc/admin_user_group_members_edit.php"); 
+				}
 				break;
 			case "sessions":
 				include("inc/admin_user_sessions.php"); 
  _____  

Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_content_edit.php
--- trunk/web/reactos.org/htdocs/roscms/inc/admin_content_edit.php
2005-12-06 19:43:53 UTC (rev 19937)
+++ trunk/web/reactos.org/htdocs/roscms/inc/admin_content_edit.php
2005-12-06 19:57:28 UTC (rev 19938)
@@ -66,7 +66,7 @@

         <td width="85%" bgcolor="#E2E2E2"> <div
align="left"><font
face="Arial, Helvetica, sans-serif"> 
             [#cont_
             <input name="txt_contentid" type="text"
id="txt_contentid"
value="<?php echo $result_content['content_name']; ?>"
size="50"
maxlength="50">
-            ] &nbsp; (e.g.
&quot;media&quot;)</font></div></td>
+            ] &nbsp; (e.g.
&quot;about&quot;)</font></div></td>
       </tr>
       <tr> 
         <td valign="top" bgcolor="#5984C3"> <div
align="center"><font
color="#FFFFFF" face="Arial, Helvetica,
sans-serif"><strong>Language</strong></font></div></td>
@@ -182,9 +182,35 @@
             </optgroup>
           </select> </td>
       </tr>
+      <tr>
+        <td valign="top" bgcolor="#5984C3"><div
align="center"><font
color="#FFFFFF" face="Arial, Helvetica,
sans-serif"><strong>Type</strong></font></div></td>
+        <td valign="top" bgcolor="#EEEEEE"><font
face="Arial,
Helvetica, sans-serif">
+          <input name="txt_content_type" type="text"
id="txt_content_type" value="<?php echo
$result_content['content_type'];
?>" size="30" maxlength="30">
+(&quot;default&quot;, &quot;layout&quot;, ...)       
</font></td>
+      </tr>
+      <tr>
+        <td valign="top" bgcolor="#5984C3"><div
align="center"><font
color="#FFFFFF" face="Arial, Helvetica,
sans-serif"><strong>Description</strong></font></div></td>
+        <td valign="top" bgcolor="#E2E2E2"><font
face="Arial,
Helvetica, sans-serif">
+          <input name="txt_content_desc" type="text"
id="txt_content_desc" value="<?php echo
$result_content['content_description']; ?>" size="50"
maxlength="255">
+        </font></td>
+      </tr>
+      <tr>
+        <td valign="top" bgcolor="#5984C3"><div
align="center"><font
color="#FFFFFF" face="Arial, Helvetica,
sans-serif"><strong>Username</strong></font></div></td>
+        <td valign="top" bgcolor="#EEEEEE"><font
face="Arial,
Helvetica, sans-serif"><?php 
+		
+				if
($result_content['content_usrname_id']) {
+					$query_user_name =
mysql_query("SELECT * 
+
FROM `users` 
+
WHERE `user_id` = ". $result_content['content_usrname_id'] ." ;")
;
+					$result_user_name =
mysql_fetch_array($query_user_name);
+			
+					echo
"<b>".$result_user_name['user_name']."</b>
(".$result_user_name['user_fullname'].") <a
href='?page=user&amp;sec=profil&amp;sec2=".$result_content['content_usrn
ame_id']."' target='_blank'>[Profile]</a>";
+				}
+		?></font></td>
+      </tr>
       <tr> 
         <td valign="top" bgcolor="#5984C3"><div
align="center"><font
color="#FFFFFF" face="Arial, Helvetica,
sans-serif"><strong>Date</strong></font></div></td>
-        <td valign="top" bgcolor="#EEEEEE"><font
face="Arial,
Helvetica, sans-serif"> 
+        <td valign="top" bgcolor="#E2E2E2"><font
face="Arial,
Helvetica, sans-serif"> 
           <?php 
 			echo $result_content['content_date'];
 		?>
@@ -192,7 +218,7 @@
       </tr>
       <tr> 
         <td valign="top" bgcolor="#5984C3"><div
align="center"><font
color="#FFFFFF" face="Arial, Helvetica,
sans-serif"><strong>Time</strong></font></div></td>
-        <td valign="top" bgcolor="#E2E2E2"><font
face="Arial,
Helvetica, sans-serif"> 
+        <td valign="top" bgcolor="#EEEEEE"><font
face="Arial,
Helvetica, sans-serif"> 
           <?php 
 			echo $result_content['content_time'];
 		?>
@@ -303,6 +329,8 @@
 		$content_act="";
 		$content_extra="";
 		$content_savemode="";
+		$content_typea="";
+		$content_desca="";
 
 		if (array_key_exists("txt_contentid", $_POST))
$content_contentid=$_POST['txt_contentid'];
 		if (array_key_exists("txt_langa", $_POST))
$content_langa=$_POST['txt_langa'];
@@ -310,7 +338,10 @@
 		if (array_key_exists("content_active", $_POST))
$content_act=$_POST['content_active'];
 		if (array_key_exists("txt_extra", $_POST))
$content_extra=$_POST['txt_extra'];
 		if (array_key_exists("content_rad_opt", $_POST))
$content_savemode=$_POST['content_rad_opt'];
+		if (array_key_exists("txt_content_type", $_POST))
$content_typea=$_POST['txt_content_type'];
+		if (array_key_exists("txt_content_desc", $_POST))
$content_desca=$_POST['txt_content_desc'];
 
+
 		//echo "<br>".$content_act;
 		if ($content_langa == "") {
 			$content_langa = "all";
@@ -363,7 +394,7 @@
 
 
 		if ($content_savemode == "update") {
-			$content_description = date("Y-m-d H:i:s")."
[".$roscms_intern_account_id."] ";
+			$content_description = date("Y-m-d H:i:s")."
[".$roscms_intern_account_id."] | ".$content_desca;
 			
 			$content_posta="UPDATE `content` SET
`content_name` = '". mysql_escape_string($content_contentid) ."',
 				`content_lang` = '".
mysql_escape_string($content_langa) ."',
@@ -371,12 +402,14 @@
 				`content_text` = '".
mysql_real_escape_string($content_data)  ."',
 				`content_visible` = '".
mysql_escape_string($content_vis) ."',
 				`content_active` = '".
mysql_escape_string($content_act) ."',
-				`content_description` = '".
mysql_escape_string($content_description) ."'
+				`content_description` = '".
mysql_escape_string($content_description) ."',
+				`content_type` = '".
mysql_escape_string($content_description) ."'
 				WHERE `content_id` = '$rpm_db_id' LIMIT
1 ;";
 				//`content_active` = '1',
 				//`content_usrname_id` =
'$roscms_intern_account_id',
 				//`content_date` = CURDATE( ) ,
 				//`content_time` = CURTIME( )
+
 			$content_post_lista=mysql_query($content_posta);
 		}
 		elseif ($content_savemode == "translate") {
  _____  

Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_pages_edit.php
--- trunk/web/reactos.org/htdocs/roscms/inc/admin_pages_edit.php
2005-12-06 19:43:53 UTC (rev 19937)
+++ trunk/web/reactos.org/htdocs/roscms/inc/admin_pages_edit.php
2005-12-06 19:57:28 UTC (rev 19938)
@@ -122,9 +122,9 @@

 		?>
           </font></td>
       </tr>
-      <tr> 
+      <tr>
         <td valign="top" bgcolor="#5984C3"><div
align="center"><font
color="#FFFFFF" face="Arial, Helvetica,
sans-serif"><strong>Visible</strong></font></div></td>
-        <td valign="top" bgcolor="#EEEEEE"><font
face="Arial,
Helvetica, sans-serif"> 
+        <td valign="top" bgcolor="#E2E2E2"><font
face="Arial,
Helvetica, sans-serif">
           <?php 
 			if ($result_page['page_visible'] == 1) {
 				echo ' <input name="page_visible"
type="radio" value="yes" checked> yes &nbsp; <input
type="radio"
name="page_visible" value="no"> no';
@@ -133,6 +133,19 @@
 				echo ' <input name="page_visible"
type="radio" value="yes"> yes &nbsp; <input
type="radio"
name="page_visible" value="no" checked> no';
 			}	
 		?>
+</font></td>
+      </tr>
+      <tr> 
+        <td valign="top" bgcolor="#5984C3"><div
align="center"><font
color="#FFFFFF" face="Arial, Helvetica,
sans-serif"><strong>Active</strong></font></div></td>
+        <td valign="top" bgcolor="#EEEEEE"><font
face="Arial,
Helvetica, sans-serif">
+          <?php 
+			if ($result_page['page_active'] == 1) {
+				echo ' <input name="page_active"
type="radio" value="yes" checked> yes &nbsp; <input
type="radio"
name="page_active" value="no"> no';
+			}
+			else {
+				echo ' <input name="page_active"
type="radio" value="yes"> yes &nbsp; <input
type="radio"
name="page_active" value="no" checked> no';
+			}	
+		?> 
           </font></td>
       </tr>
       <tr> 
@@ -158,6 +171,12 @@
             </optgroup>
           </select> </td>
       </tr>
+      <tr>
+        <td valign="top" bgcolor="#5984C3"><div
align="center"><font
color="#FFFFFF" face="Arial, Helvetica,
sans-serif"><strong>Extention</strong></font></div></td>
+        <td valign="top" bgcolor="#E2E2E2"><font
face="Arial,
Helvetica, sans-serif">
+          <input name="txt_pageextent" type="text"
id="txt_pageextent"
value="<?php echo $result_page['pages_extention']; ?>"
size="10"
maxlength="10">
+(&quot;default&quot;, &quot;xml&quot;, ...) </font></td>
+      </tr>
       <tr> 
         <td valign="top" bgcolor="#5984C3"><div
align="center"><font
color="#FFFFFF" face="Arial, Helvetica,
sans-serif"><strong>Date</strong></font></div></td>
         <td valign="top" bgcolor="#EEEEEE"><font
face="Arial,
Helvetica, sans-serif"> 
  _____  

Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_pages_save.php
--- trunk/web/reactos.org/htdocs/roscms/inc/admin_pages_save.php
2005-12-06 19:43:53 UTC (rev 19937)
+++ trunk/web/reactos.org/htdocs/roscms/inc/admin_pages_save.php
2005-12-06 19:57:28 UTC (rev 19938)
@@ -50,7 +50,10 @@

 		$page_savemode=$_POST['page_rad_opt'];
 		$page_pagetitle=$_POST['txt_pagetitle'];
 		$page_pagedesc=$_POST['txt_pagedesc'];
+		$page_pageextention=$_POST['txt_pageextent'];
+		$page_pageactive=$_POST['page_active'];
 		
+		
 		if ($page_langa == "") {
 			$page_langa = "all";
 		}
@@ -61,6 +64,13 @@
 		else {
 			$page_vis="0";
 		}
+
+		if ($page_pageactive == "yes") {
+			$page_pageactive="1";
+		}
+		else {
+			$page_pageactive="0";
+		}
 		
 		$page_data=$_POST['textarea_pages'];
 
@@ -73,6 +83,8 @@
 				`page_description` = '".
mysql_real_escape_string($page_pagedesc) ."',
 				`page_text` = '".
mysql_real_escape_string($page_data) ."',
 				`page_visible` = '".
mysql_real_escape_string($page_vis) ."',
+				`pages_extention` = '".
mysql_real_escape_string($page_pageextention) ."',
+				`page_active` = '".
mysql_real_escape_string($page_pageactive) ."',
 				`page_date` = CURDATE( ) ,
 				`page_time` = CURTIME( ) WHERE `page_id`
= '$rpm_db_id' LIMIT 1 ;";
 				//`page_active` = '1',
  _____  

Modified:
trunk/web/reactos.org/htdocs/roscms/inc/admin_user_accounts.php
--- trunk/web/reactos.org/htdocs/roscms/inc/admin_user_accounts.php
2005-12-06 19:43:53 UTC (rev 19937)
+++ trunk/web/reactos.org/htdocs/roscms/inc/admin_user_accounts.php
2005-12-06 19:57:28 UTC (rev 19938)
@@ -168,9 +168,62 @@

 	else {
 		echo '<a
href="?page=admin&amp;sec=users&amp;sec2=view&amp;sort=language&amp;filt
='.$rpm_filt.'&amp;opt='.$rpm_opt.'&amp;langid='.$rpm_lang_id.'">languag
e</a>';
 	}
+	echo ' | ';
+	if ($rpm_sort == "occupation") {	
+		echo '<b>occupation</b>';
+		$ros_cms_intern_users_sortby="user_occupation";
+		$ros_cms_intern_users_sort="ASC";
+	}
+	else {
+		echo '<a
href="?page=admin&amp;sec=users&amp;sec2=view&amp;sort=occupation&amp;fi
lt='.$rpm_filt.'&amp;opt='.$rpm_opt.'&amp;langid='.$rpm_lang_id.'">occup
ation</a>';
+	}
+	echo ' | ';
+	if ($rpm_sort == "counter") {	
+		echo '<b>counter</b>';
+		$ros_cms_intern_users_sortby="user_login_counter";
+		$ros_cms_intern_users_sort="DESC";
+	}
+	else {
+		echo '<a
href="?page=admin&amp;sec=users&amp;sec2=view&amp;sort=counter&amp;filt=
'.$rpm_filt.'&amp;opt='.$rpm_opt.'&amp;langid='.$rpm_lang_id.'">counter<
/a>';
+	}
 	echo '</p>';
 
 ?>
+
+<?php
+
+// Setting:
+$roscms_intern_items_per_page = 50;
+
+
+$roscms_SET_curpos = "";
+if (array_key_exists("curpos", $_GET))
$roscms_SET_curpos=htmlspecialchars($_GET["curpos"]);
+if (!$roscms_SET_curpos) {
+	$roscms_SET_curpos = 0;
+}
+
+$query_count_cat=mysql_query("SELECT COUNT('user_id') 
+								FROM
`users` 
+								WHERE
`user_account_enabled` = 'yes'
+								AND
`user_account_hidden` = 'no'
+								ORDER BY
`user_name` ASC ;");	
+$result_count_cat = mysql_fetch_row($query_count_cat);
+
+	echo "<p align='center'>";
+	$j=0;
+	for ($i=0; $i < $result_count_cat[0]; $i +=
$roscms_intern_items_per_page) {
+		$j++;
+		if ($roscms_SET_curpos == $i) {
+			echo "<b>".$j."</b> ";
+		}
+		else {
+			echo "<a
href='?page=admin&amp;sec=users&amp;sec2=view&amp;sort=".$rpm_sort."&amp
;filt=".$rpm_filt."&amp;opt=".$rpm_opt."&amp;langid=".$rpm_lang_id."&amp
;curpos=".$i."'>".$j."</a> ";
+		}
+	}
+	$j=0;
+	echo "</p>";
+
+?> 
   <table width="100%" border="0" cellpadding="1"
cellspacing="1">
     <tr bgcolor="#5984C3"> 
       <td width="9%"> <div align="center"><font
color="#FFFFFF"
face="Arial, Helvetica,
sans-serif"><strong>Action</strong></font></div></td>
@@ -192,13 +245,13 @@
 		$query_page = mysql_query("SELECT * 
 				FROM users
 				$ros_cms_intern_users_filt
$ros_cms_intern_users_lang
-				ORDER BY '$ros_cms_intern_users_sortby'
$ros_cms_intern_users_sort") ;
+				ORDER BY '$ros_cms_intern_users_sortby'
$ros_cms_intern_users_sort LIMIT ". $roscms_SET_curpos ." , ".
$roscms_intern_items_per_page ." ;") ;
 	}
 	else {
 		$query_page = mysql_query("SELECT * 
 				FROM users
 				$ros_cms_intern_users_filt AND
user_account_hidden != 0 $ros_cms_intern_users_lang
-				ORDER BY '$ros_cms_intern_users_sortby'
$ros_cms_intern_users_sort") ;
+				ORDER BY '$ros_cms_intern_users_sortby'
$ros_cms_intern_users_sort LIMIT ". $roscms_SET_curpos ." , ".
$roscms_intern_items_per_page ." ;") ;
 	}
 
 	$farbe1=$roscms_intern_color1;
@@ -220,8 +273,8 @@
 
echo $farbe2;
 
$farbe = $farbe2;
 								}
-							 ?>"
title="RosCMS action buttons:&#10;&#10;* View account&#10;* Delete
account&#10;* Email&#10;* Website"> 
-        <div align="center"><img src="images/view.gif"
alt="View"
width="19" height="18" border="0">&nbsp; 
+							 ?>"> 
+        <div align="center"><a href="<?php echo
"?page=user&amp;sec=profil&amp;sec2=".$result_page['user_id'];
?>"><img
src="images/view.gif" alt="Profil" width="19"
height="18"
border="0"></a>&nbsp; 
           <?php
 		if ($result_page['user_email'] != "") {
 		?>
@@ -289,6 +342,20 @@
 	}	// end while
 ?>
   </table>
+<p align="center"><b><?php
+
+	echo ($roscms_SET_curpos+1)." to ";
+
+	if (($roscms_SET_curpos + $roscms_intern_items_per_page) >
$result_count_cat[0]) {
+		echo $result_count_cat[0];
+	}
+	else {
+		echo ($roscms_SET_curpos +
$roscms_intern_items_per_page);
+	}
+		
+	echo " of ".$result_count_cat[0]; 
+	
+?></b></p>
   <?php
   	$roscms_infotable = "user";
 	include("inc/inc_description_table.php");
  _____  

Added:
trunk/web/reactos.org/htdocs/roscms/inc/admin_user_group_members.php
--- trunk/web/reactos.org/htdocs/roscms/inc/admin_user_group_members.php
2005-12-06 19:43:53 UTC (rev 19937)
+++ trunk/web/reactos.org/htdocs/roscms/inc/admin_user_group_members.php
2005-12-06 19:57:28 UTC (rev 19938)
@@ -0,0 +1,251 @@

+<?php
+
+	// To prevent hacking activity:
+	if ( !defined('ROSCMS_SYSTEM') OR
!defined('ROSCMS_SYSTEM_ADMIN') )
+	{
+		if ( !defined('ROSCMS_SYSTEM_LOG') ) {
+			define ("ROSCMS_SYSTEM_LOG", "Hacking attempt");
+		}
+		$seclog_section="roscms_admin_interface";
+		$seclog_level="50";
+		$seclog_reason="Hacking attempt: admin_users.php";
+		define ("ROSCMS_SYSTEM", "Hacking attempt");
+		include('securitylog.php'); // open security log
+		die("Hacking attempt");
+	}
+
+?> 
+<div class="contentSmall"> <span
class="contentSmallTitle">Admin
Interface - Group Members</span> 
+  <ul>
+    <li><strong>Group Members</strong></li>
+  </ul>
+  <p>Action: <a
href="?page=admin&amp;sec=usrgrpmbr&amp;sec2=add&amp;sec3=new&amp;db_id=
new">New Membership</a> | <a
href="?page=admin&sec=usrgrpmbr&sec2=view">reset 
+    filters & sort</a></p>
+  <?php
+
+
+	if ($rpm_lang_id == "") {
+		$rpm_lang_id="all";
+	}
+	//echo '<p>Language: ';
+	//echo '<b>All</b>';
+	$ros_cms_intern_users_lang = " ";
+	//echo '</p>';
+
+	if ($rpm_filt == "") {
+		$rpm_filt="active";
+	}
+	//echo '<p>Filter: ';
+	//echo '<b>active</b>';
+	$ros_cms_intern_users_filt = " ";
+	//echo '</p>';
+
+	if ($rpm_filt == "") {
+		$rpm_filt="active";
+	}
+	echo '<p>Filter: ';
+	if ($rpm_filt == "active") {	
+		echo '<b>all</b>';
+		$ros_cms_intern_users_filt = " ";
+	}
+	else {
+		echo '<a
href="?page=admin&amp;sec=usrgrpmbr&amp;sec2=view&amp;sort='.$rpm_sort.'
&amp;filt=active&amp;langid='.$rpm_lang_id.'">all</a>';
+	}
+	echo ' | ';
+	if ($rpm_filt == "sadmin") {	
+		echo '<b>super admin</b>';
+		$ros_cms_intern_users_filt = " WHERE
`usergroupmember_usergroupid` = 'ros_sadmin' ";
+	}
+	else {
+		echo '<a
href="?page=admin&amp;sec=usrgrpmbr&amp;sec2=view&amp;sort='.$rpm_sort.'
&amp;filt=sadmin&amp;langid='.$rpm_lang_id.'">super
admin</a>';
+	}
+	echo ' | ';
+	if ($rpm_filt == "admin") {	
+		echo '<b>admin</b>';
+		$ros_cms_intern_users_filt = " WHERE
`usergroupmember_usergroupid` = 'ros_admin' ";
+	}
+	else {
+		echo '<a
href="?page=admin&amp;sec=usrgrpmbr&amp;sec2=view&amp;sort='.$rpm_sort.'
&amp;filt=admin&amp;langid='.$rpm_lang_id.'">admin</a>';
+	}
+	echo ' | ';
+	if ($rpm_filt == "dev") {	
+		echo '<b>developer</b>';
+		$ros_cms_intern_users_filt = " WHERE
`usergroupmember_usergroupid` = 'developer' ";
+	}
+	else {
+		echo '<a
href="?page=admin&amp;sec=usrgrpmbr&amp;sec2=view&amp;sort='.$rpm_sort.'
&amp;filt=dev&amp;langid='.$rpm_lang_id.'">developer</a>';
+	}
+	echo ' | ';
+	if ($rpm_filt == "mod") {	
+		echo '<b>moderator</b>';
+		$ros_cms_intern_users_filt = " WHERE
`usergroupmember_usergroupid` = 'moderator' ";
+	}
+	else {
+		echo '<a
href="?page=admin&amp;sec=usrgrpmbr&amp;sec2=view&amp;sort='.$rpm_sort.'
&amp;filt=mod&amp;langid='.$rpm_lang_id.'">moderator</a>';
+	}
+	echo ' | ';
+	if ($rpm_filt == "trans") {	
+		echo '<b>translator</b>';
+		$ros_cms_intern_users_filt = " WHERE
`usergroupmember_usergroupid` = 'translator' ";
+	}
+	else {
+		echo '<a
href="?page=admin&amp;sec=usrgrpmbr&amp;sec2=view&amp;sort='.$rpm_sort.'
&amp;filt=trans&amp;langid='.$rpm_lang_id.'">translator</a>';
+	}
+	echo ' | ';
+	if ($rpm_filt == "user") {	
+		echo '<b>normal user</b>';
+		$ros_cms_intern_users_filt = " WHERE
`usergroupmember_usergroupid` = 'user' ";
+	}
+	else {
+		echo '<a
href="?page=admin&amp;sec=usrgrpmbr&amp;sec2=view&amp;sort='.$rpm_sort.'
&amp;filt=user&amp;langid='.$rpm_lang_id.'">normal
user</a>';
+	}
+
+	if ($rpm_sort == "") {
+		$rpm_sort="id";
+	}
+	echo '<p>Sorted by: ';
+	if ($rpm_sort == "id") {	
+		echo '<b>user ID</b>';
+		$ros_cms_intern_users_sortby="usergroupmember_userid";
+		$ros_cms_intern_users_sort="ASC";
+	}
+	else {
+		echo '<a
href="?page=admin&amp;sec=usrgrpmbr&amp;sec2=view&amp;sort=id&amp;filt='
.$rpm_filt.'&amp;opt='.$rpm_opt.'&amp;langid='.$rpm_lang_id.'">user
ID</a>';
+	}
+	echo ' | ';
+	if ($rpm_sort == "group") {	
+		echo '<b>group ID</b>';
+
$ros_cms_intern_users_sortby="usergroupmember_usergroupid";
+		$ros_cms_intern_users_sort="ASC";
+	}
+	else {
+		echo '<a
href="?page=admin&amp;sec=usrgrpmbr&amp;sec2=view&amp;sort=group&amp;fil
t='.$rpm_filt.'&amp;opt='.$rpm_opt.'&amp;langid='.$rpm_lang_id.'">group
ID</a>';
+	}
+	echo '</p>';
+
+?>
+<?php
+
+// Setting:
+$roscms_intern_items_per_page = 50;
+
+
+$roscms_SET_curpos = "";
+if (array_key_exists("curpos", $_GET))
$roscms_SET_curpos=htmlspecialchars($_GET["curpos"]);
+if (!$roscms_SET_curpos) {
+	$roscms_SET_curpos = 0;
+}
+
+$query_count_cat=mysql_query("SELECT COUNT('usergroupmember_userid') 
+								FROM
`usergroup_members` 
+								" .
$ros_cms_intern_users_filt . "
+								ORDER BY
`usergroupmember_userid` ASC ;");	
+$result_count_cat = mysql_fetch_row($query_count_cat);
+
+	echo "<p align='center'>";
+	$j=0;
+	for ($i=0; $i < $result_count_cat[0]; $i +=
$roscms_intern_items_per_page) {
+		$j++;
+		if ($roscms_SET_curpos == $i) {
+			echo "<b>".$j."</b> ";
+		}
+		else {
+			echo "<a
href='?page=admin&amp;sec=usrgrpmbr&amp;sec2=view&amp;sort=".$rpm_sort."
&amp;filt=".$rpm_filt."&amp;opt=".$rpm_opt."&amp;langid=".$rpm_lang_id."
&amp;curpos=".$i."'>".$j."</a> ";
+		}
+	}
+	$j=0;
+	echo "</p>";
+
+?>  
+<table width="100%" border="0" cellpadding="1"
cellspacing="1">
+    <tr bgcolor="#5984C3"> 
+      <td width="6%"> 
+        <div align="center"><font color="#FFFFFF"
face="Arial,
Helvetica,
sans-serif"><strong>Action</strong></font></div></td>
+      <td width="4%" bgcolor="#5984C3"> 
+        <div align="center"><font color="#FFFFFF"
face="Arial,
Helvetica,
sans-serif"><strong>ID</strong></font></div></td>
+      <td width="20%" bgcolor="#5984C3"> 
+        <div align="center"><font color="#FFFFFF"
face="Arial,
Helvetica,
sans-serif"><strong>Nick</strong></font></div></td>
+      <td width="20%"> 
+        <div align="center"><font color="#FFFFFF"
face="Arial,
Helvetica,
sans-serif"><strong>Usergroup</strong></font></div></td>
+      <td width="50%" bgcolor="#5984C3"> 
+        <div align="center"><font color="#FFFFFF"
face="Arial,
Helvetica, sans-serif"><strong>Usergroup 
+          description</strong></font></div></td>
+    </tr>
+    <?php
+
+	if($roscms_intern_account_level==100) {
+		$query_page = mysql_query("SELECT * 
+				FROM usergroup_members
+				$ros_cms_intern_users_filt
$ros_cms_intern_users_lang
+				ORDER BY '$ros_cms_intern_users_sortby'
$ros_cms_intern_users_sort  LIMIT ". $roscms_SET_curpos ." , ".
$roscms_intern_items_per_page ." ;") ;
+	}
+	else {
+		$query_page = mysql_query("SELECT * 
+				FROM usergroup_members
+				$ros_cms_intern_users_filt AND
user_account_hidden != 0 $ros_cms_intern_users_lang
+				ORDER BY '$ros_cms_intern_users_sortby'
$ros_cms_intern_users_sort  LIMIT ". $roscms_SET_curpos ." , ".
$roscms_intern_items_per_page ." ;") ;
+	}
+
+	$farbe1="#E2E2E2";
+	$farbe2="#EEEEEE";
+	$zaehler="0";
+	//$farbe="#CCCCC";
+	
+	while($result_page = mysql_fetch_array($query_page)) { // users
+?>
+    <tr> 
+      <td width="9%" valign="middle" bgcolor="<?php
+
$zaehler++;
+								if
($zaehler == "1") {
+
echo $farbe1;
+
$farbe = $farbe1;
+								}
+								elseif
($zaehler == "2") {
+
$zaehler="0";
+
echo $farbe2;
+
$farbe = $farbe2;
+								}
+							 ?>"> 
+        <div align="center"><a
href="?page=admin&amp;sec=usrgrpmbr&amp;sec2=edit&amp;sec3=<?php echo
$result_page['usergroupmember_usergroupid']; ?>&amp;db_id=<?php echo
$result_page['usergroupmember_userid']; ?>"><img
src="images/view.gif"
alt="Edit Membership" width="19" height="18"
border="0"></a>&nbsp;<a
href="?page=admin&amp;sec=usrgrpmbr&amp;sec2=add&amp;sec3=new&amp;db_id=
<?php echo $result_page['usergroupmember_userid']; ?>"><img
src="images/tool.gif" alt="Add Membership" width="19"
height="18"
border="0"></a>&nbsp;<a
href="?page=admin&amp;sec=usrgrpmbr&amp;sec2=delete&amp;sec3=<?php
echo
$result_page['usergroupmember_usergroupid']; ?>&amp;db_id=<?php echo
$result_page['usergroupmember_userid']; ?>"><img
src="images/delete.gif"
alt="Add Membership" width="19" height="18"
border="0"></a></div></td>
+      <td width="7%" valign="middle" bgcolor="<?php echo
$farbe; ?>">
<div align="center"><font face="Arial, Helvetica,
sans-serif"><?php echo
"<b>".$result_page['usergroupmember_userid']."</b>";
?></font></div></td>
+      <td width="10%" valign="middle" bgcolor="<?php echo
$farbe;
?>"><font face="Arial, Helvetica, sans-serif"><?php
+		$query_usra = mysql_query("SELECT user_id, user_name
FROM users WHERE user_id =
'".$result_page['usergroupmember_userid']."'") or
die('DB error
(membership script)!');
+		$result_usra = mysql_fetch_array($query_usra); // or
die('DB error (show_sessions script)');
+	  
+	   echo $result_usra['user_name']." <a
href='?page=user&amp;sec=profil&amp;sec2=".$result_page['usergroupmember
_userid']."'>[Profil]</a>"; ?> 
+        </font></td>
+      <td width="13%" valign="middle" bgcolor="<?php echo
$farbe; ?>"
title="<?php echo $result_page['usergroupmember_usergroupid'];
?>"><div
align="left"><font face="Arial, Helvetica, sans-serif"> 
+          <?php
+		//echo "SELECT usrgroup_name_id, usrgroup_name FROM
usergroups WHERE usrgroup_name_id =
'".$result_page['usergroupmember_usergroupid']."'<br>";
+		$query_grpb = mysql_query("SELECT usrgroup_name_id,
usrgroup_name, usrgroup_description FROM usergroups WHERE
usrgroup_name_id =
'".$result_page['usergroupmember_usergroupid']."'")
or die('DB error (membership script)!');
+		$result_grpb = mysql_fetch_array($query_grpb) or die('DB
error (membership script)');
+	  
+		echo $result_grpb['usrgroup_name']; 
+		 ?>
+          </font></div></td>
+      <td width="15%" valign="middle" bgcolor="<?php echo
$farbe; ?>">
<font face="Arial, Helvetica, sans-serif"><?php
+		echo
substr(htmlentities($result_grpb['usrgroup_description'], ENT_QUOTES),
0, 50)."...";
+		?></font></tr>
+    <?php	
+	}	// end while
+?>
+  </table>
+<p align="center"><b><?php
+
+	echo ($roscms_SET_curpos+1)." to ";
+
+	if (($roscms_SET_curpos + $roscms_intern_items_per_page) >
$result_count_cat[0]) {
+		echo $result_count_cat[0];
+	}
+	else {
+		echo ($roscms_SET_curpos +
$roscms_intern_items_per_page);
+	}
+		
+	echo " of ".$result_count_cat[0]; 
+	
+?></b></p>
+  <?php
+  	$roscms_infotable = "user";
+	include("inc/inc_description_table.php");
+?>
+</div>
Property changes on:
trunk/web/reactos.org/htdocs/roscms/inc/admin_user_group_members.php
___________________________________________________________________
Name: svn:eol-style
   + native
  _____  

Added:
trunk/web/reactos.org/htdocs/roscms/inc/admin_user_group_members_edit.ph
p
---
trunk/web/reactos.org/htdocs/roscms/inc/admin_user_group_members_edit.ph
p	2005-12-06 19:43:53 UTC (rev 19937)
+++
trunk/web/reactos.org/htdocs/roscms/inc/admin_user_group_members_edit.ph
p	2005-12-06 19:57:28 UTC (rev 19938)
@@ -0,0 +1,176 @@

+<?php
+if ($rpm_sec2=="delete") {
+?>
+<div class="contentSmall"> <span
class="contentSmallTitle">Admin
Interface - Group Members - Delete Membership</span> 
+  <ul>
+    <li><strong><a
href="?page=admin&amp;sec=usrgrpmbr&amp;sec2=view">Group
Members</a></strong> 
+      <ul>
+        <li>Delete Membership</li>
+      </ul>
+    </li>
+  </ul>
+<?php
+		$spdas="DELETE FROM `usergroup_members` WHERE
`usergroupmember_userid` = ".mysql_real_escape_string($rpm_db_id)." AND
`usergroupmember_usergroupid` =
'".mysql_real_escape_string($rpm_sec3)."' LIMIT 1;";
+		$spdaslists=mysql_query($spdas);
+		echo "<p>The group membership '".$rpm_sec3."' for the
user '".$rpm_db_id."' has been deleted!</p>";
+}
+else {
+?>
+
+<div class="contentSmall"> <span
class="contentSmallTitle">Admin
Interface - Group Members - <?php if ($rpm_sec2=="edit") { echo
"Edit";
} elseif ($rpm_sec2=="add") { echo "Add"; } ?>
Membership</span> 
+  <ul>
+    <li><strong><a
href="?page=admin&amp;sec=usrgrpmbr&amp;sec2=view">Group
Members</a></strong> 
+      <ul>
+        <li><?php if ($rpm_sec2=="edit") { echo "Edit"; }
elseif
($rpm_sec2=="add") { echo "Add"; } ?> Membership</li>
+      </ul>
+    </li>
+  </ul>
+<?php
+
+	$query_contenta = mysql_query("SELECT * FROM users WHERE user_id
= '".$roscms_intern_account_id."'") ;
+
+	$farbe="#E2E2E2";
+	
+	$result_contenta = mysql_fetch_array($query_contenta);
+	
+	if ($rpm_sec2=="save") {
+		$save_account_member_usrid="";
+		$save_account_member_usrgrp="";
+		
+		if (array_key_exists("usrid", $_POST))
$save_account_member_usrid=$_POST['usrid'];
+		if (array_key_exists("usrgrp", $_POST))
$save_account_member_usrgrp=$_POST['usrgrp'];
+
+		if ($save_account_member_usrgrp == "ros_sadmin" &&
$roscms_intern_usrgrp_sadmin != true) {
+			die("Not possible! You will need a higher
account membership level!");
+		}
+		if ($save_account_member_usrgrp == "ros_admin" &&
($roscms_intern_usrgrp_sadmin != true || $roscms_intern_usrgrp_admin !=
true)) {
+			die("Not possible! You will need a higher
account membership level!");
+		}		
+
+		if ($save_account_member_usrid &&
$save_account_member_usrgrp && $rpm_sec3) {
+			$content_posta="UPDATE `usergroup_members` SET
`usergroupmember_usergroupid` = '".
mysql_real_escape_string($save_account_member_usrgrp) ."'
+								WHERE
`usergroupmember_userid` =".
mysql_real_escape_string($save_account_member_usrid) ."
+								AND
CONVERT( `usergroupmember_usergroupid` USING utf8 ) = '".
mysql_real_escape_string($rpm_sec3) ."'
+								LIMIT 1
;";
+			$content_post_lista=mysql_query($content_posta);
+			echo "<p><b>saved</b></p>";
+			$rpm_db_id = $save_account_member_usrid;
+		}
+	}
+	if ($rpm_sec2=="insert") {
+		$save_account_member_usrid="";
+		$save_account_member_usrgrp="";
+		$save_account_member_usridname="";
+		
+		if (array_key_exists("usrid", $_POST))
$save_account_member_usrid=$_POST['usrid'];
+		if (array_key_exists("usridname", $_POST))
$save_account_member_usridname=$_POST['usridname'];
+		if (array_key_exists("usrgrp", $_POST))
$save_account_member_usrgrp=$_POST['usrgrp'];
+		
+		if ($save_account_member_usridname == "1") {
+			$accountinfo_query = @mysql_query("SELECT
user_name, user_id FROM users WHERE user_name =
'".mysql_real_escape_string($save_account_member_usrid)."'") or
die('DB
error (admin group members edit interface)!');
+			$accountinfo_result =
@mysql_fetch_array($accountinfo_query);
+			if ($accountinfo_result['user_id']) {
+				$save_account_member_usrid =
$accountinfo_result['user_id'];
+			}
+			else {
+				die("<blink>Username not
found!</blink>");
+			}
+		}
+		
+		if ($save_account_member_usrgrp == "ros_sadmin" &&
$roscms_intern_usrgrp_sadmin != true) {
+			die("Not possible! You will need a higher
account membership level!");
+		}
+		if ($save_account_member_usrgrp == "ros_admin" &&
($roscms_intern_usrgrp_sadmin != true || $roscms_intern_usrgrp_admin !=
true)) {
+			die("Not possible! You will need a higher
account membership level!");
+		}
+		
+		if ($save_account_member_usrid &&
$save_account_member_usrgrp && $rpm_sec3) {
+			$content_postb="INSERT INTO `usergroup_members`
( `usergroupmember_userid` , `usergroupmember_usergroupid` ) 
+							VALUES (
+							'".
mysql_real_escape_string($save_account_member_usrid) ."', '".
mysql_real_escape_string($save_account_member_usrgrp) ."') ;";
+			$content_post_listb=mysql_query($content_postb);
+			echo "<p><b>saved
(".$save_account_member_usrid." ->
".$save_account_member_usrgrp.")</b></p>";
+			$rpm_db_id = $save_account_member_usrid;
+		}
+	}
+?>
+  <form name="cms_content" method="post"
action="?page=admin&amp;sec=usrgrpmbr&amp;sec2=<?php if
($rpm_sec2=="edit") { echo "save"; } elseif
($rpm_sec2=="add") { echo
"insert"; } ?>&amp;sec3=<?php echo $rpm_sec3; ?>">
+    <table width="600" border="0" cellpadding="1"
cellspacing="1">
+      <tr> 
+        <td width="15%" valign="top"
bgcolor="#5984C3"><div
align="center"><font color="#FFFFFF" face="Arial,
Helvetica,
sans-serif"><strong>User 
+            ID </strong></font></div></td>
+        <td width="85%" valign="top"
bgcolor="#E2E2E2"><font
face="Arial, Helvetica, sans-serif"> 
+		<?php
+			if ($rpm_db_id == "new") {
+		?>
+		  <input name="usrid" type="text" id="usrid"
size="30"
maxlength="50">
+		  <input name="usridname" type="hidden"
id="usridname"
value="1">
+		  <?php
+			}
+			else {
+				$query_usra = mysql_query("SELECT
user_id, user_name FROM users WHERE user_id = '". $rpm_db_id ."'")
or
die('DB error (admin membership script)!');
+				$result_usra =
mysql_fetch_array($query_usra); // or die('DB error
(user_group_members_edit)');		  
+				
+				echo "<b>".$rpm_db_id."</b>
(".$result_usra['user_name'].")"; ?> 
+				<input name="usrid" type="hidden"
id="usrid" value="<?php echo $rpm_db_id; ?>">
+		<?php 
+			}
+		?>
+        </font></td>
+      </tr>
+      <tr> 
+        <td valign="top" bgcolor="#5984C3"><div
align="center"><font
color="#FFFFFF" face="Arial, Helvetica,
sans-serif"><strong>Usergroup</strong></font></div></td>
+        <td valign="top" bgcolor="#EEEEEE"><font
face="Arial,
Helvetica, sans-serif"> 
+          <select id="usrgrp" size="1" name="usrgrp"
class="selectbox">
+            <?php 
+				$sql_lang="SELECT * 
+							FROM
`usergroup_members` 
+							WHERE
`usergroupmember_userid` = ". $rpm_db_id ."
+							AND
`usergroupmember_usergroupid` = '". $rpm_sec3 ."'
+							LIMIT 1 ";
+				$sql_query_lang=mysql_query($sql_lang);
+
$myrow_lang=mysql_fetch_array($sql_query_lang); // Languages
+			?>
+            <optgroup label="usergroups"> 
+            <?php
+			  
+		// User Groups
+		$sql_langa="SELECT * 
+					FROM `usergroups` 
+					ORDER BY
`usrgroup_securitylevel` ASC ";
+		$sql_query_langa=mysql_query($sql_langa);
+		while($myrow_langa=mysql_fetch_array($sql_query_langa))
{
+              echo '<option
value="'.$myrow_langa['usrgroup_name_id'].'"';
+			  //echo
"<br>=>".$myrow_lang['usergroupmember_userid']." ==
".$myrow_langa['usrgroup_name_id'];
+			  if ($myrow_lang['usergroupmember_usergroupid']
== $myrow_langa['usrgroup_name_id']) {
+					echo ' selected="selected"';
+			  }
+			  echo
'>'.$myrow_langa['usrgroup_name'].'</option>';
+		}
+              ?>
+            </optgroup>
+          </select>
+          </font></td>
+      </tr>
+    </table>
+      <br />
+      <input type="submit" name="Submit"
value="Save">
+  </form>
+  <p>&nbsp;</p>
+    <?php
+	if ($rpm_db_id != "new") {
+
+		echo "<p><b>".$result_usra['user_name']." is
currently
member of the following usergroups:</b></p><ul>";
+	
+		$query_page = mysql_query("SELECT * 
+
FROM `usergroup_members` 
+
WHERE `usergroupmember_userid` = $rpm_db_id 
+
ORDER BY `usergroupmember_usergroupid` ASC ;") ;
+		while($result_page = mysql_fetch_array($query_page)) {
+			echo
"<li>".$result_page['usergroupmember_usergroupid']."</li>";
+		}
+		echo "</ul>";
+	 }
+}
+?>
+</div>
Property changes on:
trunk/web/reactos.org/htdocs/roscms/inc/admin_user_group_members_edit.ph
p
___________________________________________________________________
Name: svn:eol-style
   + native
  _____  

Deleted:
trunk/web/reactos.org/htdocs/roscms/inc/admin_user_group_memebers.php
---
trunk/web/reactos.org/htdocs/roscms/inc/admin_user_group_memebers.php
2005-12-06 19:43:53 UTC (rev 19937)
+++
trunk/web/reactos.org/htdocs/roscms/inc/admin_user_group_memebers.php
2005-12-06 19:57:28 UTC (rev 19938)
@@ -1,164 +0,0 @@

-<?php
-    /*
-    RosCMS - ReactOS Content Management System
-    Copyright (C) 2005  Klemens Friedl &lt;frik85(a)reactos.org&gt;
-
-    This program 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.
-
-    This program 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 this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-    */
-
-	// To prevent hacking activity:
-	if ( !defined('ROSCMS_SYSTEM') OR
!defined('ROSCMS_SYSTEM_ADMIN') )
-	{
-		if ( !defined('ROSCMS_SYSTEM_LOG') ) {
-			define ("ROSCMS_SYSTEM_LOG", "Hacking attempt");
-		}
-		$seclog_section="roscms_admin_interface";
-		$seclog_level="50";
-		$seclog_reason="Hacking attempt: admin_users.php";
-		define ("ROSCMS_SYSTEM", "Hacking attempt");
-		include('securitylog.php'); // open security log
-		die("Hacking attempt");
-	}
-
-?> 
-<div class="contentSmall"> <span
class="contentSmallTitle">Admin
Interface - Group Members</span> 
-  <ul>
-    <li><strong>Group Members</strong></li>
-  </ul>
-
-
-  <p>Action: <a href="#">New Membership</a> | <a
href="?page=admin&sec=usrgrpmbr&sec2=view">reset 
-    filters & sort</a></p>
-<?php
-
-
-	if ($rpm_lang_id == "") {
-		$rpm_lang_id="all";
-	}
-	echo '<p>Language: ';
-	echo '<b>All</b>';
-	$ros_cms_intern_users_lang = " ";
-	echo '</p>';
-
-	if ($rpm_filt == "") {
-		$rpm_filt="active";
-	}
-	echo '<p>Filter: ';
-	echo '<b>active</b>';
-	$ros_cms_intern_users_filt = " ";
-	echo '</p>';
-
-	if ($rpm_sort == "") {
-		$rpm_sort="id";
-	}
-	echo '<p>Sorted by: ';
-	if ($rpm_sort == "id") {	
-		echo '<b>user ID</b>';
-		$ros_cms_intern_users_sortby="usergroupmember_userid";
-		$ros_cms_intern_users_sort="ASC";
-	}
-	else {
-		echo '<a
href="?page=admin&amp;sec=usrgrpmbr&amp;sec2=view&amp;sort=id&amp;filt='
.$rpm_filt.'&amp;opt='.$rpm_opt.'&amp;langid='.$rpm_lang_id.'">user
ID</a>';
-	}
-	echo ' | ';
-	if ($rpm_sort == "group") {	
-		echo '<b>group ID</b>';
-
$ros_cms_intern_users_sortby="usergroupmember_usergroupid";
-		$ros_cms_intern_users_sort="ASC";
-	}
-	else {
-		echo '<a
href="?page=admin&amp;sec=usrgrpmbr&amp;sec2=view&amp;sort=group&amp;fil
t='.$rpm_filt.'&amp;opt='.$rpm_opt.'&amp;langid='.$rpm_lang_id.'">group
ID</a>';
-	}
-	echo '</p>';
-
-?>
-  <table width="100%" border="0" cellpadding="1"
cellspacing="1">
-    <tr bgcolor="#5984C3"> 
-      <td width="6%"> 
-        <div align="center"><font color="#FFFFFF"
face="Arial,
Helvetica,
sans-serif"><strong>Action</strong></font></div></td>
-      <td width="4%" bgcolor="#5984C3"> 
-        <div align="center"><font color="#FFFFFF"
face="Arial,
Helvetica,
sans-serif"><strong>ID</strong></font></div></td>
-      <td width="20%" bgcolor="#5984C3"> 
-        <div align="center"><font color="#FFFFFF"
face="Arial,
Helvetica,
sans-serif"><strong>Nick</strong></font></div></td>
-      <td width="20%"> 
-        <div align="center"><font color="#FFFFFF"
face="Arial,
Helvetica,
sans-serif"><strong>Usergroup</strong></font></div></td>
-      <td width="50%" bgcolor="#5984C3"> 
-        <div align="center"><font color="#FFFFFF"
face="Arial,
Helvetica, sans-serif"><strong>Usergroup 
-          description</strong></font></div></td>
-    </tr>
-    <?php
-
-	if($roscms_intern_account_level==100) {
-		$query_page = mysql_query("SELECT * 
-				FROM usergroup_members
-				$ros_cms_intern_users_filt
$ros_cms_intern_users_lang
-				ORDER BY '$ros_cms_intern_users_sortby'
$ros_cms_intern_users_sort") ;
-	}
-	else {
-		$query_page = mysql_query("SELECT * 
-				FROM usergroup_members
-				$ros_cms_intern_users_filt AND
user_account_hidden != 0 $ros_cms_intern_users_lang
-				ORDER BY '$ros_cms_intern_users_sortby'
$ros_cms_intern_users_sort") ;
-	}
-
-	$farbe1=$roscms_intern_color1;
-	$farbe2=$roscms_intern_color2;
-	$zaehler="0";
-	//$farbe="#CCCCC";
-	
-	while($result_page = mysql_fetch_array($query_page)) { // users
-?>
-    <tr> 
-      <td width="9%" valign="middle" bgcolor="<?php
-
$zaehler++;
-								if
($zaehler == "1") {
-
echo $farbe1;
-
$farbe = $farbe1;
-								}
-								elseif
($zaehler == "2") {
-
$zaehler="0";
-
echo $farbe2;
-
$farbe = $farbe2;
-								}
-							 ?>"
title="RosCMS action buttons:&#10;&#10;* View account&#10;* Delete
account&#10;* Email&#10;* Website"> 
-        <div align="center"><img src="images/view.gif"
alt="View"
width="19" height="18"
border="0"></div></td>
-      <td width="7%" valign="middle" bgcolor="<?php echo
$farbe; ?>">
<div align="center"><font face="Arial, Helvetica,
sans-serif"><?php echo
"<b>".$result_page['usergroupmember_userid']."</b>";
?></font></div></td>
-      <td width="10%" valign="middle" bgcolor="<?php echo
$farbe;
?>"><font face="Arial, Helvetica, sans-serif"><?php
-		$query_usra = mysql_query("SELECT user_id, user_name
FROM users WHERE user_id =
'".$result_page['usergroupmember_userid']."'") or
die('DB error
(membership script)!');
-		$result_usra = mysql_fetch_array($query_usra) or die('DB
error (show_sessions script)');
-	  
-	   echo $result_usra['user_name']; ?> 
-        </font></td>
-      <td width="13%" valign="middle" bgcolor="<?php echo
$farbe; ?>"
title="<?php echo $result_page['usergroupmember_usergroupid'];
?>"><div
align="left"><font face="Arial, Helvetica, sans-serif"> 
-          <?php
-		//echo "SELECT usrgroup_name_id, usrgroup_name FROM
usergroups WHERE usrgroup_name_id =
'".$result_page['usergroupmember_usergroupid']."'<br>";
-		$query_grpb = mysql_query("SELECT usrgroup_name_id,
usrgroup_name, usrgroup_description FROM usergroups WHERE
usrgroup_name_id =
'".$result_page['usergroupmember_usergroupid']."'")
or die('DB error (membership script)!');
-		$result_grpb = mysql_fetch_array($query_grpb) or die('DB
error (membership script)');
-	  
-		echo $result_grpb['usrgroup_name']; 
-		 ?>
-          </font></div></td>
-      <td width="15%" valign="middle" bgcolor="<?php echo
$farbe; ?>">
<font face="Arial, Helvetica, sans-serif"><?php
-		echo
substr(htmlentities($result_grpb['usrgroup_description'], ENT_QUOTES),
0, 50)."...";
-		?></font></tr>
-    <?php	
-	}	// end while
-?>
-  </table>
-  <?php
-  	$roscms_infotable = "user";
-	include("inc/inc_description_table.php");
-?>
-</div>
  _____  

Modified:
trunk/web/reactos.org/htdocs/roscms/inc/inc_description_table.php
--- trunk/web/reactos.org/htdocs/roscms/inc/inc_description_table.php
2005-12-06 19:43:53 UTC (rev 19937)
+++ trunk/web/reactos.org/htdocs/roscms/inc/inc_description_table.php
2005-12-06 19:57:28 UTC (rev 19938)
@@ -30,7 +30,7 @@

     <td width="50%" valign="top"> <table
width="100%" border="0">
         <tr> 
           <td width="25" valign="top"><img
src="images/view.gif"
width="19" height="18" border="0"></td>
-          <td valign="middle"><font
size="1"><strong>View</strong>
entry</font></td>
+          <td valign="middle"><font
size="1"><strong>View/Edit</strong>
entry</font></td>
         </tr>
         <tr> 
           <td valign="top"><img src="images/tool.gif"
width="19"
height="18" border="0"></td>
@@ -96,8 +96,12 @@
     <td width="50%" valign="top"> <table
width="100%" border="0">
         <tr> 
           <td width="25" valign="top"><img
src="images/view.gif"
width="19" height="18" border="0"></td>
-          <td valign="middle"><font
size="1"><strong>View</strong>
entry</font></td>
+          <td valign="middle"><font
size="1"><strong>View/Edit</strong>
entry</font></td>
         </tr>
+        <tr>
+          <td valign="top"><img src="images/tool.gif"
width="19"
height="18" border="0"></td>
+          <td valign="middle"><font
size="1"><strong>Add</strong>
entry</font></td>
+        </tr>
         <tr> 
           <td valign="top"><img src="images/delete.gif"
width="19"
height="18"></td>
           <td valign="middle"><font
size="1"><strong>Delete</strong>
entry</font></td>
  _____  

Modified: trunk/web/reactos.org/htdocs/roscms/inc/website_status.php
--- trunk/web/reactos.org/htdocs/roscms/inc/website_status.php
2005-12-06 19:43:53 UTC (rev 19937)
+++ trunk/web/reactos.org/htdocs/roscms/inc/website_status.php
2005-12-06 19:57:28 UTC (rev 19938)
@@ -40,7 +40,7 @@

     <td width="200">
     <div align="center"><font color="#FFFFFF"
face="Arial, Helvetica,
sans-serif"><strong>Title</strong></font></div></td>
     <td width="250"><div align="center"><font
color="#FFFFFF"
face="Arial, Helvetica,
sans-serif"><strong>Description</strong></font></div></td>
-    <td width="150"><div align="center"><font
color="#FFFFFF"
face="Arial, Helvetica,
sans-serif"><strong>Filename</strong></font></div></td>
+    <td width="200"><div align="center"><font
color="#FFFFFF"
face="Arial, Helvetica,
sans-serif"><strong>Name</strong></font></div></td>
     <td width="150">
     <div align="center"><font color="#FFFFFF"
face="Arial, Helvetica,
sans-serif"><strong>Language</strong></font></div></td>
     <td width="150"><div align="center"><font
color="#FFFFFF"
face="Arial, Helvetica, sans-serif"><strong>Date &amp; Time
</strong></font></div></td>
@@ -53,7 +53,7 @@
 
AND `content_visible` = 1
 
AND `content_type` = 'default'
 
ORDER BY `content_id` DESC 
-
LIMIT 0 , 10 ;") ;
+
LIMIT 0 , 15 ;") ;
 	$color="";
 	$color1=$roscms_intern_color1;
 	$color2=$roscms_intern_color2;
@@ -74,7 +74,7 @@
[truncated at 1000 lines; 61 more skipped]