← Back to branch summary

~azzar1/unity/add-show-desktop-key

« back to all changes in this revision

Viewing changes to www/media/console/console.js

  • Committer: William Grant
  • Date: 2009-01-20 06:00:55 UTC
  • mto: This revision was merged to the branch mainline in revision 1090.
  • Revision ID: grantw@unimelb.edu.au-20090120060055-iuvd8hycor67acfa
ivle.rpc.decorators: Add (new package, too). Has a couple of decorators to
    apply most security policy in userservice, making it significantly shorter
    and easier to audit.
www/apps/userservice: Use the decorators to protect all actions whose existing
    policy can be easily replaced with them.

Show diffs side-by-side

added added

removed removed

Lines of Context:
www/media/console/console.js
81
81
            tmp_path.pop();
82
82
            path = path_join("/home", tmp_path.join('/'));
83
83
        }
84
 
        ajax_call(callback1, "console", "service", {"ivle.op": "start", "cwd": path}, "POST");
 
84
        ajax_call(callback1, "consoleservice", "start", {"startdir": path}, "POST");
85
85
    }
86
86
    else
87
87
    {
88
88
        // No current_path - let the server decide
89
 
        ajax_call(callback1, "console", "service", {"ivle.op": "start"}, "POST");
 
89
        ajax_call(callback1, "consoleservice", "start", {}, "POST");
90
90
    }
91
91
}
92
92
 
280
280
        span.appendChild(document.createTextNode(inputline));
281
281
        output.appendChild(span);
282
282
    }
283
 
    var args = {"ivle.op": "chat", "kind": which, "key": server_key, "text":inputline};
 
283
    var args = {"key": server_key, "text":inputline};
284
284
    var callback = function(xhr)
285
285
        {
286
286
            console_response(inputbox, graytimer, inputline, xhr.responseText);
288
288
    /* Disable the text box */
289
289
    if (inputbox != null)
290
290
        inputbox.setAttribute("disabled", "disabled");
291
 
    ajax_call(callback, "console", "service", args, "POST");
 
291
    ajax_call(callback, "consoleservice", which, args, "POST");
292
292
}
293
293
 
294
294
function console_response(inputbox, graytimer, inputline, responseText)
361
361
        {
362
362
            var kind = "chat";
363
363
        }
364
 
        var args = {"ivle.op": "chat", "kind": kind, "key": server_key, "text":''};
365
 
        ajax_call(callback, "console", "service", args, "POST");
 
364
        var args = {"key": server_key, "text":''};
 
365
        ajax_call(callback, "consoleservice", kind, args, "POST");
366
366
 
367
367
        // Open up the console so we can see the output
368
368
        // FIXME: do we need to maximize here?
470
470
    }
471
471
    else
472
472
    {
473
 
        xhr = ajax_call(null, "console", "service", {"ivle.op": "chat", "kind": "terminate", "key": server_key}, "POST");
 
473
        xhr = ajax_call(null, "consoleservice", "restart", {"key": server_key}, "POST");
474
474
        console_response(null, null, null, xhr.responseText);
475
475
    }
476
476
}