From frik85@svn.reactos.org Wed Jan 11 21:00:01 2006 From: frik85@svn.reactos.org To: ros-diffs@reactos.org Subject: [ros-diffs] [frik85] 20787: RosCMS update: Date: Wed, 11 Jan 2006 21:01:25 +0100 Message-ID: <000001c616e9$cd7ab580$6b01a8c0@PENELOPE> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4051529524331948607==" --===============4051529524331948607== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit RosCMS update: * add RosCMS user group history page Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_user_group_members.php Added: trunk/web/reactos.org/htdocs/roscms/inc/admin_user_history.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/inc_menu_admin.php _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin.php --- trunk/web/reactos.org/htdocs/roscms/inc/admin.php 2006-01-11 19:18:57 UTC (rev 20786) +++ trunk/web/reactos.org/htdocs/roscms/inc/admin.php 2006-01-11 20:01:03 UTC (rev 20787) @@ -147,6 +147,9 @@ case "usergroups": include("inc/admin_user_groups.php"); break; + case "userhistory": + include("inc/admin_user_history.php"); + break; case "usrgrpmbr": if ($rpm_sec2=="view" || $rpm_sec2=="") { include("inc/admin_user_group_members.php"); _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_user_group_members.php --- trunk/web/reactos.org/htdocs/roscms/inc/admin_user_group_members.php 2006-01-11 19:18:57 UTC (rev 20786) +++ trunk/web/reactos.org/htdocs/roscms/inc/admin_user_group_members.php 2006-01-11 20:01:03 UTC (rev 20787) @@ -351,12 +351,14 @@ $roscms_SET_letter = "%"; } -$query_count_cat=mysql_query("SELECT COUNT('user_id') - FROM `users` - WHERE `user_account_enabled` = 'yes' - AND `user_account_hidden` = 'no' - AND `user_name` LIKE '" . $roscms_SET_letter . "%' - ORDER BY `user_name` ASC ;"); +$query_count_cat=mysql_query("SELECT COUNT('A1.user_id') + FROM users A1 + WHERE A1.user_account_enabled = 'yes' + AND A1.user_account_hidden = 'no' + AND A1.user_name LIKE '" . $roscms_SET_letter . "%' + $ros_cms_intern_users_filt + $ros_cms_intern_users_lang + ORDER BY A1.user_name ASC ;"); $result_count_cat = mysql_fetch_row($query_count_cat); echo "
"; _____ Added: trunk/web/reactos.org/htdocs/roscms/inc/admin_user_history.php --- trunk/web/reactos.org/htdocs/roscms/inc/admin_user_history.php 2006-01-11 19:18:57 UTC (rev 20786) +++ trunk/web/reactos.org/htdocs/roscms/inc/admin_user_history.php 2006-01-11 20:01:03 UTC (rev 20787) @@ -0,0 +1,291 @@ + +
Action: reset + filters & sort
+ Language: '; + if ($rpm_lang_id == "all") { + echo 'All'; + $ros_cms_intern_users_lang = "AND A1.user_language LIKE '%'"; + } + else { + echo 'All'; + } + // Languages + $sql_lang="SELECT * + FROM languages + WHERE lang_level != '0' + ORDER BY 'lang_level' DESC"; + $sql_query_lang=mysql_query($sql_lang); + while($myrow_lang=mysql_fetch_row($sql_query_lang)) { + $roscms_sel_lang = $myrow_lang[0]; + echo ' | '; + if ($rpm_lang_id == $roscms_sel_lang) { + echo ''.$myrow_lang[1].''; + $ros_cms_intern_users_lang = "AND A1.user_language = '".$roscms_sel_lang."'"; + } + else { + echo ''.$myrow_lang[1].''; + } + } + + + if ($rpm_filt == "") { + $rpm_filt="active"; + } + echo 'Filter: '; + if ($rpm_filt == "active") { + echo 'active users'; + $ros_cms_intern_users_filt = "AND A1.user_account_enabled = 'yes'"; + } + else { + echo 'active users'; + } + echo ' | '; + if ($rpm_filt == "all") { + echo 'all users'; + $ros_cms_intern_users_filt = "AND A1.user_account_enabled != ''"; + } + else { + echo 'all users'; + } + echo '
'; + + if ($rpm_sort == "") { + $rpm_sort="translator"; + } + echo 'Filter by Group: '; +/* if ($rpm_sort == "all") { + echo 'all'; + $ros_cms_intern_users_sortby=" AND A2.usergroupmember_usergroupid LIKE '%'"; + } + else { + echo 'all'; + } + echo ' | ';*/ + if ($rpm_sort == "ros_sadmin") { + echo 'super admin'; + $ros_cms_intern_users_sortby=" AND A2.usergroupmember_usergroupid = 'ros_sadmin'"; + } + else { + echo 'super admin'; + } + echo ' | '; + if ($rpm_sort == "ros_admin") { + echo 'admin'; + $ros_cms_intern_users_sortby=" AND A2.usergroupmember_usergroupid = 'ros_admin'"; + } + else { + echo ' admin'; + } + echo ' | '; + if ($rpm_sort == "developer") { + echo 'developer'; + $ros_cms_intern_users_sortby=" AND A2.usergroupmember_usergroupid = 'developer'"; + } + else { + echo ' developer'; + } + echo ' | '; + if ($rpm_sort == "moderator") { + echo 'moderator'; + $ros_cms_intern_users_sortby=" AND A2.usergroupmember_usergroupid = 'moderator'"; + } + else { + echo ' moderator'; + } + echo ' | '; + if ($rpm_sort == "translator") { + echo 'translator'; + $ros_cms_intern_users_sortby=" AND A2.usergroupmember_usergroupid = 'translator'"; + } + else { + echo 'translator'; + } + echo '
'; + +?> + +
+ Action |
+
+ Name |
+
+ History
|
+
"> + | +
+ ".$result_usra['user_name']." ";
+ $query_grpmbr = mysql_query("SELECT *
+
FROM `usergroup_members`
+
WHERE `usergroupmember_userid` = ".$result_usra['user_id']."
+
ORDER BY `usergroupmember_usergroupid` ASC ;") ;
+ while($result_grpmbr =
mysql_fetch_array($query_grpmbr)) {
+ echo
" |
+ Contents: ";
+ $query_count_contents=mysql_query("SELECT
COUNT('content_id')
+
FROM `content`
+
WHERE `content_usrname_id` = ".$result_page['user_id']."
+
ORDER BY `content_id` DESC;");
+ $result_count_contents =
mysql_fetch_row($query_count_contents);
+ echo $result_count_contents[0]." "; + if ($result_count_contents[0] != 0) { + $query_entries_contents = mysql_query("SELECT * + FROM `content` + WHERE `content_usrname_id` = ".$result_page['user_id']." + ORDER BY `content_id` DESC + LIMIT 0 , 25 ;") ; + while($result_entries_contents = mysql_fetch_array($query_entries_contents)) { + echo " ".$result_entries_contents['content_id']. " - ".$result_entries_contents['content_name']." - ".$result_entries_contents['content_lang']." / ".$result_entries_contents['content_type']." (".$result_entries_contents['content_date']." ".$result_entries_contents['content_time'].") "; + } + if ($result_count_contents[0] > 25) { + echo " ... "; + } + echo " "; + } + + + // Pages + echo "Pages: "; + $query_count_contents=mysql_query("SELECT COUNT('page_id') + FROM `pages` + WHERE `page_usrname_id` = ".$result_page['user_id']." + ORDER BY `page_id` DESC;"); + $result_count_contents = mysql_fetch_row($query_count_contents); + echo $result_count_contents[0]." "; + if ($result_count_contents[0] != 0) { + $query_entries_contents = mysql_query("SELECT * + FROM `pages` + WHERE `page_usrname_id` = ".$result_page['user_id']." + ORDER BY `page_id` DESC + LIMIT 0 , 25 ;") ; + while($result_entries_contents = mysql_fetch_array($query_entries_contents)) { + echo " ".$result_entries_contents['page_id']." - ".$result_entries_contents['page_name']." - ".$result_entries_contents['page_language']." / ".$result_entries_contents['pages_extention']." (".$result_entries_contents['page_date']." ".$result_entries_contents['page_time'].") "; + } + if ($result_count_contents[0] > 25) { + echo " ... "; + } + echo " "; + } + + + // Pages + echo "DynContent: "; + $query_count_contents=mysql_query("SELECT COUNT('dyn_id') + FROM `dyn_content` + WHERE `dyn_content_usrname_id` = ".$result_page['user_id']." + ORDER BY `dyn_id` DESC;"); + $result_count_contents = mysql_fetch_row($query_count_contents); + echo $result_count_contents[0]." "; + if ($result_count_contents[0] != 0) { + $query_entries_contents = mysql_query("SELECT * + FROM `dyn_content` + WHERE `dyn_content_usrname_id` = ".$result_page['user_id']." + ORDER BY `dyn_id` DESC + LIMIT 0 , 25 ;") ; + while($result_entries_contents = mysql_fetch_array($query_entries_contents)) { + echo " ".$result_entries_contents['dyn_id']." - ".$result_entries_contents['dyn_content_name']."_".$result_entries_conte nts['dyn_content_id'].".".$result_entries_contents['dyn_content_nr']." - ".$result_entries_contents['dyn_content_lang']." (".$result_entries_contents['dyn_content_date']." ".$result_entries_contents['dyn_content_time'].") "; + } + if ($result_count_contents[0] > 25) { + echo " ... "; + } + echo " "; + } + + ?> |
+