tomasz.sowa
/
winix
1
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

using PT::IsSubString* methods from pikotools 

git-svn-id: svn://ttmath.org/publicrep/winix/trunk@1138 e52654a7-88a9-db11-a3e9-0013d4bc506e
pull/3/head
Tomasz Sowa 2018-11-01 00:46:44 +00:00
parent 8f6004d444
commit 919c2f62f5
26 changed files with 272 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
winixd/Makefile.dep
View File

File diff suppressed because one or more lines are too long

30
winixd/core/Makefile.dep
View File

@ -47,7 +47,8 @@ app.o: ../../../winix/winixd/templates/localefilter.h ../../../ezc/src/ezc.h
app.o: ../../../ezc/src/generator.h ../../../ezc/src/blocks.h
app.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h
app.o: ../../../ezc/src/funinfo.h ../../../ezc/src/objects.h
app.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h
app.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h
app.o: ../../../ezc/src/patternparser.h
app.o: ../../../winix/winixd/notify/notifythread.h
app.o: ../../../winix/winixd/core/basethread.h
app.o: ../../../winix/winixd/notify/templatesnotify.h
@ -112,8 +113,9 @@ app.o: ../../../winix/winixd/templates/patterns.h
app.o: ../../../winix/winixd/templates/changepatterns.h
app.o: ../../../winix/winixd/templates/htmltextstream.h
app.o: ../../../winix/winixd/core/sessionmanager.h compress.h postparser.h
app.o: httpsimpleparser.h plugin.h pluginmsg.h cookieparser.h
app.o: postmultiparser.h acceptencodingparser.h acceptbaseparser.h
app.o: httpsimpleparser.h plugin.h pluginmsg.h
app.o: ../../../pikotools/convert/text.h cookieparser.h postmultiparser.h
app.o: acceptencodingparser.h acceptbaseparser.h
app.o: ../../../pikotools/space/jsontospaceparser.h
basethread.o: basethread.h synchro.h
bbcodeparser.o: bbcodeparser.h htmlfilter.h
@ -176,6 +178,7 @@ config.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
config.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h
config.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
config.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
config.o: ../../../ezc/src/expressionparser.h
config.o: ../../../ezc/src/patternparser.h
config.o: ../../../winix/winixd/notify/notifythread.h
config.o: ../../../winix/winixd/core/basethread.h
@ -314,7 +317,8 @@ dirs.o: ../../../winix/winixd/templates/localefilter.h ../../../ezc/src/ezc.h
dirs.o: ../../../ezc/src/generator.h ../../../ezc/src/blocks.h
dirs.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h
dirs.o: ../../../ezc/src/funinfo.h ../../../ezc/src/objects.h
dirs.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h
dirs.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h
dirs.o: ../../../ezc/src/patternparser.h
dirs.o: ../../../winix/winixd/notify/notifythread.h
dirs.o: ../../../winix/winixd/core/basethread.h
dirs.o: ../../../winix/winixd/notify/templatesnotify.h
@ -400,7 +404,7 @@ image.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
image.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h
image.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
image.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
image.o: ../../../ezc/src/patternparser.h
image.o: ../../../ezc/src/expressionparser.h ../../../ezc/src/patternparser.h
image.o: ../../../winix/winixd/notify/notifythread.h
image.o: ../../../winix/winixd/core/basethread.h
image.o: ../../../winix/winixd/notify/templatesnotify.h
@ -534,7 +538,8 @@ job.o: ../../../winix/winixd/templates/localefilter.h ../../../ezc/src/ezc.h
job.o: ../../../ezc/src/generator.h ../../../ezc/src/blocks.h
job.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h
job.o: ../../../ezc/src/funinfo.h ../../../ezc/src/objects.h
job.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h
job.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h
job.o: ../../../ezc/src/patternparser.h
job.o: ../../../winix/winixd/notify/notifythread.h
job.o: ../../../winix/winixd/core/basethread.h
job.o: ../../../winix/winixd/notify/templatesnotify.h
@ -677,7 +682,8 @@ misc.o: ../../../winix/winixd/templates/templates.h ../../../ezc/src/ezc.h
misc.o: ../../../ezc/src/generator.h ../../../ezc/src/blocks.h
misc.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h
misc.o: ../../../ezc/src/funinfo.h ../../../ezc/src/objects.h
misc.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h
misc.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h
misc.o: ../../../ezc/src/patternparser.h
misc.o: ../../../winix/winixd/templates/patterncacher.h
misc.o: ../../../winix/winixd/core/item.h
misc.o: ../../../winix/winixd/templates/indexpatterns.h
@ -748,6 +754,7 @@ mountparser.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
mountparser.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h
mountparser.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
mountparser.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
mountparser.o: ../../../ezc/src/expressionparser.h
mountparser.o: ../../../ezc/src/patternparser.h
mountparser.o: ../../../winix/winixd/notify/notifythread.h
mountparser.o: ../../../winix/winixd/core/basethread.h
@ -794,6 +801,7 @@ mounts.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
mounts.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h
mounts.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
mounts.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
mounts.o: ../../../ezc/src/expressionparser.h
mounts.o: ../../../ezc/src/patternparser.h
mounts.o: ../../../winix/winixd/notify/notifythread.h
mounts.o: ../../../winix/winixd/core/basethread.h
@ -900,6 +908,7 @@ plugin.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
plugin.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h
plugin.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
plugin.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
plugin.o: ../../../ezc/src/expressionparser.h
plugin.o: ../../../ezc/src/patternparser.h
plugin.o: ../../../winix/winixd/notify/notifythread.h
plugin.o: ../../../winix/winixd/core/basethread.h
@ -1006,6 +1015,7 @@ plugindata.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
plugindata.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h
plugindata.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
plugindata.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
plugindata.o: ../../../ezc/src/expressionparser.h
plugindata.o: ../../../ezc/src/patternparser.h
plugindata.o: ../../../winix/winixd/notify/notifythread.h
plugindata.o: ../../../winix/winixd/core/basethread.h
@ -1094,6 +1104,7 @@ postmultiparser.o: ../../../pikotools/space/spacetojson.h
postmultiparser.o: ../../../ezc/src/outstreams.h session.h user.h
postmultiparser.o: plugindata.h rebus.h ipban.h mount.h
postmultiparser.o: ../../../winix/winixd/templates/locale.h
postmultiparser.o: ../../../pikotools/convert/text.h
rebus.o: log.h textstream.h logmanipulators.h
rebus.o: ../../../pikotools/textstream/textstream.h
rebus.o: ../../../pikotools/space/space.h
@ -1153,6 +1164,7 @@ request.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
request.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h
request.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
request.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
request.o: ../../../ezc/src/expressionparser.h
request.o: ../../../ezc/src/patternparser.h
request.o: ../../../winix/winixd/notify/notifythread.h
request.o: ../../../winix/winixd/core/basethread.h
@ -1336,6 +1348,7 @@ sessionmanager.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
sessionmanager.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h
sessionmanager.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
sessionmanager.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
sessionmanager.o: ../../../ezc/src/expressionparser.h
sessionmanager.o: ../../../ezc/src/patternparser.h
sessionmanager.o: ../../../winix/winixd/notify/notifythread.h
sessionmanager.o: ../../../winix/winixd/core/basethread.h
@ -1482,6 +1495,7 @@ system.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
system.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h
system.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
system.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
system.o: ../../../ezc/src/expressionparser.h
system.o: ../../../ezc/src/patternparser.h
system.o: ../../../winix/winixd/notify/notifythread.h
system.o: ../../../winix/winixd/core/basethread.h
@ -1638,7 +1652,7 @@ users.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
users.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h
users.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
users.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
users.o: ../../../ezc/src/patternparser.h
users.o: ../../../ezc/src/expressionparser.h ../../../ezc/src/patternparser.h
users.o: ../../../winix/winixd/notify/notifythread.h
users.o: ../../../winix/winixd/core/basethread.h
users.o: ../../../winix/winixd/notify/templatesnotify.h

