Commit fd7853fd authored by deuce's avatar deuce
Browse files

Pass the base to get_base_code() so that commands such as STATUS that don't

have a selected base can use it.
parent afafff2f
...@@ -1219,7 +1219,7 @@ function send_updates() ...@@ -1219,7 +1219,7 @@ function send_updates()
} }
} }
function get_base_code() function get_base_code(base)
{ {
var base_code; var base_code;
...@@ -1244,7 +1244,7 @@ function read_index(base) ...@@ -1244,7 +1244,7 @@ function read_index(base)
index.subnum=base.subnum; index.subnum=base.subnum;
index.total=base.total_msgs; index.total=base.total_msgs;
index.code = get_base_code(); index.code = get_base_code(base);
for(i=0; i<index.total; i++) { for(i=0; i<index.total; i++) {
idx=base.get_msg_index(true,i); idx=base.get_msg_index(true,i);
if(idx==null) if(idx==null)
...@@ -1539,7 +1539,7 @@ var authenticated_command_handlers = { ...@@ -1539,7 +1539,7 @@ var authenticated_command_handlers = {
if(base.cfg != undefined && orig_ptrs[base.subnum]==undefined) if(base.cfg != undefined && orig_ptrs[base.subnum]==undefined)
orig_ptrs[base.subnum]=msg_area.sub[base.cfg.code].scan_ptr; orig_ptrs[base.subnum]=msg_area.sub[base.cfg.code].scan_ptr;
base_code = get_base_code(); base_code = get_base_code(base);
if (saved_config[base_code] != undefined) if (saved_config[base_code] != undefined)
old_saved = saved_config[base_code]; old_saved = saved_config[base_code];
read_cfg(base_code, true); read_cfg(base_code, true);
...@@ -2011,7 +2011,7 @@ var selected_command_handlers = { ...@@ -2011,7 +2011,7 @@ var selected_command_handlers = {
var data_items=parse_data_items(args[2]); var data_items=parse_data_items(args[2]);
var i; var i;
read_cfg(get_base_code(), true); read_cfg(get_base_code(base), true);
apply_seen(); apply_seen();
for(i in seq) { for(i in seq) {
send_fetch_response(seq[i], data_items, false); send_fetch_response(seq[i], data_items, false);
...@@ -2062,7 +2062,7 @@ var selected_command_handlers = { ...@@ -2062,7 +2062,7 @@ var selected_command_handlers = {
} }
seq=parse_seq_set(args[2],true); seq=parse_seq_set(args[2],true);
data_items=parse_data_items(args[3]); data_items=parse_data_items(args[3]);
read_cfg(get_base_code(), true); read_cfg(get_base_code(base), true);
apply_seen(); apply_seen();
for(i in seq) { for(i in seq) {
send_fetch_response(seq[i], data_items, true); send_fetch_response(seq[i], data_items, true);
...@@ -2150,7 +2150,7 @@ client.socket.send("* OK Give 'er\r\n"); ...@@ -2150,7 +2150,7 @@ client.socket.send("* OK Give 'er\r\n");
var waited=0; var waited=0;
while(1) { while(1) {
line=client.socket.recvline(10240, 1); line=client.socket.recvline(10240, 1);
if(line != null) { if(line != null && line != '') {
waited = 0; waited = 0;
debug_log("RECV: "+line, true); debug_log("RECV: "+line, true);
parse_command(line); parse_command(line);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment