8 Dec
2005
8 Dec
'05
9:39 p.m.
RosCMS update:
* fix unicode (utf-8) bug (content edit page); thanks to fireball
(testing, ideas and tips)
* fix "User Accounts" interface
* fix link "get password" function
Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_content_edit.php
Modified:
trunk/web/reactos.org/htdocs/roscms/inc/admin_user_accounts.php
Modified: trunk/web/reactos.org/htdocs/roscms/inc/head.php
Modified: trunk/web/reactos.org/htdocs/roscms/inc/user_getpwd.php
Modified: trunk/web/reactos.org/htdocs/roscms/inc/user_getpwd2.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-08 21:33:49 UTC (rev 19977)
+++ trunk/web/reactos.org/htdocs/roscms/inc/admin_content_edit.php
2005-12-08 21:39:14 UTC (rev 19978)
@@ -115,7 +115,9 @@
<td valign="top" bgcolor="#5984C3"><div
align="center"><font
color="#FFFFFF" face="Arial, Helvetica,
sans-serif"><strong>Content</strong></font></div></td>
<td valign="top" bgcolor="#E2E2E2"><textarea
name="textarea_content" cols="60" rows="20"
id="textarea_content"><?php
//echo
htmlentities(ereg_replace("&(#[0-9]{4};)", "&\\1",
$roscms_intern_editor_content), ENT_QUOTES, 'UTF-8');
- echo ereg_replace("&(#[0-9]{4};)",
"&\\1", htmlentities($roscms_intern_editor_content, ENT_QUOTES,
'UTF-8'))
+ echo ereg_replace("&(#[0-9]{4};)",
"&\\1", htmlentities($roscms_intern_editor_content, ENT_QUOTES,
'UTF-8'));
+ //echo ereg_replace("&(#[0-9]{4};)",
"&\\1", $roscms_intern_editor_content);
+ //echo
htmlspecialchars($roscms_intern_editor_content);
//echo
htmlentities($roscms_intern_editor_content);
_____
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-08 21:33:49 UTC (rev 19977)
+++ trunk/web/reactos.org/htdocs/roscms/inc/admin_user_accounts.php
2005-12-08 21:39:14 UTC (rev 19978)
@@ -240,8 +240,12 @@
<td width="10%"> <div align="center"><font
color="#FFFFFF"
face="Arial, Helvetica,
sans-serif"><strong>Lang</strong></font></div></td>
</tr>
<?php
+ $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 LIMIT ". $roscms_SET_curpos ." , ".
$roscms_intern_items_per_page ." ;") ;
- if($roscms_intern_account_level==100) {
+/* if($roscms_intern_account_level==100) {
$query_page = mysql_query("SELECT *
FROM users
$ros_cms_intern_users_filt
$ros_cms_intern_users_lang
@@ -252,7 +256,7 @@
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 LIMIT ". $roscms_SET_curpos ." , ".
$roscms_intern_items_per_page ." ;") ;
- }
+ }*/
$farbe1=$roscms_intern_color1;
$farbe2=$roscms_intern_color2;
_____
Modified: trunk/web/reactos.org/htdocs/roscms/inc/head.php
--- trunk/web/reactos.org/htdocs/roscms/inc/head.php 2005-12-08
21:33:49 UTC (rev 19977)
+++ trunk/web/reactos.org/htdocs/roscms/inc/head.php 2005-12-08
21:39:14 UTC (rev 19978)
@@ -46,8 +46,8 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html lang="de">
<head>
+ <meta http-equiv="Content-Type" content="text/html;
charset=<?php echo $roscms_langres['charset']; ?>" />
<title>ReactOS Homepage - <?php echo $page_title ; ?></title>
- <meta http-equiv="Content-Type" content="text/html;
charset=<?php echo $roscms_langres['charset']; ?>" />
<meta http-equiv="Pragma" content="no-cache" >
<meta name="Copyright" content="ReactOS Foundation" >
<meta name="generator" content="RosCMS" >
_____
Modified: trunk/web/reactos.org/htdocs/roscms/inc/user_getpwd.php
--- trunk/web/reactos.org/htdocs/roscms/inc/user_getpwd.php
2005-12-08 21:33:49 UTC (rev 19977)
+++ trunk/web/reactos.org/htdocs/roscms/inc/user_getpwd.php
2005-12-08 21:39:14 UTC (rev 19978)
@@ -400,7 +400,7 @@
$subject = "ReactOS Homepage - myReactOS Account [New Password -
#1]";
/* Message */
- $message = "ReactOS Homepage - myReactOS Account [New Password -
#1]\n\n\nUsername: ".$reg_txtusername."\nActivation Code:
".$reg_randompwd."\n\n\nUse this link to get a new
password:\nhttp://www.reactos.org/roscms/?page=getpwd2&usrname=&quo… .
$reg_txtusername . "&code=" . $reg_randompwd . "\n\n\n\nIf you
find
any problems, feel free to register them in BugZilla.\n\n\nBest
regards,\nThe ReactOS Web Team\n\n\n\nPlease do not reply as this is an
auto generated email! If you have not requested a new password, then
someone tried to recover your password.";
+ $message = "ReactOS Homepage - myReactOS Account [New Password -
#1]\n\n\nUsername: ".$reg_txtusername."\nActivation Code:
".$reg_randompwd."\n\n\nUse this link to get a new
password:\nhttp://www.reactos.org/roscms/?page=getpwd2&usrname=" .
$reg_txtusername . "&code=" . $reg_randompwd . "\n\n\n\nIf you find
any
problems, feel free to register them in BugZilla.\n\n\nBest
regards,\nThe ReactOS Web Team\n\n\n\nPlease do not reply as this is an
auto generated email! If you have not requested a new password, then
someone tried to recover your password.";
/* build the mail header */
$headers = "";
_____
Modified: trunk/web/reactos.org/htdocs/roscms/inc/user_getpwd2.php
--- trunk/web/reactos.org/htdocs/roscms/inc/user_getpwd2.php
2005-12-08 21:33:49 UTC (rev 19977)
+++ trunk/web/reactos.org/htdocs/roscms/inc/user_getpwd2.php
2005-12-08 21:39:14 UTC (rev 19978)
@@ -183,8 +183,10 @@
include("roscms_config.php");
-echo "<b><a href='" . $roscms_intern_path_server .
"roscms/?page=user&sec=account&sec2=edit'>Login and change your
password</a></b><br><br>";
+echo "<b><a href='" . $roscms_intern_path_server .
"roscms/?page=user&sec=account&sec2=edit'>Login and change
your
password</a></b><br><br>";
+// Do NOT remove the comment slashes! This would be a big security
risc.
+//echo "<p>usrname=" . $reg_txtusername . " pwd=" .
$reg_randompwd
."</p>";