8
winixd/core/app.cpp
View File

@ -825,12 +825,12 @@ void App::ReadEnvHTTPVariables()
{
char * env = *e;
if( IsSubStringNoCasep("HTTP_", env) )
if( PT::IsSubStringNoCasep("HTTP_", env) )
{
env += http_prefix_len;
// cookies we have in a different table
if( !IsSubStringNoCasep("COOKIE=", env) )
if( !PT::IsSubStringNoCasep("COOKIE=", env) )
{
if( SaveEnvHTTPVariable(env) )
{
@ -1030,13 +1030,13 @@ void App::ReadPostVars()
if( cur.request->method == Request::post || cur.request->method == Request::delete_ )
{
if( IsSubStringNoCase(L"multipart/form-data", cur.request->env_content_type.c_str()) )
if( PT::IsSubStringNoCase(L"multipart/form-data", cur.request->env_content_type.c_str()) )
{
log << log3 << "App: post content type: multipart/form-data" << logend;
post_multi_parser.Parse(fcgi_request.in, cur.request->post_tab, cur.request->post_file_tab);
}
else
if( IsSubStringNoCase(L"application/json", cur.request->env_content_type.c_str()) )
if( PT::IsSubStringNoCase(L"application/json", cur.request->env_content_type.c_str()) )
{
log << log3 << "App: post content type: application/json" << logend;
ReadPostJson();

3
winixd/core/misc.h
View File

@ -45,6 +45,7 @@
#include "textstream/textstream.h"
#include "utf8/utf8.h"
#include "winix_const.h"
#include "convert/convert.h"
@ -419,7 +420,7 @@ size_t i = 0;
while( i < buf.size() )
{
if( IsSubString(look_for.c_str(), buf.c_str() + i) )
if( PT::IsSubString(look_for.c_str(), buf.c_str() + i) )
{
buf.erase(i, look_for.size());
buf.insert(i, replace);

5
winixd/core/postmultiparser.cpp
View File

@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2008-2014, Tomasz Sowa
* Copyright (c) 2008-2018, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -37,6 +37,7 @@
#include "postmultiparser.h"
#include "log.h"
#include "utf8/utf8.h"
#include "convert/text.h"
@ -381,7 +382,7 @@ void PostMultiParser::ReadContent()
log << log2 << "PMP: content size: " << content_len << " bytes" << logend;
if( !IsSubStringNoCase("pass", name.c_str()) )
if( !PT::IsSubStringNoCase("pass", name.c_str()) )
LogFirst(content, config->log_post_value_size);
}

5
winixd/core/postparser.h
View File

@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2008-2014, Tomasz Sowa
* Copyright (c) 2008-2018, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -43,6 +43,7 @@
#include "utf8/utf8.h"
#include "log.h"
#include "plugin.h"
#include "convert/text.h"
namespace Winix
@ -78,7 +79,7 @@ protected:
{
log << log2 << "Method POST, name: \"" << name << "\"";
if( log_value_size > 0 && !IsSubStringNoCase(L"pass", name.c_str()) )
if( log_value_size > 0 && !PT::IsSubStringNoCase(L"pass", name.c_str()) )
{
log << ", value: ";

103
winixd/functions/Makefile.dep
View File

@ -64,6 +64,7 @@ account.o: rm.h rmuser.h run.h sort.h specialdefault.h stat.h subject.h
account.o: template.h timezone.h tinymce.h uname.h upload.h uptime.h who.h
account.o: vim.h ../../../winix/winixd/core/htmlfilter.h
account.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
account.o: ../../../ezc/src/expressionparser.h
account.o: ../../../ezc/src/patternparser.h
account.o: ../../../winix/winixd/notify/notifythread.h
account.o: ../../../winix/winixd/core/basethread.h
@ -149,6 +150,7 @@ adduser.o: rm.h rmuser.h run.h sort.h specialdefault.h stat.h subject.h
adduser.o: template.h timezone.h tinymce.h uname.h upload.h uptime.h who.h
adduser.o: vim.h ../../../winix/winixd/core/htmlfilter.h
adduser.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
adduser.o: ../../../ezc/src/expressionparser.h
adduser.o: ../../../ezc/src/patternparser.h
adduser.o: ../../../winix/winixd/notify/notifythread.h
adduser.o: ../../../winix/winixd/core/basethread.h
@ -241,7 +243,8 @@ cat.o: mv.h nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h rmuser.h
cat.o: run.h sort.h specialdefault.h stat.h subject.h template.h timezone.h
cat.o: tinymce.h uname.h upload.h uptime.h who.h vim.h
cat.o: ../../../winix/winixd/core/htmlfilter.h ../../../ezc/src/objects.h
cat.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h
cat.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h
cat.o: ../../../ezc/src/patternparser.h
cat.o: ../../../winix/winixd/notify/notifythread.h
cat.o: ../../../winix/winixd/core/basethread.h
cat.o: ../../../winix/winixd/notify/templatesnotify.h
@ -317,7 +320,7 @@ chmod.o: reload.h rm.h rmuser.h run.h sort.h specialdefault.h stat.h
chmod.o: subject.h template.h timezone.h tinymce.h uname.h upload.h uptime.h
chmod.o: who.h vim.h ../../../winix/winixd/core/htmlfilter.h
chmod.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
chmod.o: ../../../ezc/src/patternparser.h
chmod.o: ../../../ezc/src/expressionparser.h ../../../ezc/src/patternparser.h
chmod.o: ../../../winix/winixd/notify/notifythread.h
chmod.o: ../../../winix/winixd/core/basethread.h
chmod.o: ../../../winix/winixd/notify/templatesnotify.h
@ -395,7 +398,7 @@ chown.o: reload.h rm.h rmuser.h run.h sort.h specialdefault.h stat.h
chown.o: subject.h template.h timezone.h tinymce.h uname.h upload.h uptime.h
chown.o: who.h vim.h ../../../winix/winixd/core/htmlfilter.h
chown.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
chown.o: ../../../ezc/src/patternparser.h
chown.o: ../../../ezc/src/expressionparser.h ../../../ezc/src/patternparser.h
chown.o: ../../../winix/winixd/notify/notifythread.h
chown.o: ../../../winix/winixd/core/basethread.h
chown.o: ../../../winix/winixd/notify/templatesnotify.h
@ -479,6 +482,7 @@ ckeditor.o: pw.h reload.h rm.h rmuser.h run.h sort.h specialdefault.h stat.h
ckeditor.o: subject.h template.h timezone.h tinymce.h uname.h upload.h
ckeditor.o: uptime.h who.h vim.h ../../../winix/winixd/core/htmlfilter.h
ckeditor.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
ckeditor.o: ../../../ezc/src/expressionparser.h
ckeditor.o: ../../../ezc/src/patternparser.h
ckeditor.o: ../../../winix/winixd/notify/notifythread.h
ckeditor.o: ../../../winix/winixd/core/basethread.h
@ -550,7 +554,8 @@ cp.o: nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h rmuser.h run.h
cp.o: sort.h specialdefault.h stat.h subject.h template.h timezone.h
cp.o: tinymce.h uname.h upload.h uptime.h who.h vim.h
cp.o: ../../../winix/winixd/core/htmlfilter.h ../../../ezc/src/objects.h
cp.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h
cp.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h
cp.o: ../../../ezc/src/patternparser.h
cp.o: ../../../winix/winixd/notify/notifythread.h
cp.o: ../../../winix/winixd/core/basethread.h
cp.o: ../../../winix/winixd/notify/templatesnotify.h
@ -646,6 +651,7 @@ default.o: pw.h reload.h rm.h rmuser.h run.h sort.h specialdefault.h stat.h
default.o: subject.h template.h timezone.h tinymce.h uname.h upload.h
default.o: uptime.h who.h vim.h ../../../winix/winixd/core/htmlfilter.h
default.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
default.o: ../../../ezc/src/expressionparser.h
default.o: ../../../ezc/src/patternparser.h
default.o: ../../../winix/winixd/notify/notifythread.h
default.o: ../../../winix/winixd/core/basethread.h
@ -730,6 +736,7 @@ download.o: pw.h reload.h rm.h rmuser.h run.h sort.h specialdefault.h stat.h
download.o: subject.h template.h timezone.h tinymce.h uname.h upload.h
download.o: uptime.h who.h vim.h ../../../winix/winixd/core/htmlfilter.h
download.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
download.o: ../../../ezc/src/expressionparser.h
download.o: ../../../ezc/src/patternparser.h
download.o: ../../../winix/winixd/notify/notifythread.h
download.o: ../../../winix/winixd/core/basethread.h
@ -808,7 +815,7 @@ emacs.o: reload.h rm.h rmuser.h run.h sort.h specialdefault.h stat.h
emacs.o: subject.h template.h timezone.h tinymce.h uname.h upload.h uptime.h
emacs.o: who.h vim.h ../../../winix/winixd/core/htmlfilter.h
emacs.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
emacs.o: ../../../ezc/src/patternparser.h
emacs.o: ../../../ezc/src/expressionparser.h ../../../ezc/src/patternparser.h
emacs.o: ../../../winix/winixd/notify/notifythread.h
emacs.o: ../../../winix/winixd/core/basethread.h
emacs.o: ../../../winix/winixd/notify/templatesnotify.h
@ -888,7 +895,8 @@ env.o: nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h rmuser.h run.h
env.o: sort.h specialdefault.h stat.h subject.h template.h timezone.h
env.o: tinymce.h uname.h upload.h uptime.h who.h vim.h
env.o: ../../../winix/winixd/core/htmlfilter.h ../../../ezc/src/objects.h
env.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h
env.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h
env.o: ../../../ezc/src/patternparser.h
env.o: ../../../winix/winixd/notify/notifythread.h
env.o: ../../../winix/winixd/core/basethread.h
env.o: ../../../winix/winixd/notify/templatesnotify.h
@ -973,6 +981,7 @@ functionbase.o: run.h sort.h specialdefault.h stat.h subject.h template.h
functionbase.o: timezone.h tinymce.h uname.h upload.h uptime.h who.h vim.h
functionbase.o: ../../../winix/winixd/core/htmlfilter.h
functionbase.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
functionbase.o: ../../../ezc/src/expressionparser.h
functionbase.o: ../../../ezc/src/patternparser.h
functionbase.o: ../../../winix/winixd/notify/notifythread.h
functionbase.o: ../../../winix/winixd/core/basethread.h
@ -1060,6 +1069,7 @@ functionparser.o: subject.h template.h timezone.h tinymce.h uname.h upload.h
functionparser.o: uptime.h who.h vim.h
functionparser.o: ../../../winix/winixd/core/htmlfilter.h
functionparser.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
functionparser.o: ../../../ezc/src/expressionparser.h
functionparser.o: ../../../ezc/src/patternparser.h
functionparser.o: ../../../winix/winixd/notify/notifythread.h
functionparser.o: ../../../winix/winixd/core/basethread.h
@ -1140,6 +1150,7 @@ functions.o: ../../../winix/winixd/templates/localefilter.h
functions.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
functions.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h
functions.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
functions.o: ../../../ezc/src/expressionparser.h
functions.o: ../../../ezc/src/patternparser.h
functions.o: ../../../winix/winixd/notify/notifythread.h
functions.o: ../../../winix/winixd/core/basethread.h
@ -1248,6 +1259,7 @@ imgcrop.o: pw.h reload.h rm.h rmuser.h run.h sort.h specialdefault.h stat.h
imgcrop.o: subject.h template.h timezone.h tinymce.h uname.h upload.h
imgcrop.o: uptime.h who.h vim.h ../../../winix/winixd/core/htmlfilter.h
imgcrop.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
imgcrop.o: ../../../ezc/src/expressionparser.h
imgcrop.o: ../../../ezc/src/patternparser.h
imgcrop.o: ../../../winix/winixd/notify/notifythread.h
imgcrop.o: ../../../winix/winixd/core/basethread.h
@ -1326,7 +1338,7 @@ ipban.o: pw.h reload.h rm.h rmuser.h run.h sort.h specialdefault.h stat.h
ipban.o: subject.h template.h timezone.h tinymce.h uname.h upload.h uptime.h
ipban.o: who.h vim.h ../../../winix/winixd/core/htmlfilter.h
ipban.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
ipban.o: ../../../ezc/src/patternparser.h
ipban.o: ../../../ezc/src/expressionparser.h ../../../ezc/src/patternparser.h
ipban.o: ../../../winix/winixd/notify/notifythread.h
ipban.o: ../../../winix/winixd/core/basethread.h
ipban.o: ../../../winix/winixd/notify/templatesnotify.h
@ -1404,7 +1416,8 @@ last.o: nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h rmuser.h run.h
last.o: sort.h specialdefault.h stat.h subject.h template.h timezone.h
last.o: tinymce.h uname.h upload.h uptime.h who.h vim.h
last.o: ../../../winix/winixd/core/htmlfilter.h ../../../ezc/src/objects.h
last.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h
last.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h
last.o: ../../../ezc/src/patternparser.h
last.o: ../../../winix/winixd/notify/notifythread.h
last.o: ../../../winix/winixd/core/basethread.h
last.o: ../../../winix/winixd/notify/templatesnotify.h
@ -1474,7 +1487,8 @@ ln.o: nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h rmuser.h run.h
ln.o: sort.h specialdefault.h stat.h subject.h template.h timezone.h
ln.o: tinymce.h uname.h upload.h uptime.h who.h vim.h
ln.o: ../../../winix/winixd/core/htmlfilter.h ../../../ezc/src/objects.h
ln.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h
ln.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h
ln.o: ../../../ezc/src/patternparser.h
ln.o: ../../../winix/winixd/notify/notifythread.h
ln.o: ../../../winix/winixd/core/basethread.h
ln.o: ../../../winix/winixd/notify/templatesnotify.h
@ -1553,7 +1567,8 @@ locale.o: passwd.h priv.h pw.h reload.h rm.h rmuser.h run.h sort.h
locale.o: specialdefault.h stat.h subject.h template.h timezone.h tinymce.h
locale.o: uname.h upload.h uptime.h who.h vim.h
locale.o: ../../../winix/winixd/core/htmlfilter.h ../../../ezc/src/objects.h
locale.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h
locale.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h
locale.o: ../../../ezc/src/patternparser.h
locale.o: ../../../winix/winixd/notify/notifythread.h
locale.o: ../../../winix/winixd/core/basethread.h
locale.o: ../../../winix/winixd/notify/templatesnotify.h
@ -1638,7 +1653,7 @@ login.o: reload.h rm.h rmuser.h run.h sort.h specialdefault.h stat.h
login.o: subject.h template.h timezone.h tinymce.h uname.h upload.h uptime.h
login.o: who.h vim.h ../../../winix/winixd/core/htmlfilter.h
login.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
login.o: ../../../ezc/src/patternparser.h
login.o: ../../../ezc/src/expressionparser.h ../../../ezc/src/patternparser.h
login.o: ../../../winix/winixd/notify/notifythread.h
login.o: ../../../winix/winixd/core/basethread.h
login.o: ../../../winix/winixd/notify/templatesnotify.h
@ -1718,6 +1733,7 @@ logout.o: pw.h reload.h rm.h rmuser.h run.h sort.h specialdefault.h stat.h
logout.o: subject.h template.h timezone.h tinymce.h uname.h upload.h uptime.h
logout.o: who.h vim.h ../../../winix/winixd/core/htmlfilter.h
logout.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
logout.o: ../../../ezc/src/expressionparser.h
logout.o: ../../../ezc/src/patternparser.h
logout.o: ../../../winix/winixd/notify/notifythread.h
logout.o: ../../../winix/winixd/core/basethread.h
@ -1789,7 +1805,8 @@ ls.o: nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h rmuser.h run.h
ls.o: sort.h specialdefault.h stat.h subject.h template.h timezone.h
ls.o: tinymce.h uname.h upload.h uptime.h who.h vim.h
ls.o: ../../../winix/winixd/core/htmlfilter.h ../../../ezc/src/objects.h
ls.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h
ls.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h
ls.o: ../../../ezc/src/patternparser.h
ls.o: ../../../winix/winixd/notify/notifythread.h
ls.o: ../../../winix/winixd/core/basethread.h
ls.o: ../../../winix/winixd/notify/templatesnotify.h
@ -1859,7 +1876,8 @@ man.o: nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h rmuser.h run.h
man.o: sort.h specialdefault.h stat.h subject.h template.h timezone.h
man.o: tinymce.h uname.h upload.h uptime.h who.h vim.h
man.o: ../../../winix/winixd/core/htmlfilter.h ../../../ezc/src/objects.h
man.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h
man.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h
man.o: ../../../ezc/src/patternparser.h
man.o: ../../../winix/winixd/notify/notifythread.h
man.o: ../../../winix/winixd/core/basethread.h
man.o: ../../../winix/winixd/notify/templatesnotify.h
@ -1934,7 +1952,8 @@ meta.o: nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h rmuser.h run.h
meta.o: sort.h specialdefault.h stat.h subject.h template.h timezone.h
meta.o: tinymce.h uname.h upload.h uptime.h who.h vim.h
meta.o: ../../../winix/winixd/core/htmlfilter.h ../../../ezc/src/objects.h
meta.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h
meta.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h
meta.o: ../../../ezc/src/patternparser.h
meta.o: ../../../winix/winixd/notify/notifythread.h
meta.o: ../../../winix/winixd/core/basethread.h
meta.o: ../../../winix/winixd/notify/templatesnotify.h
@ -2011,7 +2030,7 @@ mkdir.o: reload.h rm.h rmuser.h run.h sort.h specialdefault.h stat.h
mkdir.o: subject.h template.h timezone.h tinymce.h uname.h upload.h uptime.h
mkdir.o: who.h vim.h ../../../winix/winixd/core/htmlfilter.h
mkdir.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
mkdir.o: ../../../ezc/src/patternparser.h
mkdir.o: ../../../ezc/src/expressionparser.h ../../../ezc/src/patternparser.h
mkdir.o: ../../../winix/winixd/notify/notifythread.h
mkdir.o: ../../../winix/winixd/core/basethread.h
mkdir.o: ../../../winix/winixd/notify/templatesnotify.h
@ -2105,7 +2124,7 @@ mount.o: pw.h reload.h rm.h rmuser.h run.h sort.h specialdefault.h stat.h
mount.o: subject.h template.h timezone.h tinymce.h uname.h upload.h uptime.h
mount.o: who.h vim.h ../../../winix/winixd/core/htmlfilter.h
mount.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
mount.o: ../../../ezc/src/patternparser.h
mount.o: ../../../ezc/src/expressionparser.h ../../../ezc/src/patternparser.h
mount.o: ../../../winix/winixd/notify/notifythread.h
mount.o: ../../../winix/winixd/core/basethread.h
mount.o: ../../../winix/winixd/notify/templatesnotify.h
@ -2176,7 +2195,8 @@ mv.o: nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h rmuser.h run.h
mv.o: sort.h specialdefault.h stat.h subject.h template.h timezone.h
mv.o: tinymce.h uname.h upload.h uptime.h who.h vim.h
mv.o: ../../../winix/winixd/core/htmlfilter.h ../../../ezc/src/objects.h
mv.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h
mv.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h
mv.o: ../../../ezc/src/patternparser.h
mv.o: ../../../winix/winixd/notify/notifythread.h
mv.o: ../../../winix/winixd/core/basethread.h
mv.o: ../../../winix/winixd/notify/templatesnotify.h
@ -2271,6 +2291,7 @@ nicedit.o: priv.h pw.h reload.h rm.h rmuser.h run.h sort.h specialdefault.h
nicedit.o: stat.h subject.h template.h timezone.h tinymce.h uname.h upload.h
nicedit.o: uptime.h who.h vim.h ../../../winix/winixd/core/htmlfilter.h
nicedit.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
nicedit.o: ../../../ezc/src/expressionparser.h
nicedit.o: ../../../ezc/src/patternparser.h
nicedit.o: ../../../winix/winixd/notify/notifythread.h
nicedit.o: ../../../winix/winixd/core/basethread.h
@ -2348,7 +2369,8 @@ node.o: mkdir.h mv.h nicedit.h passwd.h priv.h pw.h reload.h rm.h rmuser.h
node.o: run.h sort.h specialdefault.h stat.h subject.h template.h timezone.h
node.o: tinymce.h uname.h upload.h uptime.h who.h vim.h
node.o: ../../../winix/winixd/core/htmlfilter.h ../../../ezc/src/objects.h
node.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h
node.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h
node.o: ../../../ezc/src/patternparser.h
node.o: ../../../winix/winixd/notify/notifythread.h
node.o: ../../../winix/winixd/core/basethread.h
node.o: ../../../winix/winixd/notify/templatesnotify.h
@ -2427,6 +2449,7 @@ passwd.o: priv.h pw.h reload.h rm.h rmuser.h run.h sort.h specialdefault.h
passwd.o: stat.h subject.h template.h timezone.h tinymce.h uname.h upload.h
passwd.o: uptime.h who.h vim.h ../../../winix/winixd/core/htmlfilter.h
passwd.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
passwd.o: ../../../ezc/src/expressionparser.h
passwd.o: ../../../ezc/src/patternparser.h
passwd.o: ../../../winix/winixd/notify/notifythread.h
passwd.o: ../../../winix/winixd/core/basethread.h
@ -2506,7 +2529,8 @@ priv.o: mkdir.h mv.h nicedit.h node.h passwd.h pw.h reload.h rm.h rmuser.h
priv.o: run.h sort.h specialdefault.h stat.h subject.h template.h timezone.h
priv.o: tinymce.h uname.h upload.h uptime.h who.h vim.h
priv.o: ../../../winix/winixd/core/htmlfilter.h ../../../ezc/src/objects.h
priv.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h
priv.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h
priv.o: ../../../ezc/src/patternparser.h
priv.o: ../../../winix/winixd/notify/notifythread.h
priv.o: ../../../winix/winixd/core/basethread.h
priv.o: ../../../winix/winixd/notify/templatesnotify.h
@ -2593,6 +2617,7 @@ privchanger.o: specialdefault.h stat.h subject.h template.h timezone.h
privchanger.o: tinymce.h uname.h upload.h uptime.h who.h vim.h
privchanger.o: ../../../winix/winixd/core/htmlfilter.h
privchanger.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
privchanger.o: ../../../ezc/src/expressionparser.h
privchanger.o: ../../../ezc/src/patternparser.h
privchanger.o: ../../../winix/winixd/notify/notifythread.h
privchanger.o: ../../../winix/winixd/core/basethread.h
@ -2663,7 +2688,8 @@ pw.o: mv.h nicedit.h node.h passwd.h priv.h reload.h rm.h rmuser.h run.h
pw.o: sort.h specialdefault.h stat.h subject.h template.h timezone.h
pw.o: tinymce.h uname.h upload.h uptime.h who.h vim.h
pw.o: ../../../winix/winixd/core/htmlfilter.h ../../../ezc/src/objects.h
pw.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h
pw.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h
pw.o: ../../../ezc/src/patternparser.h
pw.o: ../../../winix/winixd/notify/notifythread.h
pw.o: ../../../winix/winixd/core/basethread.h
pw.o: ../../../winix/winixd/notify/templatesnotify.h
@ -2742,6 +2768,7 @@ reload.o: passwd.h priv.h pw.h rm.h rmuser.h run.h sort.h specialdefault.h
reload.o: stat.h subject.h template.h timezone.h tinymce.h uname.h upload.h
reload.o: uptime.h who.h vim.h ../../../winix/winixd/core/htmlfilter.h
reload.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
reload.o: ../../../ezc/src/expressionparser.h
reload.o: ../../../ezc/src/patternparser.h
reload.o: ../../../winix/winixd/notify/notifythread.h
reload.o: ../../../winix/winixd/core/basethread.h
@ -2820,7 +2847,8 @@ rm.o: mv.h nicedit.h node.h passwd.h priv.h pw.h reload.h rmuser.h run.h
rm.o: sort.h specialdefault.h stat.h subject.h template.h timezone.h
rm.o: tinymce.h uname.h upload.h uptime.h who.h vim.h
rm.o: ../../../winix/winixd/core/htmlfilter.h ../../../ezc/src/objects.h
rm.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h
rm.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h
rm.o: ../../../ezc/src/patternparser.h
rm.o: ../../../winix/winixd/notify/notifythread.h
rm.o: ../../../winix/winixd/core/basethread.h
rm.o: ../../../winix/winixd/notify/templatesnotify.h
@ -2915,6 +2943,7 @@ rmuser.o: passwd.h priv.h pw.h reload.h rm.h run.h sort.h specialdefault.h
rmuser.o: stat.h subject.h template.h timezone.h tinymce.h uname.h upload.h
rmuser.o: uptime.h who.h vim.h ../../../winix/winixd/core/htmlfilter.h
rmuser.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
rmuser.o: ../../../ezc/src/expressionparser.h
rmuser.o: ../../../ezc/src/patternparser.h
rmuser.o: ../../../winix/winixd/notify/notifythread.h
rmuser.o: ../../../winix/winixd/core/basethread.h
@ -3006,7 +3035,8 @@ run.o: mv.h nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h rmuser.h
run.o: sort.h specialdefault.h stat.h subject.h template.h timezone.h
run.o: tinymce.h uname.h upload.h uptime.h who.h vim.h
run.o: ../../../winix/winixd/core/htmlfilter.h ../../../ezc/src/objects.h
run.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h
run.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h
run.o: ../../../ezc/src/patternparser.h
run.o: ../../../winix/winixd/notify/notifythread.h
run.o: ../../../winix/winixd/core/basethread.h
run.o: ../../../winix/winixd/notify/templatesnotify.h
@ -3081,7 +3111,8 @@ sort.o: mkdir.h mv.h nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h
sort.o: rmuser.h run.h specialdefault.h stat.h subject.h template.h
sort.o: timezone.h tinymce.h uname.h upload.h uptime.h who.h vim.h
sort.o: ../../../winix/winixd/core/htmlfilter.h ../../../ezc/src/objects.h
sort.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h
sort.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h
sort.o: ../../../ezc/src/patternparser.h
sort.o: ../../../winix/winixd/notify/notifythread.h
sort.o: ../../../winix/winixd/core/basethread.h
sort.o: ../../../winix/winixd/notify/templatesnotify.h
@ -3185,6 +3216,7 @@ specialdefault.o: stat.h subject.h template.h timezone.h tinymce.h uname.h
specialdefault.o: upload.h uptime.h who.h vim.h
specialdefault.o: ../../../winix/winixd/core/htmlfilter.h
specialdefault.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
specialdefault.o: ../../../ezc/src/expressionparser.h
specialdefault.o: ../../../ezc/src/patternparser.h
specialdefault.o: ../../../winix/winixd/notify/notifythread.h
specialdefault.o: ../../../winix/winixd/core/basethread.h
@ -3262,7 +3294,8 @@ stat.o: mkdir.h mv.h nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h
stat.o: rmuser.h run.h sort.h specialdefault.h subject.h template.h
stat.o: timezone.h tinymce.h uname.h upload.h uptime.h who.h vim.h
stat.o: ../../../winix/winixd/core/htmlfilter.h ../../../ezc/src/objects.h
stat.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h
stat.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h
stat.o: ../../../ezc/src/patternparser.h
stat.o: ../../../winix/winixd/notify/notifythread.h
stat.o: ../../../winix/winixd/core/basethread.h
stat.o: ../../../winix/winixd/notify/templatesnotify.h
@ -3343,7 +3376,8 @@ subject.o: passwd.h priv.h pw.h reload.h rm.h rmuser.h run.h sort.h
subject.o: specialdefault.h stat.h template.h timezone.h tinymce.h uname.h
subject.o: upload.h uptime.h who.h vim.h
subject.o: ../../../winix/winixd/core/htmlfilter.h ../../../ezc/src/objects.h
subject.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h
subject.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h
subject.o: ../../../ezc/src/patternparser.h
subject.o: ../../../winix/winixd/notify/notifythread.h
subject.o: ../../../winix/winixd/core/basethread.h
subject.o: ../../../winix/winixd/notify/templatesnotify.h
@ -3444,6 +3478,7 @@ template.o: specialdefault.h stat.h subject.h timezone.h tinymce.h uname.h
template.o: upload.h uptime.h who.h vim.h
template.o: ../../../winix/winixd/core/htmlfilter.h
template.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
template.o: ../../../ezc/src/expressionparser.h
template.o: ../../../ezc/src/patternparser.h
template.o: ../../../winix/winixd/notify/notifythread.h
template.o: ../../../winix/winixd/core/basethread.h
@ -3531,6 +3566,7 @@ timezone.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h
timezone.o: upload.h uptime.h who.h vim.h
timezone.o: ../../../winix/winixd/core/htmlfilter.h
timezone.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
timezone.o: ../../../ezc/src/expressionparser.h
timezone.o: ../../../ezc/src/patternparser.h
timezone.o: ../../../winix/winixd/notify/notifythread.h
timezone.o: ../../../winix/winixd/core/basethread.h
@ -3613,7 +3649,8 @@ tinymce.o: passwd.h priv.h pw.h reload.h rm.h rmuser.h run.h sort.h
tinymce.o: specialdefault.h stat.h subject.h template.h timezone.h uname.h
tinymce.o: upload.h uptime.h who.h vim.h
tinymce.o: ../../../winix/winixd/core/htmlfilter.h ../../../ezc/src/objects.h
tinymce.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h
tinymce.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h
tinymce.o: ../../../ezc/src/patternparser.h
tinymce.o: ../../../winix/winixd/notify/notifythread.h
tinymce.o: ../../../winix/winixd/core/basethread.h
tinymce.o: ../../../winix/winixd/notify/templatesnotify.h
@ -3691,7 +3728,7 @@ uname.o: pw.h reload.h rm.h rmuser.h run.h sort.h specialdefault.h stat.h
uname.o: subject.h template.h timezone.h tinymce.h upload.h uptime.h who.h
uname.o: vim.h ../../../winix/winixd/core/htmlfilter.h
uname.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
uname.o: ../../../ezc/src/patternparser.h
uname.o: ../../../ezc/src/expressionparser.h ../../../ezc/src/patternparser.h
uname.o: ../../../winix/winixd/notify/notifythread.h
uname.o: ../../../winix/winixd/core/basethread.h
uname.o: ../../../winix/winixd/notify/templatesnotify.h
@ -3771,7 +3808,8 @@ upload.o: passwd.h priv.h pw.h reload.h rm.h rmuser.h run.h sort.h
upload.o: specialdefault.h stat.h subject.h template.h timezone.h tinymce.h
upload.o: uname.h uptime.h who.h vim.h
upload.o: ../../../winix/winixd/core/htmlfilter.h ../../../ezc/src/objects.h
upload.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h
upload.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h
upload.o: ../../../ezc/src/patternparser.h
upload.o: ../../../winix/winixd/notify/notifythread.h
upload.o: ../../../winix/winixd/core/basethread.h
upload.o: ../../../winix/winixd/notify/templatesnotify.h
@ -3869,7 +3907,8 @@ uptime.o: passwd.h priv.h pw.h reload.h rm.h rmuser.h run.h sort.h
uptime.o: specialdefault.h stat.h subject.h template.h timezone.h tinymce.h
uptime.o: uname.h upload.h who.h vim.h
uptime.o: ../../../winix/winixd/core/htmlfilter.h ../../../ezc/src/objects.h
uptime.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h
uptime.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h
uptime.o: ../../../ezc/src/patternparser.h
uptime.o: ../../../winix/winixd/notify/notifythread.h
uptime.o: ../../../winix/winixd/core/basethread.h
uptime.o: ../../../winix/winixd/notify/templatesnotify.h
@ -3942,7 +3981,8 @@ vim.o: mv.h nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h rmuser.h
vim.o: run.h sort.h specialdefault.h stat.h subject.h template.h timezone.h
vim.o: tinymce.h uname.h upload.h uptime.h who.h
vim.o: ../../../winix/winixd/core/htmlfilter.h ../../../ezc/src/objects.h
vim.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h
vim.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h
vim.o: ../../../ezc/src/patternparser.h
vim.o: ../../../winix/winixd/notify/notifythread.h
vim.o: ../../../winix/winixd/core/basethread.h
vim.o: ../../../winix/winixd/notify/templatesnotify.h
@ -4013,7 +4053,8 @@ who.o: mv.h nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h rmuser.h
who.o: run.h sort.h specialdefault.h stat.h subject.h template.h timezone.h
who.o: tinymce.h uname.h upload.h uptime.h vim.h
who.o: ../../../winix/winixd/core/htmlfilter.h ../../../ezc/src/objects.h
who.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h
who.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h
who.o: ../../../ezc/src/patternparser.h
who.o: ../../../winix/winixd/notify/notifythread.h
who.o: ../../../winix/winixd/core/basethread.h
who.o: ../../../winix/winixd/notify/templatesnotify.h

4
winixd/functions/sort.cpp
View File

@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2011-2014, Tomasz Sowa
* Copyright (c) 2011-2018, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -109,7 +109,7 @@ SortPair sp;
for( ; i2 != cur->request->post_tab.end() ; ++i2 )
{
if( IsSubStringNoCase(L"sort", i2->first.c_str()) )
if( PT::IsSubStringNoCase(L"sort", i2->first.c_str()) )
{
sp.id = Tol(i2->first.c_str() + 4);
sp.sort_index = Toi(i2->second);

2
winixd/functions/sort.h
View File

@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2011-2014, Tomasz Sowa
* Copyright (c) 2011-2018, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without

4
winixd/main/Makefile.dep
View File

@ -56,7 +56,8 @@ main.o: ../../../winix/winixd/templates/localefilter.h ../../../ezc/src/ezc.h
main.o: ../../../ezc/src/generator.h ../../../ezc/src/blocks.h
main.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h
main.o: ../../../ezc/src/funinfo.h ../../../ezc/src/objects.h
main.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h
main.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h
main.o: ../../../ezc/src/patternparser.h
main.o: ../../../winix/winixd/notify/notifythread.h
main.o: ../../../winix/winixd/core/basethread.h
main.o: ../../../winix/winixd/notify/templatesnotify.h
@ -141,6 +142,7 @@ main.o: ../../../winix/winixd/core/postparser.h
main.o: ../../../winix/winixd/core/httpsimpleparser.h
main.o: ../../../winix/winixd/core/plugin.h
main.o: ../../../winix/winixd/core/pluginmsg.h
main.o: ../../../pikotools/convert/text.h
main.o: ../../../winix/winixd/core/cookieparser.h
main.o: ../../../winix/winixd/core/postmultiparser.h
main.o: ../../../winix/winixd/core/acceptencodingparser.h

7
winixd/notify/Makefile.dep
View File

@ -20,8 +20,9 @@ notify.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h
notify.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h
notify.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h
notify.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
notify.o: ../../../ezc/src/outstreams.h ../../../ezc/src/patternparser.h
notify.o: notifythread.h ../../../winix/winixd/core/basethread.h
notify.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h
notify.o: ../../../ezc/src/patternparser.h notifythread.h
notify.o: ../../../winix/winixd/core/basethread.h
notify.o: ../../../winix/winixd/core/synchro.h templatesnotify.h
notify.o: ../../../winix/winixd/core/textstream.h
notify.o: ../../../winix/winixd/core/config.h
@ -158,6 +159,7 @@ notifythread.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h
notifythread.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h
notifythread.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
notifythread.o: ../../../ezc/src/outstreams.h
notifythread.o: ../../../ezc/src/expressionparser.h
notifythread.o: ../../../ezc/src/patternparser.h
notifythread.o: ../../../winix/winixd/core/textstream.h
notifythread.o: ../../../pikotools/convert/misc.h
@ -218,6 +220,7 @@ templatesnotify.o: ../../../ezc/src/functions.h
templatesnotify.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h
templatesnotify.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
templatesnotify.o: ../../../ezc/src/outstreams.h
templatesnotify.o: ../../../ezc/src/expressionparser.h
templatesnotify.o: ../../../ezc/src/patternparser.h
templatesnotify.o: ../../../winix/winixd/core/textstream.h
templatesnotify.o: ../../../pikotools/convert/misc.h

6
winixd/plugins/export/Makefile.dep
View File

@ -60,6 +60,7 @@ edb.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h
edb.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h
edb.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h
edb.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h
edb.o: ../../../../ezc/src/expressionparser.h
edb.o: ../../../../ezc/src/patternparser.h
edb.o: ../../../../winix/winixd/notify/notifythread.h
edb.o: ../../../../winix/winixd/core/basethread.h
@ -132,6 +133,7 @@ exportinfo.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h
exportinfo.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h
exportinfo.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h
exportinfo.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h
exportinfo.o: ../../../../ezc/src/expressionparser.h
exportinfo.o: ../../../../ezc/src/patternparser.h
exportinfo.o: ../../../../winix/winixd/notify/notifythread.h
exportinfo.o: ../../../../winix/winixd/core/basethread.h
@ -157,6 +159,7 @@ exportinfo.o: ../../../../winix/winixd/db/dbconn.h
exportinfo.o: ../../../../winix/winixd/db/dbtextstream.h
exportinfo.o: ../../../../winix/winixd/core/error.h
exportinfo.o: ../../../../winix/winixd/core/dirs.h message.h exportthread.h
exportinfo.o: ../../../../pikotools/convert/text.h
exportthread.o: exportthread.h ../../../../winix/winixd/core/basethread.h
exportthread.o: ../../../../winix/winixd/core/synchro.h message.h
exportthread.o: ../../../../winix/winixd/core/log.h
@ -176,6 +179,7 @@ exportthread.o: ../../../../pikotools/membuffer/membuffer.h
exportthread.o: ../../../../pikotools/textstream/types.h
exportthread.o: ../../../../pikotools/utf8/utf8.h
exportthread.o: ../../../../winix/winixd/core/winix_const.h
exportthread.o: ../../../../pikotools/convert/text.h
funexport.o: funexport.h ../../../../winix/winixd/functions/functionbase.h
funexport.o: ../../../../winix/winixd/core/item.h
funexport.o: ../../../../winix/winixd/db/db.h
@ -240,6 +244,7 @@ funexport.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h
funexport.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h
funexport.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h
funexport.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h
funexport.o: ../../../../ezc/src/expressionparser.h
funexport.o: ../../../../ezc/src/patternparser.h
funexport.o: ../../../../winix/winixd/notify/notifythread.h
funexport.o: ../../../../winix/winixd/core/basethread.h
@ -328,6 +333,7 @@ init.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h
init.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h
init.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h
init.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h
init.o: ../../../../ezc/src/expressionparser.h
init.o: ../../../../ezc/src/patternparser.h
init.o: ../../../../winix/winixd/notify/notifythread.h
init.o: ../../../../winix/winixd/core/basethread.h

6
winixd/plugins/export/exportinfo.cpp
View File

@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2011-2014, Tomasz Sowa
* Copyright (c) 2011-2018, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -34,6 +34,8 @@
#include "core/log.h"
#include "exportinfo.h"
#include "convert/text.h"
namespace Winix
{
@ -140,7 +142,7 @@ bool ExportInfo::SkipDir(long dir_id, std::wstring & dir)
{
if( system->dirs.MakePath(dir_id, tmp_dir) )
{
if( !tmp_dir.empty() && IsSubString(tmp_dir, dir) )
if( !tmp_dir.empty() && PT::IsSubString(tmp_dir, dir) )
{
// tmp_dir has a slash at the end
// we want the slash at the beginning

10
winixd/plugins/export/exportthread.cpp
View File

@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2011-2014, Tomasz Sowa
* Copyright (c) 2011-2018, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -40,6 +40,8 @@
#include "core/log.h"
#include "core/misc.h"
#include "utf8/utf8.h"
#include "convert/text.h"
namespace Winix
{
@ -406,13 +408,13 @@ bool ExportThread::HasThumbInAdress(std::string & buf, size_t i)
for( ; i<buf.size() ; ++i)
{
if( IsSubStringp(thumb1, &buf[i]) )
if( PT::IsSubStringp(thumb1, &buf[i]) )
{
buf.erase(i, len1);
return true;
}
if( IsSubStringp(thumb2, &buf[i]) )
if( PT::IsSubStringp(thumb2, &buf[i]) )
{
buf.erase(i, len2);
return true;
@ -440,7 +442,7 @@ void ExportThread::ChangeAdressesThumb(std::string & buf, const char * http_pref
for(size_t i=0 ; i<buf.size() ; ++i)
{
if( IsSubStringp(look_for_url.c_str(), &buf[i]) )
if( PT::IsSubStringp(look_for_url.c_str(), &buf[i]) )
{
i += look_for_url.size() - 1; // without skipping the last slash

3
winixd/plugins/gallery/Makefile.dep
View File

@ -66,6 +66,7 @@ gallery.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h
gallery.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h
gallery.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h
gallery.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h
gallery.o: ../../../../ezc/src/expressionparser.h
gallery.o: ../../../../ezc/src/patternparser.h
gallery.o: ../../../../winix/winixd/notify/notifythread.h
gallery.o: ../../../../winix/winixd/core/basethread.h
@ -160,6 +161,7 @@ init.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h
init.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h
init.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h
init.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h
init.o: ../../../../ezc/src/expressionparser.h
init.o: ../../../../ezc/src/patternparser.h
init.o: ../../../../winix/winixd/notify/notifythread.h
init.o: ../../../../winix/winixd/core/basethread.h
@ -308,6 +310,7 @@ templates.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h
templates.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h
templates.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h
templates.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h
templates.o: ../../../../ezc/src/expressionparser.h
templates.o: ../../../../ezc/src/patternparser.h
templates.o: ../../../../winix/winixd/notify/notifythread.h
templates.o: ../../../../winix/winixd/core/basethread.h

3
winixd/plugins/group/Makefile.dep
View File

@ -63,6 +63,7 @@ groupinfo.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h
groupinfo.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h
groupinfo.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h
groupinfo.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h
groupinfo.o: ../../../../ezc/src/expressionparser.h
groupinfo.o: ../../../../ezc/src/patternparser.h
groupinfo.o: ../../../../winix/winixd/notify/notifythread.h
groupinfo.o: ../../../../winix/winixd/core/basethread.h
@ -150,6 +151,7 @@ init.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h
init.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h
init.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h
init.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h
init.o: ../../../../ezc/src/expressionparser.h
init.o: ../../../../ezc/src/patternparser.h
init.o: ../../../../winix/winixd/notify/notifythread.h
init.o: ../../../../winix/winixd/core/basethread.h
@ -237,6 +239,7 @@ templates.o: ../../../../ezc/src/functions.h
templates.o: ../../../../pikotools/utf8/utf8.h ../../../../ezc/src/funinfo.h
templates.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h
templates.o: ../../../../ezc/src/outstreams.h
templates.o: ../../../../ezc/src/expressionparser.h
templates.o: ../../../../ezc/src/patternparser.h
templates.o: ../../../../pikotools/convert/misc.h
templates.o: ../../../../pikotools/convert/text.h

4
winixd/plugins/mailregister/Makefile.dep
View File

@ -71,6 +71,7 @@ funregistermail_showusers.o: ../../../../ezc/src/functions.h
funregistermail_showusers.o: ../../../../ezc/src/funinfo.h
funregistermail_showusers.o: ../../../../ezc/src/objects.h
funregistermail_showusers.o: ../../../../ezc/src/pattern.h
funregistermail_showusers.o: ../../../../ezc/src/expressionparser.h
funregistermail_showusers.o: ../../../../ezc/src/patternparser.h
funregistermail_showusers.o: ../../../../winix/winixd/notify/notifythread.h
funregistermail_showusers.o: ../../../../winix/winixd/core/basethread.h
@ -163,6 +164,7 @@ funregistermail.o: ../../../../ezc/src/functions.h
funregistermail.o: ../../../../ezc/src/funinfo.h
funregistermail.o: ../../../../ezc/src/objects.h
funregistermail.o: ../../../../ezc/src/pattern.h
funregistermail.o: ../../../../ezc/src/expressionparser.h
funregistermail.o: ../../../../ezc/src/patternparser.h
funregistermail.o: ../../../../winix/winixd/notify/notifythread.h
funregistermail.o: ../../../../winix/winixd/core/basethread.h
@ -251,6 +253,7 @@ init.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h
init.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h
init.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h
init.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h
init.o: ../../../../ezc/src/expressionparser.h
init.o: ../../../../ezc/src/patternparser.h
init.o: ../../../../winix/winixd/notify/notifythread.h
init.o: ../../../../winix/winixd/core/basethread.h
@ -383,6 +386,7 @@ templates.o: ../../../../ezc/src/functions.h
templates.o: ../../../../pikotools/utf8/utf8.h ../../../../ezc/src/funinfo.h
templates.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h
templates.o: ../../../../ezc/src/outstreams.h
templates.o: ../../../../ezc/src/expressionparser.h
templates.o: ../../../../ezc/src/patternparser.h
templates.o: ../../../../pikotools/convert/misc.h
templates.o: ../../../../pikotools/convert/text.h

7
winixd/plugins/menu/Makefile.dep
View File

@ -58,7 +58,8 @@ cache.o: ../../../../winix/winixd/templates/localefilter.h
cache.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h
cache.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/pattern.h
cache.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h
cache.o: ../../../../ezc/src/objects.h ../../../../ezc/src/patternparser.h
cache.o: ../../../../ezc/src/objects.h ../../../../ezc/src/expressionparser.h
cache.o: ../../../../ezc/src/patternparser.h
cache.o: ../../../../winix/winixd/notify/notifythread.h
cache.o: ../../../../winix/winixd/core/basethread.h
cache.o: ../../../../winix/winixd/core/synchro.h
@ -134,7 +135,8 @@ init.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h
init.o: ../../../../ezc/src/blocks.h cache.h
init.o: ../../../../winix/winixd/core/dirs.h ../../../../ezc/src/pattern.h
init.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h
init.o: ../../../../ezc/src/objects.h ../../../../ezc/src/patternparser.h
init.o: ../../../../ezc/src/objects.h ../../../../ezc/src/expressionparser.h
init.o: ../../../../ezc/src/patternparser.h
init.o: ../../../../winix/winixd/notify/notifythread.h
init.o: ../../../../winix/winixd/core/basethread.h
init.o: ../../../../winix/winixd/notify/templatesnotify.h
@ -283,6 +285,7 @@ templates.o: ../../../../winix/winixd/core/ugcontainer.h
templates.o: ../../../../winix/winixd/core/lastcontainer.h
templates.o: ../../../../ezc/src/pattern.h ../../../../ezc/src/functions.h
templates.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h
templates.o: ../../../../ezc/src/expressionparser.h
templates.o: ../../../../ezc/src/patternparser.h
templates.o: ../../../../winix/winixd/templates/patterncacher.h
templates.o: ../../../../winix/winixd/templates/indexpatterns.h

2
winixd/plugins/stats/Makefile.dep
View File