# # # patch "www/admin-description.js" # from [d8fab719409fc04467c21a9670d51ebd8b1ebbc1] # to [17c66d54d43ecd663e98c44397c0115fafe278e7] # # patch "www/admin-files.js" # from [1d84e9f90e267d99e4bddffe5f2e3185e31a0952] # to [57dd5d353f9d8065a0f067afc90ad85784f86140] # # patch "www/admin-files_backend.php" # from [8109ee3be651cbd4d693b930060403c1a7149a46] # to [2108bbca2e74ddb93b8ee1646fbf032d6d28deeb] # # patch "www/admin-permissions.js" # from [444fcd22988b44ffc3df1f64ece814c0e734d889] # to [176f66c45297f963c1f54ee7e010ef6320d262fe] # # patch "www/admin-resources.js" # from [f70486e366156f2464cad779d0fd2bb3e3ba74e4] # to [f8e5b82354069c24e2f172209151d84b0b124cac] # # patch "www/admin-source_control.js" # from [816e285379b7cda121c3b8b285f6d8c826e18e72] # to [797eabf030181c04ee34889b9d26eca4ffba5999] # # patch "www/administrator.js" # from [6c90694cc02ec84ca391741656b00c9f4ef6692d] # to [a42d480010edbf2661298ce1ee7764937e85afb8] # # patch "www/common.js" # from [76b1fd12e77aeee9ee10541d60b43d786b5831eb] # to [dbeda27362653d526cfd747a4f344bd8358a0240] # # patch "www/proj-ctrl.php" # from [375b6a00d7d0d0fa602aaa46455886daf20e9fe1] # to [e7d919933f83324e1d0d38e0c6e7e098f2e94227] # # patch "www/sidebar.js" # from [db04812a9ddc52a1351c9c9d3ab39e0405182c76] # to [c7ac25ac61fc1b6760d680fa273b285ea459f91f] # ============================================================ --- www/admin-description.js d8fab719409fc04467c21a9670d51ebd8b1ebbc1 +++ www/admin-description.js 17c66d54d43ecd663e98c44397c0115fafe278e7 @@ -1,7 +1,7 @@ chdesc = function () { ctrl = '../../admin-description_backend.php'; chdesc = function () { - status("Changing project description..."); + setstatus("Changing project description..."); var args = {'project':project}; args.description = getElement("description").value; args.longdescription = getElement("longdescription").value; @@ -10,7 +10,7 @@ addLoadEvent(function() { } addLoadEvent(function() { - status("Loading..."); + setstatus("Loading..."); var x = {'project':project}; x.action = "getdesc"; call_server(ctrl, x, "getdesc", function (data) { ============================================================ --- www/admin-files.js 1d84e9f90e267d99e4bddffe5f2e3185e31a0952 +++ www/admin-files.js 57dd5d353f9d8065a0f067afc90ad85784f86140 @@ -1,7 +1,7 @@ do_rmfile = function (name) { ctrl = '../../admin-files_backend.php'; do_rmfile = function (name) { - status("removing " + name + "..."); + setstatus("removing " + name + "..."); var x = {'project':project,"action":"rmfile","file":name}; call_server(ctrl, x, "rmfile", function (data) { hideElement("trow-" + name); @@ -11,7 +11,7 @@ do_chfilecomment = function (name) { do_chfilecomment = function (name) { var c = getElement("filecomment-" + name).value; - status("changing description of " + name + "..."); + setstatus("changing description of " + name + "..."); var x = {'project':project,"action":"chfiledesc","filedesc":c,"file":name}; call_server(ctrl, x, "chfiledesc", function (data) { clearstatus(); @@ -50,7 +50,7 @@ do_upload = function() { do_upload = function() { - status("Uploading page..."); + setstatus("Uploading page..."); getElement("upload_form").target = "upload_frame"; getElement("upload_form").submit(); } @@ -60,7 +60,7 @@ addLoadEvent(function() { } addLoadEvent(function() { -// status("Loading..."); +// setstatus("Loading..."); // var x = {'project':project}; // x.action = "getmaint"; // call_server(ctrl, x, "getmaint", function (data) { ============================================================ --- www/admin-files_backend.php 8109ee3be651cbd4d693b930060403c1a7149a46 +++ www/admin-files_backend.php 2108bbca2e74ddb93b8ee1646fbf032d6d28deeb @@ -34,7 +34,7 @@ if ($action == "upload_files") { if ($ok) print "parent.uploaddone();\n"; else - print "parent.status(\"" . $st . "\");"; + print "parent.setstatus(\"" . $st . "\");"; print "File uploaded"; } elseif ($action == "rmfile") { header('Content-type: text/x-json'); ============================================================ --- www/admin-permissions.js 444fcd22988b44ffc3df1f64ece814c0e734d889 +++ www/admin-permissions.js 176f66c45297f963c1f54ee7e010ef6320d262fe @@ -65,7 +65,7 @@ chmaint = function () { chmaint = function () { - status("Changing maintainers..."); + setstatus("Changing maintainers..."); var args = {'project':project}; args.action = "chmaint"; var lst = getElement("maintainertablebody").childNodes; @@ -85,7 +85,7 @@ addLoadEvent(function() { addLoadEvent(function() { - status("Loading..."); + setstatus("Loading..."); var x = {'project':project}; x.action = "getmaint"; call_server(ctrl, x, "getmaint", function (data) { ============================================================ --- www/admin-resources.js f70486e366156f2464cad779d0fd2bb3e3ba74e4 +++ www/admin-resources.js f8e5b82354069c24e2f172209151d84b0b124cac @@ -131,7 +131,7 @@ update = function () { } update = function () { - status("Updating..."); + setstatus("Updating..."); var args = {'project':project}; args.action = "chresources"; var lst = getElement("rsclist").childNodes; @@ -151,7 +151,7 @@ addLoadEvent(function() { addLoadEvent(function() { - status("Loading..."); + setstatus("Loading..."); var x = {'project':project}; x.action = "getresources"; call_server(ctrl, x, "getresources", function (data) { ============================================================ --- www/admin-source_control.js 816e285379b7cda121c3b8b285f6d8c826e18e72 +++ www/admin-source_control.js 797eabf030181c04ee34889b9d26eca4ffba5999 @@ -1,7 +1,7 @@ chwperm = function () { ctrl = '../../admin-source_control_backend.php'; chwperm = function () { - status("Changing permissions..."); + setstatus("Changing permissions..."); var args = {'project':project}; args.newperm = getElement("newperm").value; args.action = "chwriters"; @@ -9,29 +9,29 @@ sendkey = function() { } sendkey = function() { - status("Uploading key..."); + setstatus("Uploading key..."); var args = {'project':project}; args.action = "new_key"; args.keydata = getElement("keydata").value; call_server(ctrl, args, "sendkey", function(data){ getElement("keydata").value = ""; - status("Key uploaded."); + setstatus("Key uploaded."); }); } resetdb = function() { - status("Resetting database..."); + setstatus("Resetting database..."); var args = {'project':project}; args.action = "resetdb"; args.oath = getElement("oath").value; call_server(ctrl, args, "resetdb", function(data){ getElement("oath").value = ""; - status(data.ok); + setstatus(data.ok); }); } chstate = function() { - status("Changing server state..."); + setstatus("Changing server state..."); var args = {'project':project}; if (getElement("chstate").value == "Disable server") { args.action = "disable"; @@ -59,7 +59,7 @@ restate = function() { } restate = function() { - status("Refreshing server state..."); + setstatus("Refreshing server state..."); var args = {'project':project}; args.action = "refresh_state"; call_server(ctrl, args, "restate", function(data){ @@ -69,7 +69,7 @@ addLoadEvent(function() { } addLoadEvent(function() { - status("Loading..."); + setstatus("Loading..."); var x = {'project':project}; x.action = "getsrv"; call_server(ctrl, x, "getsrv", function (data) { ============================================================ --- www/administrator.js 6c90694cc02ec84ca391741656b00c9f4ef6692d +++ www/administrator.js a42d480010edbf2661298ce1ee7764937e85afb8 @@ -1,8 +1,8 @@ rmproj = function (name) { rmproj = function (name) { - status("Deleting project '"+name+"'..."); + setstatus("Deleting project '"+name+"'..."); if (!confirm("Are you sure you want to delete "+name+"?")) { - status("Delete canceled."); + setstatus("Delete canceled."); return; } var args = {'project':name,'action':'delete_project'}; @@ -13,9 +13,9 @@ rmuser = function(name) { } rmuser = function(name) { - status("Deleting user "+name+"..."); + setstatus("Deleting user "+name+"..."); if (!confirm("Are you sure you want to delete "+name+"?")) { - status("Delete canceled."); + setstatus("Delete canceled."); return; } var args = {'who':name,'action':'delete_user'}; @@ -26,7 +26,7 @@ op = function(name) { } op = function(name) { - status("Setting admin flag for "+name+"..."); + setstatus("Setting admin flag for "+name+"..."); var args = {'who':name,'action':'op'}; call_server("user-ctrl.php", args, "op", function (data) { clearstatus(); @@ -34,7 +34,7 @@ deop = function(name) { } deop = function(name) { - status("Removing admin flag from "+name+"..."); + setstatus("Removing admin flag from "+name+"..."); var args = {'who':name,'action':'deop'}; call_server("user-ctrl.php", args, "deop", function (data) { clearstatus(); @@ -42,7 +42,7 @@ chuserpass = function(name) { } chuserpass = function(name) { - status("Resetting password for "+name+"..."); + setstatus("Resetting password for "+name+"..."); var newpass = prompt('Enter a new password for ' + name, ''); if (newpass == '') { clearstatus(); ============================================================ --- www/common.js 76b1fd12e77aeee9ee10541d60b43d786b5831eb +++ www/common.js dbeda27362653d526cfd747a4f344bd8358a0240 @@ -25,17 +25,17 @@ call_server = function (url, args, nam, d.addCallback(function (data) { if (data.error != undefined) { if(data.verboseError == undefined) { - status("Error: " + data.error); + setstatus("Error: " + data.error); } else { verberr = data.verboseError; - status("Error: " + data.error, BR(), SPAN({"class": "jslink", "onclick": "alert(verberr);"}, "(Click here for details)")); + setstatus("Error: " + data.error, BR(), SPAN({"class": "jslink", "onclick": "alert(verberr);"}, "(Click here for details)")); } } else { callback(data); } }); d.addErrback(function(err){ - status("Error: " + err, BR(), SPAN({"class": "jslink", "onclick": "alert(respTxt);"}, "(Click here for details)")); + setstatus("Error: " + err, BR(), SPAN({"class": "jslink", "onclick": "alert(respTxt);"}, "(Click here for details)")); }); } @@ -59,7 +59,11 @@ clearstatus = function() { replaceChildNodes('status'); } -status = function() { - replaceChildNodes("status", SPAN({"class": "jslink", "onclick": "clearstatus();", "style": "float: right;"}, "[X]"), arguments); +setstatus = function() { + var x = {}; + x.class = "jslink"; + x.onclick = "clearstatus();"; + x.style = "float: right;"; + replaceChildNodes("status", SPAN(x, "[X]"), arguments); } ============================================================ --- www/proj-ctrl.php 375b6a00d7d0d0fa602aaa46455886daf20e9fe1 +++ www/proj-ctrl.php e7d919933f83324e1d0d38e0c6e7e098f2e94227 @@ -10,12 +10,12 @@ if ($action === "chhomepage") { if (move_uploaded_file($_FILES['homepage']['tmp_name'], $projdir . "/index.html")) print "parent.chhomedone();\n"; else - print "parent.status(\"Error: Internal server error.\");\n"; + print "parent.setstatus(\"Error: Internal server error.\");\n"; } else { - print "parent.status(\"Error: You don't have permission to do that.\");\n"; + print "parent.setstatus(\"Error: You don't have permission to do that.\");\n"; } } else { - print "parent.status(\"Error: username or password is incorrect.\");\n"; + print "parent.setstatus(\"Error: username or password is incorrect.\");\n"; } print "File uploaded"; $db->Close(); @@ -50,7 +50,7 @@ if ($action === "chhomepage") { if ($ok) print "parent.uploaddone();\n"; else - print "parent.status(\"" . $st . "\");"; + print "parent.setstatus(\"" . $st . "\");"; } while (false); print "File uploaded"; $db->Close(); ============================================================ --- www/sidebar.js db04812a9ddc52a1351c9c9d3ab39e0405182c76 +++ www/sidebar.js c7ac25ac61fc1b6760d680fa273b285ea459f91f @@ -1,11 +1,11 @@ do_newuser = function () { //needs common.js do_newuser = function () { var x = userpass(); x.action = "newuser"; - status("Adding user '" + x.username + "'..."); + setstatus("Adding user '" + x.username + "'..."); call_server(userctrl, x, "newuser", function (data) { - status("Added user '" + data.username + "'."); + setstatus("Added user '" + data.username + "'."); }); } @@ -13,7 +13,7 @@ do_chpass = function () { var x = userpass(); x.action = "chpass"; x.newpass = getElement("newpassword").value; - status("Changing password..."); + setstatus("Changing password..."); call_server(userctrl, x, "chpass", function (data) { getElement("password").value = getElement("newpassword").value; getElement("newpassword").value = ""; @@ -22,7 +22,7 @@ do_newproj = function() { } do_newproj = function() { - status("Creating project..."); + setstatus("Creating project..."); var args = {'project':getElement('newproject').value}; args.action = "new_project"; args.render_type = "json";