diff --git a/libs/monitor.js b/libs/monitor.js index 5369ecbf..b1a3345e 100644 --- a/libs/monitor.js +++ b/libs/monitor.js @@ -1176,14 +1176,14 @@ module.exports = function(s,config,lang){ }) s.log(e,{type:lang['Video Finished'],msg:{filename:d}}) if( - e.details.detector==='1'&& - s.group[e.ke].mon[e.id].started===1&& - e.details&& - e.details.detector_record_method==='del'&& - e.details.detector_delete_motionless_videos==='1'&& - s.group[e.ke].mon[e.id].detector_motion_count===0 + e.details.detector === '1' && + s.group[e.ke].mon[e.id].started === 1 && + e.details && + e.details.detector_record_method === 'del'&& + e.details.detector_delete_motionless_videos === '1'&& + s.group[e.ke].mon[e.id].detector_motion_count === 0 ){ - if(e.details.loglevel!=='quiet'){ + if(e.details.loglevel !== 'quiet'){ s.log(e,{type:lang['Delete Motionless Video'],msg:filename}); } s.deleteVideo({ diff --git a/libs/webServerPaths.js b/libs/webServerPaths.js index 4b681551..32f8d685 100644 --- a/libs/webServerPaths.js +++ b/libs/webServerPaths.js @@ -31,6 +31,10 @@ module.exports = function(s,config,lang,app){ if(config.webPaths.admin === undefined){config.webPaths.admin='/admin'} //API Prefix if(config.webPaths.apiPrefix === undefined){config.webPaths.apiPrefix='/'}else{config.webPaths.apiPrefix = s.checkCorrectPathEnding(config.webPaths.apiPrefix)} + //Admin API Prefix + if(config.webPaths.adminApiPrefix === undefined){config.webPaths.adminApiPrefix='/super/'}else{config.webPaths.adminApiPrefix = s.checkCorrectPathEnding(config.webPaths.adminApiPrefix)} + //Super API Prefix + if(config.webPaths.superApiPrefix === undefined){config.webPaths.superApiPrefix='/super/'}else{config.webPaths.superApiPrefix = s.checkCorrectPathEnding(config.webPaths.superApiPrefix)} //Render Configurations - Page Render Paths if(config.renderPaths === undefined){config.renderPaths={}} //login page @@ -68,6 +72,19 @@ module.exports = function(s,config,lang,app){ cb() } } + //get post data + s.getPostData = function(req){ + var postData = false + try{ + if(req.query.data){ + postData = JSON.parse(req.query.data) + }else{ + postData = JSON.parse(req.body.data) + } + }catch(er){ + } + return postData + } ////Pages app.enable('trust proxy'); app.use('/libs',express.static(s.mainDirectory + '/web/libs')); @@ -546,7 +563,7 @@ module.exports = function(s,config,lang,app){ req.failed(lang['2-Factor Authentication']) } } - }); + }) // Brute Protection Lock Reset by API app.get([config.webPaths.apiPrefix+':auth/resetBruteProtection/:ke'], function (req,res){ res.header("Access-Control-Allow-Origin",req.headers.origin); @@ -578,7 +595,7 @@ module.exports = function(s,config,lang,app){ },res,req) } s.auth(req.params,req.fn,res,req); - }); + }) //Get JPEG snap app.get(config.webPaths.apiPrefix+':auth/jpeg/:ke/:id/s.jpg', function(req,res){ res.header("Access-Control-Allow-Origin",req.headers.origin); @@ -1305,7 +1322,7 @@ module.exports = function(s,config,lang,app){ res.end(s.prettyPrint(r)); }) },res,req); - }); + }) // Get monitors online json app.get(config.webPaths.apiPrefix+':auth/smonitor/:ke', function (req,res){ req.ret={ok:false};