From frik85@svn.reactos.org Sun Sep 23 15:04:17 2007
From: frik85@svn.reactos.org
To: ros-diffs@reactos.org
Subject: [ros-diffs] [frik85] 29157: RosCMS update: * automatic page
 generation fixed * user page got several new search options * maintain page
 improved
Date: Sun, 23 Sep 2007 13:04:14 +0000
Message-ID: <20070923130414.4AE40FF05@mail.smartxx.ru>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2504588628996226776=="

--===============2504588628996226776==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Author: frik85
Date: Sun Sep 23 17:04:13 2007
New Revision: 29157

URL: http://svn.reactos.org/svn/reactos?rev=3D29157&view=3Drev
Log:
RosCMS update:

* automatic page generation fixed
* user page got several new search options
* maintain page improved

Modified:
    trunk/web/reactos.org/htdocs/roscms/inc/data_edit.php
    trunk/web/reactos.org/htdocs/roscms/inc/data_export_page.php
    trunk/web/reactos.org/htdocs/roscms/inc/data_maintain.php
    trunk/web/reactos.org/htdocs/roscms/inc/data_user.php
    trunk/web/reactos.org/htdocs/roscms/inc/data_user_out.php

Modified: trunk/web/reactos.org/htdocs/roscms/inc/data_edit.php
URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/i=
nc/data_edit.php?rev=3D29157&r1=3D29156&r2=3D29157&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/web/reactos.org/htdocs/roscms/inc/data_edit.php (original)
+++ trunk/web/reactos.org/htdocs/roscms/inc/data_edit.php Sun Sep 23 17:04:13=
 2007
@@ -1401,7 +1401,7 @@
 						=09
 							if ($RosCMS_GET_debug) echo "<p>! generate_page_output_update(".$resu=
lt_rev_data['data_id'].", ".$tmp_lang.", ".$temp_dynamic.")</p>";
 						=09
