();
- data.Add("#Sunfish WebXplorer V" + Program.VERSION + " (The new Dolphin WebXplorer) (C) XWolf 2014-2015");
+ data.Add("#Sunfish WebXplorer V" + Program.VERSION + " (The new Dolphin WebXplorer) (C) XWolfOverride@gmail.com 2007-2015");
data.Add("Active: " + YN[Active]);
data.Add("Port: " + port);
data.Add("SharedScreen:" + YN[sharedScreen]);
@@ -283,6 +285,12 @@
case "MKDDO":
PageCreateFolderDo(sh, rpath);
break;
+ case "UPL":
+ PageUpload(sh, rpath);
+ break;
+ case "UPLDO":
+ PageUploadDo(sh, rpath);
+ break;
}
}
else
@@ -318,6 +326,9 @@
case "folder":
BinaryOut(WebXplorer.res_folder, "image/png");
break;
+ case "upload":
+ BinaryOut(WebXplorer.res_upload, "image/png");
+ break;
case "/Sunfish.exe":
BinaryOut(GetMyself(), "application/x-msdownload");
break;
@@ -514,6 +525,7 @@
{
if (mimetype != null)
Response.Headers[HttpResponseHeader.ContentType] = mimetype;
+ Response.ContentLength64 = fs.Length;
byte[] buffer = new byte[1024 * 64];
int readed = buffer.Length;
while (readed == buffer.Length)
@@ -595,6 +607,8 @@
}
}
+ private const string RESETURL="";
+
private void PageRename(WShared sh, string path)
{
Header(sh.Name, sh, path.Split('/'));
@@ -625,7 +639,7 @@
if (!sh.AllowRename)
Error("Forbidden", "Renaming is not allowed on this site");
else if (!WebXplorer.CheckACode("R" + path,GET["acode"]))
- Error("Auth code error", "");
+ Error("Auth code error", RESETURL);
else
{
string dir = System.IO.Path.GetDirectoryName(path);
@@ -640,7 +654,7 @@
try
{
File.Move(path, dir + nname);
- Out.WriteLine("");
+ Out.WriteLine(RESETURL);
}
catch (Exception e)
{
@@ -660,7 +674,7 @@
try
{
System.Diagnostics.Process.Start(path);
- Out.WriteLine("");
+ Out.WriteLine(RESETURL);
}
catch (Exception e)
{
@@ -698,13 +712,13 @@
if (!sh.AllowDeletion)
Error("Forbidden", "Deletion is not allowed on this site");
else if (!WebXplorer.CheckACode("D" + path, GET["acode"]))
- Error("Auth code error", "");
+ Error("Auth code error", RESETURL);
else
{
try
{
File.Delete(sh.GetLocalPath(path));
- Out.WriteLine("");
+ Out.WriteLine(RESETURL);
}
catch (Exception e)
{
@@ -743,7 +757,7 @@
if (!sh.AllowNewFolder)
Error("Forbidden", "Folder creation is not allowed on this site");
else if (!WebXplorer.CheckACode("C" + path, GET["acode"]))
- Error("Auth code error", "");
+ Error("Auth code error", RESETURL);
else
{
string dname = GET["dirname"];
@@ -755,7 +769,7 @@
try
{
Directory.CreateDirectory(sh.GetLocalPath(dir + dname));
- Out.WriteLine("");
+ Out.WriteLine(RESETURL);
}
catch (Exception e)
{
@@ -765,6 +779,56 @@
Footer();
}
+ private void PageUpload(WShared sh, string path)
+ {
+ Header(sh.Name, sh, path.Split('/'));
+ if (!sh.AllowUpload)
+ Error("Forbidden", "File upload is not allowed on this site");
+ else
+ {
+ string oname = System.IO.Path.GetFileName(path);
+ string acode = WebXplorer.CreateACode("U" + path);
+ Out.Write("");
+ }
+ Footer();
+ }
+
+ private void PageUploadDo(WShared sh, string path)
+ {
+ Header(sh.Name, sh, path.Split('/'));
+ if (!sh.AllowUpload)
+ Error("Forbidden", "File upload is not allowed on this site");
+ else if (!WebXplorer.CheckACode("U" + path, GET["acode"]))
+ Error("Auth code error", RESETURL);
+ else if (Post == null)
+ Error("Communication error", "Error uploading file");
+ else
+ {
+ HttpPostFile file = Post.File["file"];
+ string fname = file.Filename;
+ string dir = path.Replace('/', System.IO.Path.DirectorySeparatorChar);
+ string dest = sh.GetLocalPath(dir + file.Filename);
+ if (File.Exists(dest))
+ Error("Upload error", "Destination file exists, rename file before upload. Or delete destination if you have rights.");
+ else try
+ {
+ File.WriteAllBytes(dest, file.Data);
+ Out.WriteLine(RESETURL);
+ }
+ catch (Exception e)
+ {
+ Error(e);
+ }
+ }
+ Footer();
+ }
+
private void BlackHeader(string title, string script)
{
Out.Write("Sunfish [");
@@ -822,6 +886,8 @@
}
Out.Write("</div>");
Out.Write("<div id='headtoolbox'>");
+ if (sh != null && sh.AllowUpload)
+ Out.Write("<button class='htool' title='Upload File' onclick='location.href+=\"?Action=UPL\"'><img src='/·upload' width='16' height='16'></button>");
if (sh != null && sh.AllowNewFolder)
Out.Write("<button class='htool' title='New Folder' onclick='location.href+=\"?Action=MKD\"'><img src='/·folder' width='16' height='16'></button>");
if (WebXplorer.SharedScreen)