fix for xml output of admin interface
This commit is contained in:
parent
bb16c3299a
commit
5cd0188e94
|
@ -1,3 +1,5 @@
|
|||
2008-09-30 P. A. Bagyenda <bagyenda@dsmagic.com>
|
||||
* Fix in mbuni management interface XML output
|
||||
2008-09-29 P. A. Bagyenda <bagyenda@dsmagic.com>
|
||||
* Improved mmsbox DLR routing for status Forwarded
|
||||
2008-09-15 P. A. Bagyenda <bagyenda@dsmagic.com>
|
||||
|
|
|
@ -307,7 +307,7 @@ static int mm7soap_receive(MmsBoxHTTPClientInfo *h)
|
|||
value, msgid, NULL, h->m->id, h->m->group_id, NULL, uaprof, uaprof_tstamp);
|
||||
|
||||
mms_log("DeliveryReport",
|
||||
from, NULL, -1, msgid, NULL, h->m->id, "MMSBox", h->ua, NULL);
|
||||
from, NULL, -1, msgid, value, h->m->id, "MMSBox", h->ua, NULL);
|
||||
octstr_destroy(desc);
|
||||
octstr_destroy(value);
|
||||
|
||||
|
@ -586,7 +586,7 @@ static int mm7eaif_receive(MmsBoxHTTPClientInfo *h)
|
|||
NULL);
|
||||
if (qf) {
|
||||
/* Log to access log */
|
||||
mms_log("Received DLR", hfrom, to, -1, NULL, NULL, h->m->id, "MMSBox", h->ua, NULL);
|
||||
mms_log("DeliveryReport", hfrom, to, -1, NULL, NULL, h->m->id, "MMSBox", h->ua, NULL);
|
||||
|
||||
hstatus = HTTP_NO_CONTENT;
|
||||
} else
|
||||
|
@ -811,7 +811,7 @@ static int mm7http_receive(MmsBoxHTTPClientInfo *h)
|
|||
NULL);
|
||||
if (qf) {
|
||||
/* Log to access log */
|
||||
mms_log("Received DLR", hfrom, to, -1, NULL, NULL, h->m->id, "MMSBox", h->ua, NULL);
|
||||
mms_log("DeliveryReport", hfrom, to, -1, NULL, NULL, h->m->id, "MMSBox", h->ua, NULL);
|
||||
|
||||
hstatus = HTTP_OK;
|
||||
} else
|
||||
|
|
|
@ -978,7 +978,7 @@ static void admin_handler(void *unused)
|
|||
Octstr *mmc_id = http_cgi_variable(cgivars, "mmsc-id");
|
||||
List *l = NULL;
|
||||
|
||||
rbody = octstr_create("<?xml version='1.0'?>\n");
|
||||
rbody = octstr_create("<?xml version='1.0'?>\n<mmsbox>\n");
|
||||
/* URI is one of: /status, /start, /stop.
|
||||
* mmsc-id is either empty (meaning ALL) or an ID of an existing MMSC connection.
|
||||
*/
|
||||
|
@ -1048,8 +1048,10 @@ static void admin_handler(void *unused)
|
|||
octstr_destroy(x);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
gwlist_destroy(l, NULL);
|
||||
|
||||
octstr_append_cstr(rbody, "\n</mmsbox>\n");
|
||||
}
|
||||
|
||||
if (rbody) {
|
||||
|
|
|
@ -940,7 +940,7 @@ static void admin_handler(MmscSettings *settings)
|
|||
Octstr *vasp_id = http_cgi_variable(cgivars, "vasp-id");
|
||||
List *l = NULL;
|
||||
|
||||
rbody = octstr_create("<?xml version='1.0'?>\n");
|
||||
rbody = octstr_create("<?xml version='1.0'?>\n<mmsc>\n");
|
||||
/* Command URI is one of: /status, /start, /stop.
|
||||
* vasp-id is either empty (meaning ALL) or an ID of an existing VASPs connection.
|
||||
*/
|
||||
|
@ -969,7 +969,7 @@ static void admin_handler(MmscSettings *settings)
|
|||
else if (gwlist_len(e) > 0)
|
||||
while ((x = gwlist_extract_first(e)) != NULL) {
|
||||
octstr_format_append(rbody,
|
||||
"<load-vasp><Error>%S</Error></load-vasp>\n",
|
||||
"<load-vasp><error>%S</error></load-vasp>\n",
|
||||
x);
|
||||
octstr_destroy(x);
|
||||
}
|
||||
|
@ -1010,6 +1010,8 @@ static void admin_handler(MmscSettings *settings)
|
|||
}
|
||||
}
|
||||
gwlist_destroy(l, NULL);
|
||||
|
||||
octstr_append_cstr(rbody, "\n</mmsc>\n");
|
||||
}
|
||||
|
||||
if (rbody) {
|
||||
|
|
Loading…
Reference in New Issue