-							//echo generate_page_output_update($result_entry['data_id'], $tmp_lan=
g, $temp_dynamic);
+							echo generate_page_output_update($result_entry['data_id'], $tmp_lang,=
 $temp_dynamic);
 							echo "Page generation process finished";
 						}
 						else {

Modified: trunk/web/reactos.org/htdocs/roscms/inc/data_export_page.php
URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/i=
nc/data_export_page.php?rev=3D29157&r1=3D29156&r2=3D29157&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/web/reactos.org/htdocs/roscms/inc/data_export_page.php (original)
+++ trunk/web/reactos.org/htdocs/roscms/inc/data_export_page.php Sun Sep 23 1=
7:04:13 2007
@@ -281,7 +281,7 @@
 					$fp =3D fopen($RosCMS_current_page_out_file, "w");
 					flock($fp,2);
 					fputs($fp,$RosCMS_current_page_content); // write content
-					fputs($fp,"\n\n<!-- Generated with ".$roscms_extern_brand." ".$roscms_e=
xtern_version." (".$roscms_extern_version_detail.") - ".date("Y-m-d H:i:s")."=
 [#RosCMS_v3] -->");
+					fputs($fp,"\n\n<!-- Generated with ".$roscms_extern_brand." ".$roscms_e=
xtern_version." (".$roscms_extern_version_detail.") - ".date("Y-m-d H:i:s")."=
 [RosCMS_v3] -->");
 					flock($fp,3);
 					fclose($fp);
 				=09

Modified: trunk/web/reactos.org/htdocs/roscms/inc/data_maintain.php
URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/i=
nc/data_maintain.php?rev=3D29157&r1=3D29156&r2=3D29157&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/web/reactos.org/htdocs/roscms/inc/data_maintain.php (original)
+++ trunk/web/reactos.org/htdocs/roscms/inc/data_maintain.php Sun Sep 23 17:0=
4:13 2007
@@ -64,7 +64,6 @@
=20
 ?>
 		<p><a href=3D"javascript:optimizedb()">Optimize Database Tables</a></p>
-		<p><a href=3D"javascript:analyzedb()">Analyze Database Tables</a></p>
 		<p>&nbsp;</p>
 		<p><a href=3D"javascript:ppreview()">Page Preview</a></p>
 		<div><label for=3D"textfield">Entry-Name:</label> <input name=3D"textfield=
" type=3D"text" id=3D"textfield" size=3D"20" maxlength=3D"100" />
@@ -174,7 +173,9 @@
 				=09
 			function makeRequest(url, action, objid) {
 				var http_request =3D false;
+
 				document.getElementById('ajaxloading').style.display =3D 'block';
+				document.getElementById(objid).innerHTML =3D '';
=20
 	=09
 				if (window.XMLHttpRequest) { // Mozilla, Safari,...

Modified: trunk/web/reactos.org/htdocs/roscms/inc/data_user.php
URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/i=
nc/data_user.php?rev=3D29157&r1=3D29156&r2=3D29157&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/web/reactos.org/htdocs/roscms/inc/data_user.php (original)
+++ trunk/web/reactos.org/htdocs/roscms/inc/data_user.php Sun Sep 23 17:04:13=
 2007
@@ -52,14 +52,26 @@
 		}
=20
 		if (roscms_security_grp_member("transmaint") ||roscms_security_grp_member(=
"ros_admin") || roscms_security_grp_member("ros_sadmin")) {
-
-			echo '<div><label for=3D"textfield">Username: </label><input type=3D"text=
" name=3D"textfield" id=3D"textfield" onkeyup=3D"getuser(this.value)" /> <img=
 id=3D"ajaxloading" style=3D"display:none;" src=3D"images/ajax_loading.gif" w=
idth=3D"13" height=3D"13" /></div>';
-			echo '<div id=3D"userarea"></div>';
+?>
+<div><label for=3D"textfield">Username: </label><input type=3D"text" name=3D=
"textfield" id=3D"textfield" onkeyup=3D"getuser()" /> <br />
+  <input name=3D"searchopt" type=3D"radio" id=3D"searchopt1" value=3D"accoun=
tname" checked=3D"checked" onclick=3D"getuser()" />
+  <label>account name</label>
+  <input name=3D"searchopt" type=3D"radio" id=3D"searchopt2" value=3D"fullna=
me" onclick=3D"getuser()" />
+  <label>full name </label>
+  <input name=3D"searchopt" type=3D"radio" id=3D"searchopt3" value=3D"email"=
 onclick=3D"getuser()" />
+  <label>email address</label>
+  <input name=3D"searchopt" type=3D"radio" id=3D"searchopt4" value=3D"websit=
e" onclick=3D"getuser()" />
+  <label>website</label>
+  <input name=3D"searchopt" type=3D"radio" id=3D"searchopt5" value=3D"langua=
ge" onclick=3D"getuser()" />
+  <label>language</label>
+ <img id=3D"ajaxloading" style=3D"display:none;" src=3D"images/ajax_loading.=
gif" width=3D"13" height=3D"13" /><br /><br />
+</div>
+<div id=3D"userarea"></div>
 		=09
-			echo "<br />";
-			echo "<br />";
+<br />
+<br />
 		=09
-		=09
+<?php	=09
 			echo "<h4>Translators</h4>";
=20
 			echo "<ul>";
@@ -80,16 +92,24 @@
=20
 			echo "<br />";
 	=09
+/*
 			if (roscms_security_grp_member("transmaint")) {
 				echo get_content("log_website_en_2007-30", "system", "en", "content", "t=
ext", "archive");
 			}
+*/
 		}
 	?>
 	<script type=3D"text/javascript" language=3D"javascript">
 		<!--
 	=09
-			function getuser(username) {
-				makeRequest('?page=3Ddata_out&d_f=3Duser&d_u=3Dusrtbl&d_fl=3Dlist&d_val=
=3D'+encodeURIComponent(username), 'usrtbl', 'userarea');
+			function getuser() {
+				var soptckd =3D '';
+				if (document.getElementById('searchopt1').checked) soptckd =3D 'accountn=
ame';
+				if (document.getElementById('searchopt2').checked) soptckd =3D 'fullname=
';
+				if (document.getElementById('searchopt3').checked) soptckd =3D 'email';
+				if (document.getElementById('searchopt4').checked) soptckd =3D 'website';
+				if (document.getElementById('searchopt5').checked) soptckd =3D 'language=
';
+				makeRequest('?page=3Ddata_out&d_f=3Duser&d_u=3Dusrtbl&d_fl=3Dlist&d_val=
=3D'+encodeURIComponent(document.getElementById('textfield').value)+'&d_val2=
=3D'+encodeURIComponent(soptckd), 'usrtbl', 'userarea');
 			}
 		=09
 			function getuserdetails(userid) {

Modified: trunk/web/reactos.org/htdocs/roscms/inc/data_user_out.php
URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/i=
nc/data_user_out.php?rev=3D29157&r1=3D29156&r2=3D29157&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/web/reactos.org/htdocs/roscms/inc/data_user_out.php (original)
+++ trunk/web/reactos.org/htdocs/roscms/inc/data_user_out.php Sun Sep 23 17:0=
4:13 2007
@@ -86,14 +86,36 @@
 			}
 	=09
 			if ($RosCMS_GET_d_flag =3D=3D "list") {
-				echo "<fieldset><legend>Results</legend>";
 			=09
 				if (strlen($RosCMS_GET_d_value) > 2) {
+					echo "<fieldset><legend>Results</legend>";
 					echo "<ul>";
 					$tmp_counter =3D 0;
+				=09
+					switch ($RosCMS_GET_d_value2) {
+						default:
+						case "accountname":
+							$tmp_sql_search_opt =3D "u.user_name";
+							break;
+						case "fullname":
+							$tmp_sql_search_opt =3D "u.user_fullname";
+							break;
+						case "email":
+							$tmp_sql_search_opt =3D "u.user_email";
+							break;
+						case "website":
+							$tmp_sql_search_opt =3D "u.user_website";
+							break;
+						case "language":
+							$tmp_sql_search_opt =3D "u.user_language";
+							break;
+					}
+				=09
+					echo "<p>OPT: ".$RosCMS_GET_d_value2."</p>";
+				=09
 					$query_user_list =3D mysql_query("SELECT u.user_id, u.user_name, u.user=
_fullname, u.user_language
 													FROM users u=20
-													WHERE u.user_name LIKE '".mysql_real_escape_string($RosCMS_GET_=
d_value)."%'=20
+													WHERE ". $tmp_sql_search_opt ." LIKE '".mysql_real_escape_strin=
g($RosCMS_GET_d_value)."%'=20
 													ORDER BY u.user_name ASC=20
 													LIMIT 25;");
 					while ($result_user_list =3D mysql_fetch_array($query_user_list)) {
@@ -106,11 +128,12 @@
 					if ($tmp_counter >=3D 25) {
 						echo "<p>... more than 25 users</p>";
 					}
+				=09
+					echo "</fieldset><br />";
 				}
 				else if (strlen($RosCMS_GET_d_value) > 0) {
 					echo "<p>more than 2 characters requiered</p>";
 				}
-				echo "</fieldset><br />";
 			}
 			else if ($RosCMS_GET_d_flag =3D=3D "detail") {
 				$query_user_detail =3D mysql_query("SELECT user_id, user_name, user_time=
stamp_touch2 as 'visit', user_login_counter 'visitcount', user_register, user=
_fullname, user_email, user_language=20



--===============2504588628996226776==--