zydronium/screwturn-4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed and closed #467: names of new items are now trimmed before saving or renaming.

Browse source
This commit is contained in:
Dario Solera 2010-01-27 11:24:32 +00:00
parent 121f90fd9b
commit f8e410bf6a
12 changed files with 35 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
AssemblyVersion.cs
View file

@ -16,5 +16,5 @@ using System.Reflection;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("3.0.1.461")]
[assembly: AssemblyFileVersion("3.0.1.461")]
[assembly: AssemblyVersion("3.0.1.462")]
[assembly: AssemblyFileVersion("3.0.1.462")]

2
WebApplication/AdminCategories.aspx.cs
View file

@ -47,6 +47,8 @@ namespace ScrewTurn.Wiki {
lblNewCategoryResult.CssClass = "";
lblNewCategoryResult.Text = "";
txtNewCategory.Text = txtNewCategory.Text.Trim();
Page.Validate("newcat");
if(!Page.IsValid) return;

2
WebApplication/AdminGroups.aspx.cs
View file

@ -122,6 +122,8 @@ namespace ScrewTurn.Wiki {
protected void btnCreate_Click(object sender, EventArgs e) {
if(!Page.IsValid) return;
txtName.Text = txtName.Text.Trim();
lblResult.CssClass = "";
lblResult.Text = "";

4
WebApplication/AdminNamespaces.aspx.cs
View file

@ -213,6 +213,8 @@ namespace ScrewTurn.Wiki {
}
protected void btnCreate_Click(object sender, EventArgs e) {
txtName.Text = txtName.Text.Trim();
Page.Validate("namespace");
if(!Page.IsValid) return;
@ -412,6 +414,8 @@ namespace ScrewTurn.Wiki {
lblRenameResult.CssClass = "";
lblRenameResult.Text = "";
txtNewName.Text = txtNewName.Text.Trim();
Page.Validate("rename");
if(!Page.IsValid) return;

2
WebApplication/AdminNavPaths.aspx.cs
View file

@ -216,6 +216,8 @@ namespace ScrewTurn.Wiki {
protected void btnCreate_Click(object sender, EventArgs e) {
if(!CanManagePagesInCurrentNamespace()) return;
txtName.Text = txtName.Text.Trim();
if(!Page.IsValid) return;
if(lstPages.Items.Count == 0) {

2
WebApplication/AdminSnippets.aspx.cs
View file

@ -132,6 +132,8 @@ namespace ScrewTurn.Wiki {
if(!Page.IsValid) return;
txtName.Text = txtName.Text.Trim();
if(txtCurrentElement.Value == "S") CreateSnippet();
else CreateTemplate();
}

2
WebApplication/AdminUsers.aspx.cs
View file

@ -266,6 +266,8 @@ namespace ScrewTurn.Wiki {
protected void btnCreate_Click(object sender, EventArgs e) {
if(!Page.IsValid) return;
txtUsername.Text = txtUsername.Text.Trim();
lblResult.CssClass = "";
lblResult.Text = "";

4
WebApplication/AttachmentManager.ascx.cs
View file

@ -262,6 +262,8 @@ namespace ScrewTurn.Wiki {
if(canDelete) {
lblRenameResult.Text = "";
txtNewName.Text = txtNewName.Text.Trim();
// Ensure that the extension is not changed (security)
string previousExtension = Path.GetExtension(lblItem.Text);
string newExtension = Path.GetExtension(txtNewName.Text);
@ -274,6 +276,8 @@ namespace ScrewTurn.Wiki {
txtNewName.Text += previousExtension;
}
txtNewName.Text = txtNewName.Text.Trim();
bool done = true;
if(txtNewName.Text.ToLowerInvariant() != lblItem.Text.ToLowerInvariant()) {
done = provider.RenamePageAttachment(CurrentPage, lblItem.Text, txtNewName.Text);

4
WebApplication/Edit.aspx.cs
View file

@ -497,6 +497,8 @@ namespace ScrewTurn.Wiki {
txtName.Text = GenerateAutoName(txtTitle.Text);
}
txtName.Text = txtName.Text.Trim();
Page.Validate("nametitle");
Page.Validate("captcha");
if(!Page.IsValid) {
@ -708,6 +710,8 @@ namespace ScrewTurn.Wiki {
lblCategoryResult.Text = "";
lblCategoryResult.CssClass = "";
txtCategory.Text = txtCategory.Text.Trim();
Page.Validate("category");
if(!Page.IsValid) return;

7
WebApplication/FileManager.ascx.cs
View file

@ -461,6 +461,9 @@ namespace ScrewTurn.Wiki {
protected void btnRename_Click(object sender, EventArgs e) {
lblRenameResult.Text = "";
bool done = false;
txtNewName.Text = txtNewName.Text.Trim();
if(lblItem.Text.EndsWith("/")) {
if(canDeleteDirs) {
MovePermissions(CurrentDirectory + lblItem.Text, CurrentDirectory + txtNewName.Text);
@ -487,6 +490,8 @@ namespace ScrewTurn.Wiki {
txtNewName.Text += previousExtension;
}
txtNewName.Text = txtNewName.Text.Trim();
done = true;
if(txtNewName.Text.ToLowerInvariant() != lblItem.Text.ToLowerInvariant()) {
done = provider.RenameFile(CurrentDirectory + lblItem.Text, CurrentDirectory + txtNewName.Text);
@ -519,6 +524,8 @@ namespace ScrewTurn.Wiki {
protected void btnNewDirectory_Click(object sender, EventArgs e) {
if(canCreateDirs) {
txtNewDirectoryName.Text = txtNewDirectoryName.Text.Trim();
lblNewDirectoryResult.Text = "";
txtNewDirectoryName.Text = txtNewDirectoryName.Text.Trim('/');
AuthWriter.ClearEntriesForDirectory(provider, CurrentDirectory + txtNewDirectoryName.Text + "/");

2
WebApplication/ImageEditor.aspx.cs
View file

@ -321,6 +321,8 @@ namespace ScrewTurn.Wiki {
ResizeImage();
bool done = false;
txtNewName.Text = txtNewName.Text.Trim();
string targetName = chkNewName.Checked ? txtNewName.Text : Path.GetFileName(file);
bool overwrite = !chkNewName.Checked;

2
WebApplication/Register.aspx.cs
View file

@ -120,6 +120,8 @@ namespace ScrewTurn.Wiki {
}
protected void cvUsername_ServerValidate(object source, ServerValidateEventArgs args) {
txtUsername.Text = txtUsername.Text.Trim();
if(txtUsername.Text.ToLowerInvariant().Equals("admin") || txtUsername.Text.ToLowerInvariant().Equals("guest")) {
args.IsValid = false;
}