Skip to content

Commit 86fdabe

Browse files
committed
[api] more regex fixes
1 parent 315f98d commit 86fdabe

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

api/utils/common.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -752,7 +752,7 @@ var common = {},
752752
common.returnMessage = function (params, returnCode, message, heads) {
753753
//set provided in configuration headers
754754
var headers = {'Content-Type': 'application/json; charset=utf-8', 'Access-Control-Allow-Origin':'*'};
755-
var add_headers = (plugins.getConfig("security").api_additional_headers || "").replace(/\r\n|\r|\n|\/n/g, "\n").split("\n");
755+
var add_headers = (plugins.getConfig("security").api_additional_headers || "").replace(/\r\n|\r|\n/g, "\n").split("\n");
756756
var parts;
757757
for(var i = 0; i < add_headers.length; i++){
758758
if(add_headers[i] && add_headers[i].length){
@@ -792,7 +792,7 @@ var common = {},
792792
}
793793
//set provided in configuration headers
794794
var headers = {'Content-Type': 'application/json; charset=utf-8', 'Access-Control-Allow-Origin':'*'};
795-
var add_headers = (plugins.getConfig("security").api_additional_headers || "").replace(/\r\n|\r|\n|\/n/g, "\n").split("\n");
795+
var add_headers = (plugins.getConfig("security").api_additional_headers || "").replace(/\r\n|\r|\n/g, "\n").split("\n");
796796
var parts;
797797
var escape = noescape ? undefined : escape_html_entities;
798798
for(var i = 0; i < add_headers.length; i++){

frontend/express/app.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ app.use(function(req, res, next) {
315315

316316
//set provided in configuration headers
317317
var headers = {};
318-
var add_headers = plugins.getConfig("security").dashboard_additional_headers.replace(/\r\n|\r|\n|\/n/g, "\n").split("\n");
318+
var add_headers = plugins.getConfig("security").dashboard_additional_headers.replace(/\r\n|\r|\n/g, "\n").split("\n");
319319
var parts;
320320
for(var i = 0; i < add_headers.length; i++){
321321
if(add_headers[i] && add_headers[i].length){

plugins/dbviewer/api/api.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ var plugin = {},
5353
transform: function(doc){return JSON.stringify(doc);}
5454
});
5555
var headers = {'Content-Type': 'application/json; charset=utf-8', 'Access-Control-Allow-Origin':'*'};
56-
var add_headers = (plugins.getConfig("security").api_additional_headers || "").replace(/\r\n|\r|\n|\/n/g, "\n").split("\n");
56+
var add_headers = (plugins.getConfig("security").api_additional_headers || "").replace(/\r\n|\r|\n/g, "\n").split("\n");
5757
var parts;
5858
for(var i = 0; i < add_headers.length; i++){
5959
if(add_headers[i] && add_headers[i].length){

plugins/pluginManager.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -752,7 +752,7 @@ var pluginManager = function pluginManager(){
752752
var at = "";
753753
if(log.getLevel("db") === "debug" || log.getLevel("db") === "info"){
754754
e = new Error();
755-
at += e.stack.replace(/\r\n|\r|\n|\/n/g, "\n").split("\n")[2];
755+
at += e.stack.replace(/\r\n|\r|\n/g, "\n").split("\n")[2];
756756
}
757757
if(typeof options === "function"){
758758
//options was not passed, we have callback
@@ -783,7 +783,7 @@ var pluginManager = function pluginManager(){
783783
var at = "";
784784
if(log.getLevel("db") === "debug" || log.getLevel("db") === "info"){
785785
e = new Error();
786-
at += e.stack.replace(/\r\n|\r|\n|\/n/g, "\n").split("\n")[2];
786+
at += e.stack.replace(/\r\n|\r|\n/g, "\n").split("\n")[2];
787787
}
788788
if(typeof options === "function"){
789789
//options was not passed, we have callback
@@ -832,7 +832,7 @@ var pluginManager = function pluginManager(){
832832
var at = "";
833833
if(log.getLevel("db") === "debug" || log.getLevel("db") === "info"){
834834
e = new Error();
835-
at += e.stack.replace(/\r\n|\r|\n|\/n/g, "\n").split("\n")[2];
835+
at += e.stack.replace(/\r\n|\r|\n/g, "\n").split("\n")[2];
836836
}
837837
if(typeof options === "function"){
838838
//options was not passed, we have callback
@@ -871,7 +871,7 @@ var pluginManager = function pluginManager(){
871871
var at = "";
872872
if(log.getLevel("db") === "debug" || log.getLevel("db") === "info"){
873873
e = new Error();
874-
at += e.stack.replace(/\r\n|\r|\n|\/n/g, "\n").split("\n")[2];
874+
at += e.stack.replace(/\r\n|\r|\n/g, "\n").split("\n")[2];
875875
}
876876
if(typeof options === "function"){
877877
//options was not passed, we have callback
@@ -896,7 +896,7 @@ var pluginManager = function pluginManager(){
896896
var at = "";
897897
if(log.getLevel("db") === "debug" || log.getLevel("db") === "info"){
898898
e = new Error();
899-
at += e.stack.replace(/\r\n|\r|\n|\/n/g, "\n").split("\n")[2];
899+
at += e.stack.replace(/\r\n|\r|\n/g, "\n").split("\n")[2];
900900
}
901901
logDbRead.d("find "+collection+" %j %j"+at, query, options);
902902
var cursor = this._find(query, options);

0 commit comments

Comments
 (0)