Author: yonik
Date: 2006-12-20 06:56:11 -0500 (Wed, 20 Dec 2006)
New Revision: 69805
Modified:
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/CreateUser.aspx
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/EditUser.aspx
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/EditUser.aspx.designer.cs
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/ManageRole.aspx.cs
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/ManageUser.aspx.cs
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/SecurError.aspx
Log:
Changes for validations on fast request and Email validation.
Modified:
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/CreateUser.aspx
===================================================================
---
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/CreateUser.aspx
2006-12-20 10:53:43 UTC (rev 69804)
+++
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/CreateUser.aspx
2006-12-20 11:56:11 UTC (rev 69805)
@@ -35,7 +35,7 @@
<td width= "60%" valign="top">
<asp:CreateUserWizard ID="CreateUserWizard1"
runat="server" BackColor="#F7F6F3"
BorderColor="#E6E2D8" BorderStyle="Solid"
BorderWidth="1px" Font-Names="Verdana"
- Font-Size="0.8em" Width="353px"
ContinueDestinationPageUrl="CreateUser.aspx"
FinishDestinationPageUrl="CreateUser.aspx">
+ Font-Size="0.8em" Width="353px"
ContinueDestinationPageUrl="CreateUser.aspx"
FinishDestinationPageUrl="CreateUser.aspx" EmailRegularExpression="[EMAIL
PROTECTED]" >
<WizardSteps>
<asp:CreateUserWizardStep ID="CreateUserWizardStep1"
runat="server">
</asp:CreateUserWizardStep>
Modified:
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/EditUser.aspx
===================================================================
---
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/EditUser.aspx
2006-12-20 10:53:43 UTC (rev 69804)
+++
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/EditUser.aspx
2006-12-20 11:56:11 UTC (rev 69805)
@@ -61,7 +61,6 @@
</td>
<td>
<asp:TextBox ID="email_txb"
runat="server"></asp:TextBox>
- <asp:RequiredFieldValidator
ID="RequiredFieldValidator1" ControlToValidate="email_txb" runat="server"
ErrorMessage="*" />
</td>
<td>
<asp:CheckBox ID="active_chb" runat="server"
/> Active user
@@ -86,7 +85,8 @@
</tr>
<tr>
<td colspan="2">
- (<span style="font-size: 20px; color:
red">*</span>)Required field
+ (<span style="font-size: 20px; color:
red">*</span>)Required field <br /><br />
+ <asp:RegularExpressionValidator
ID="RegularExpressionValidator1" ControlToValidate="email_txb"
ValidationExpression="[EMAIL PROTECTED]" runat="server" ErrorMessage="Email
format is invalid"></asp:RegularExpressionValidator>
</td>
</tr>
</table>
Modified:
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/EditUser.aspx.designer.cs
===================================================================
---
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/EditUser.aspx.designer.cs
2006-12-20 10:53:43 UTC (rev 69804)
+++
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/EditUser.aspx.designer.cs
2006-12-20 11:56:11 UTC (rev 69805)
@@ -15,11 +15,11 @@
protected System.Web.UI.WebControls.View updateUser;
protected System.Web.UI.WebControls.TextBox userid_txb;
protected System.Web.UI.WebControls.TextBox email_txb;
- protected System.Web.UI.WebControls.RequiredFieldValidator
RequiredFieldValidator1;
protected System.Web.UI.WebControls.CheckBox active_chb;
protected System.Web.UI.WebControls.TextBox desc_txb;
protected System.Web.UI.WebControls.Button save_bt;
protected Mainsoft.Web.Administration.Searcher srch;
+ protected System.Web.UI.WebControls.RegularExpressionValidator
RegularExpressionValidator1;
protected System.Web.UI.WebControls.View successupdate;
protected System.Web.UI.WebControls.Label name_lbl;
protected System.Web.UI.WebControls.Button success_btn;
Modified:
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/ManageRole.aspx.cs
===================================================================
---
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/ManageRole.aspx.cs
2006-12-20 10:53:43 UTC (rev 69804)
+++
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/ManageRole.aspx.cs
2006-12-20 11:56:11 UTC (rev 69805)
@@ -54,10 +54,18 @@
{
string user = ((GridCheckBox) sender).User;
if (((GridCheckBox) sender).Checked) {
- Roles.AddUserToRole (user, role);
+ try {
+ Roles.AddUserToRole (user, role);
+ }
+ catch {
+ }
}
else {
- Roles.RemoveUserFromRole (user, role);
+ try {
+ Roles.RemoveUserFromRole (user, role);
+ }
+ catch {
+ }
}
}
}
Modified:
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/ManageUser.aspx.cs
===================================================================
---
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/ManageUser.aspx.cs
2006-12-20 10:53:43 UTC (rev 69804)
+++
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/ManageUser.aspx.cs
2006-12-20 11:56:11 UTC (rev 69805)
@@ -92,10 +92,18 @@
{
String user_name = (string) ViewState["User_name"];
if (((CheckBox) sender).Checked) {
- Roles.AddUserToRole (user_name, ((CheckBox)
sender).Text);
+ try {
+ Roles.AddUserToRole (user_name,
((CheckBox) sender).Text);
+ }
+ catch {
+ }
}
else {
- Roles.RemoveUserFromRole (user_name,
((CheckBox) sender).Text);
+ try {
+ Roles.RemoveUserFromRole (user_name,
((CheckBox) sender).Text);
+ }
+ catch {
+ }
}
}
Modified:
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/SecurError.aspx
===================================================================
---
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/SecurError.aspx
2006-12-20 10:53:43 UTC (rev 69804)
+++
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/SecurError.aspx
2006-12-20 11:56:11 UTC (rev 69805)
@@ -33,7 +33,7 @@
<body>
<form id="form1" runat="server">
<div style="font-weight: bold; font-size: 20pt; color: red">
- Error occured on this request! <br />
+ Error occurred on this request! <br />
This tool cannot be remotely accessed!
</div>
<div>
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches