Commit 3928448a authored by Ted Trask's avatar Ted Trask
Browse files

Fixed bug where user words not properly escaped

parent 1bddbe24
......@@ -118,5 +118,5 @@ function listfiles(self)
end
function editfile(self)
return self.handle_form(self, function() return self.model.readfile(self.clientdata.filename) end, self.model.updatefile, self.clientdata, "Save", "Edit Weblog File", "Weblog File Saved" )
return self.handle_form(self, self.model.readfile, self.model.updatefile, self.clientdata, "Save", "Edit Weblog File", "Weblog File Saved" )
end
......@@ -462,7 +462,7 @@ local function checkwords(logentry)
if not thisline then
break
end
_,instcnt = string.lower(logentry.URL):gsub(thisline, " ")
_,instcnt = string.lower(logentry.URL):gsub(format.escapemagiccharacters(thisline), " ")
if instcnt ~= 0 then
logentry.ignoreme = true
--logme("ignoring...")
......@@ -477,7 +477,7 @@ local function checkwords(logentry)
break
end
_,instcnt = string.lower(logentry.URL):gsub(thisline, " ")
_,instcnt = string.lower(logentry.URL):gsub(format.escapemagiccharacters(thisline), " ")
if instcnt ~= 0 then
-- logme("instcnt = "..instcnt)
isbad=1
......@@ -520,7 +520,7 @@ local function checkwords(logentry)
if not goodline then
break
end
_,instcnt = string.lower(logentry.URL):gsub(goodline, " ")
_,instcnt = string.lower(logentry.URL):gsub(format.escapemagiccharacters(goodline), " ")
--if string.find(logentry.URL,goodline) then
if instcnt ~= 0 then
if wrdcnt >= instcnt then
......@@ -1451,8 +1451,8 @@ function listfiles()
return retval
end
function readfile(filename)
return modelfunctions.getfiledetails(filename, files)
function readfile(self, clientdata)
return modelfunctions.getfiledetails(clientdata.filename, files)
end
function updatefile(self, filedetails)
......
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