xymon

Check-in [615c833eb0]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:msgs/html pre-tag fixes, pt.2 git-svn-id: http://svn.code.sf.net/p/xymon/code/branches/4.3.19@7601 44351d6e-118b-4698-b696-ce33095ecaa4
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk | origin/4.3.19
Files: files | file ages | folders
SHA3-256: 615c833eb0000e6247b950f4eb17cfa28ff9f627e124b51e625322885187d928
User & Date: jccleaver@users.sf.net 2015-03-15 18:36:33
Context
2015-03-21
00:01
add acknowledgements.sh report (Thanks, Andy Smith) git-svn-id: http://svn.code.sf.net/p/xymon/code/branches/4.3.19@7602 44351d6e-118b-4698-b696-ce33095ecaa4 check-in: 523b41d601 user: jccleaver@users.sf.net tags: trunk, origin/4.3.19
2015-03-15
18:36
msgs/html pre-tag fixes, pt.2 git-svn-id: http://svn.code.sf.net/p/xymon/code/branches/4.3.19@7601 44351d6e-118b-4698-b696-ce33095ecaa4 check-in: 615c833eb0 user: jccleaver@users.sf.net tags: trunk, origin/4.3.19
17:55
html-encode msgs/procs status messages git-svn-id: http://svn.code.sf.net/p/xymon/code/branches/4.3.19@7600 44351d6e-118b-4698-b696-ce33095ecaa4 check-in: 7cb3c7331d user: jccleaver@users.sf.net tags: trunk, origin/4.3.19
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to xymond/client_config.c.

2564
2565
2566
2567
2568
2569
2570
2571
2572
2573
2574
2575
2576
2577
2578
				}
				else {
					/* We wants it ... */
					dbgprintf("FOUND match in line '%s'\n", boln);
					anylines++;
					sprintf(msgline, "&%s ", colorname(rule->rule.log.color));
					addtobuffer(summarybuf, msgline);
					addtobuffer(summarybuf, boln);
					addtobuffer(summarybuf, "\n");
				}
			}

			if (eoln) {
				*eoln = '\n';
				boln = eoln+1;







|







2564
2565
2566
2567
2568
2569
2570
2571
2572
2573
2574
2575
2576
2577
2578
				}
				else {
					/* We wants it ... */
					dbgprintf("FOUND match in line '%s'\n", boln);
					anylines++;
					sprintf(msgline, "&%s ", colorname(rule->rule.log.color));
					addtobuffer(summarybuf, msgline);
					addtobuffer(summarybuf, prehtmlquoted(boln));
					addtobuffer(summarybuf, "\n");
				}
			}

			if (eoln) {
				*eoln = '\n';
				boln = eoln+1;

Changes to xymond/xymond_client.c.

1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
....
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
					hostsvcclienturl(hostname, swalk->sname), swalk->sname+5);
			}
			else {
				sprintf(msgline, "\n&yellow Warnings in %s\n", 
					swalk->sname+5);
			}
			addtobuffer(yellowdata, msgline);
			addtobuffer(yellowdata, "<pre>\n");
			addtostrbuffer(yellowdata, logsummary);
			addtobuffer(yellowdata, "</pre>\n");
			break;

		  case COL_RED:
			if (!localmode) {
				sprintf(msgline, "\n&red Critical entries in <a href=\"%s\">%s</a>\n", 
					hostsvcclienturl(hostname, swalk->sname), swalk->sname+5);
			}
			else {
				sprintf(msgline, "\n&red Critical entries in %s\n", 
					swalk->sname+5);
			}
			addtobuffer(reddata, msgline);
			addtobuffer(yellowdata, "<pre>\n");
			addtostrbuffer(reddata, logsummary);
			addtobuffer(yellowdata, "</pre>\n");
			break;
		}

		do { swalk=swalk->next; } while (swalk && strncmp(swalk->sname, "msgs:", 5));
	}

	freestrbuffer(logsummary);
................................................................................
				hostsvcclienturl(hostname, swalk->sname), swalk->sname+5);
		}
		else {
			sprintf(msgline, "\nFull log %s\n", 
				swalk->sname+5);
		}
		addtostatus(msgline);
		addtobuffer(yellowdata, "<pre>\n");
		addtostatus(prehtmlquoted(swalk->sdata));
		addtobuffer(yellowdata, "</pre>\n");
		do { swalk=swalk->next; } while (swalk && strncmp(swalk->sname, "msgs:", 5));
	}

	if (fromline && !localmode) addtostatus(fromline);

	finish_status();
}







<

<












<

<







 







<

<







1249
1250
1251
1252
1253
1254
1255

1256

1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268

1269

1270
1271
1272
1273
1274
1275
1276
....
1317
1318
1319
1320
1321
1322
1323

1324

1325
1326
1327
1328
1329
1330
1331
					hostsvcclienturl(hostname, swalk->sname), swalk->sname+5);
			}
			else {
				sprintf(msgline, "\n&yellow Warnings in %s\n", 
					swalk->sname+5);
			}
			addtobuffer(yellowdata, msgline);

			addtostrbuffer(yellowdata, logsummary);

			break;

		  case COL_RED:
			if (!localmode) {
				sprintf(msgline, "\n&red Critical entries in <a href=\"%s\">%s</a>\n", 
					hostsvcclienturl(hostname, swalk->sname), swalk->sname+5);
			}
			else {
				sprintf(msgline, "\n&red Critical entries in %s\n", 
					swalk->sname+5);
			}
			addtobuffer(reddata, msgline);

			addtostrbuffer(reddata, logsummary);

			break;
		}

		do { swalk=swalk->next; } while (swalk && strncmp(swalk->sname, "msgs:", 5));
	}

	freestrbuffer(logsummary);
................................................................................
				hostsvcclienturl(hostname, swalk->sname), swalk->sname+5);
		}
		else {
			sprintf(msgline, "\nFull log %s\n", 
				swalk->sname+5);
		}
		addtostatus(msgline);

		addtostatus(prehtmlquoted(swalk->sdata));

		do { swalk=swalk->next; } while (swalk && strncmp(swalk->sname, "msgs:", 5));
	}

	if (fromline && !localmode) addtostatus(fromline);

	finish_status();
}