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

changed: now we do not use std::string and char* in the Winix API

Browse Source 
everywhere we are using std::wstring and wchar_t*
         (std::string and char* is used only locally in some places
         especially when creating a path to OS file system etc.)
added:   to the special thread when winix closes:
         a write function for curl: FetchPageOnExitCurlCallback()
         without this function the curl library will print
         the page's content to the standart output
changed: TextStream<> class from core can make
         UTF8<->wide strings conversions
removed: from config: utf8 option
         now winix expects UTF8 from the user's input (html forms, url-es)
         and outputs strings in the UTF8 format




git-svn-id: svn://ttmath.org/publicrep/winix/trunk@965 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa
2014-10-09 20:44:56 +00:00
parent 4abf6642f7
commit 8196fb77d1
74 changed files with 1911 additions and 1612 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
plugins/export/Makefile.dep
View File

@@ -10,7 +10,8 @@ edb.o: ../../../pikotools/convert/convert.h
edb.o: ../../../pikotools/convert/inttostr.h
edb.o: ../../../pikotools/membuffer/membuffer.h
edb.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
edb.o: ../../../winix/core/error.h ../../../pikotools/space/spaceparser.h
edb.o: ../../../winix/core/winix_const.h ../../../winix/core/error.h
edb.o: ../../../pikotools/space/spaceparser.h
edb.o: ../../../pikotools/space/space.h export.h ../../../winix/core/dirs.h
edb.o: ../../../winix/core/dircontainer.h ../../../winix/db/db.h
edb.o: ../../../winix/db/dbbase.h ../../../winix/db/dbitemquery.h
@@ -67,6 +68,7 @@ exportinfo.o: ../../../winix/core/htmlfilter.h
exportinfo.o: ../../../winix/templates/htmltextstream.h
exportinfo.o: ../../../winix/core/textstream.h ../../../winix/core/misc.h
exportinfo.o: ../../../pikotools/utf8/utf8.h
exportinfo.o: ../../../winix/core/winix_const.h
exportinfo.o: ../../../pikotools/space/spacetojson.h
exportinfo.o: ../../../winix/core/session.h ../../../winix/core/user.h
exportinfo.o: ../../../winix/core/plugindata.h ../../../winix/core/rebus.h
@@ -109,6 +111,7 @@ exportthread.o: ../../../pikotools/convert/inttostr.h
exportthread.o: ../../../pikotools/membuffer/membuffer.h
exportthread.o: ../../../pikotools/textstream/types.h
exportthread.o: ../../../pikotools/utf8/utf8.h
exportthread.o: ../../../winix/core/winix_const.h
funexport.o: funexport.h ../../../winix/functions/functionbase.h
funexport.o: ../../../winix/core/item.h ../../../winix/db/db.h
funexport.o: ../../../winix/db/dbbase.h ../../../winix/db/dbitemquery.h
@@ -133,7 +136,7 @@ funexport.o: ../../../pikotools/space/space.h
funexport.o: ../../../winix/core/htmlfilter.h
funexport.o: ../../../winix/templates/htmltextstream.h
funexport.o: ../../../winix/core/textstream.h ../../../winix/core/misc.h
funexport.o: ../../../pikotools/utf8/utf8.h
funexport.o: ../../../pikotools/utf8/utf8.h ../../../winix/core/winix_const.h
funexport.o: ../../../pikotools/space/spacetojson.h
funexport.o: ../../../winix/core/session.h ../../../winix/core/user.h
funexport.o: ../../../winix/core/plugindata.h ../../../winix/core/rebus.h
@@ -184,19 +187,20 @@ init.o: ../../../pikotools/space/spaceparser.h
init.o: ../../../pikotools/space/space.h ../../../winix/core/htmlfilter.h
init.o: ../../../winix/templates/htmltextstream.h
init.o: ../../../winix/core/textstream.h ../../../winix/core/misc.h
init.o: ../../../pikotools/utf8/utf8.h ../../../pikotools/space/spacetojson.h
init.o: ../../../winix/core/session.h ../../../winix/core/user.h
init.o: ../../../winix/core/plugindata.h ../../../winix/core/rebus.h
init.o: ../../../winix/core/ipban.h ../../../winix/core/mount.h
init.o: ../../../winix/templates/locale.h ../../../winix/core/system.h
init.o: ../../../winix/core/job.h ../../../winix/core/basethread.h
init.o: ../../../winix/core/synchro.h ../../../winix/core/dirs.h
init.o: ../../../winix/core/dircontainer.h ../../../winix/db/db.h
init.o: ../../../winix/db/dbbase.h ../../../winix/db/dbitemquery.h
init.o: ../../../winix/core/item.h ../../../winix/db/dbitemcolumns.h
init.o: ../../../winix/core/user.h ../../../winix/core/group.h
init.o: ../../../winix/core/dircontainer.h ../../../winix/core/ugcontainer.h
init.o: ../../../winix/notify/notify.h ../../../winix/notify/notifypool.h
init.o: ../../../pikotools/utf8/utf8.h ../../../winix/core/winix_const.h
init.o: ../../../pikotools/space/spacetojson.h ../../../winix/core/session.h
init.o: ../../../winix/core/user.h ../../../winix/core/plugindata.h
init.o: ../../../winix/core/rebus.h ../../../winix/core/ipban.h
init.o: ../../../winix/core/mount.h ../../../winix/templates/locale.h
init.o: ../../../winix/core/system.h ../../../winix/core/job.h
init.o: ../../../winix/core/basethread.h ../../../winix/core/synchro.h
init.o: ../../../winix/core/dirs.h ../../../winix/core/dircontainer.h
init.o: ../../../winix/db/db.h ../../../winix/db/dbbase.h
init.o: ../../../winix/db/dbitemquery.h ../../../winix/core/item.h
init.o: ../../../winix/db/dbitemcolumns.h ../../../winix/core/user.h
init.o: ../../../winix/core/group.h ../../../winix/core/dircontainer.h
init.o: ../../../winix/core/ugcontainer.h ../../../winix/notify/notify.h
init.o: ../../../winix/notify/notifypool.h
init.o: ../../../winix/templates/patterns.h ../../../winix/templates/locale.h
init.o: ../../../winix/templates/localefilter.h ../../../ezc/src/ezc.h
init.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h

15
plugins/export/exportthread.cpp
View File

@@ -54,7 +54,6 @@ ExportThread * ExportThread::exp_thread;
ExportThread::ExportThread()
{
exp_thread = 0;
utf8 = false;
browser_name = "Winix Export";
conn_timeout = 5;
conn_max_errors = 3;
@@ -62,17 +61,12 @@ ExportThread::ExportThread()
void ExportThread::SetUTF8(bool use_utf8)
{
utf8 = use_utf8;
}
void ExportThread::SetBaseUrl(const std::wstring & url)
{
// SetBaseUrl() is called before the this thread
// SetBaseUrl() is called before this thread
// is started so we can use 'base_url' later without locking
// the same is for 'utf8'
base_url = url;
}
@@ -277,12 +271,7 @@ return len;
void ExportThread::Convert(const std::wstring & in, std::string & out, bool clear)
{
Lock();
if( utf8 )
PT::WideToUTF8(in, out, clear);
else
AssignString(in, out, clear);
PT::WideToUTF8(in, out, clear);
Unlock();
}

2
plugins/export/exportthread.h
View File

@@ -55,7 +55,6 @@ public:
ExportThread();
void SetUTF8(bool use_utf8);
void SetBaseUrl(const std::wstring & url);
void AddMessage(const Message & message);
@@ -72,7 +71,6 @@ private:
std::string url_a;
std::string buffer;
size_t buffer_read_index;
bool utf8;
std::wstring base_url;
std::string browser_name;

1
plugins/export/init.cpp
View File

@@ -86,7 +86,6 @@ void FstabChanged(PluginInfo & info)
void InitPlugin(PluginInfo & info)
{
export_thread.SetUTF8(info.config->utf8);
export_thread.SetBaseUrl(info.config->base_url);
info.system->thread_manager.Add(&export_thread, L"export");

10
plugins/gallery/Makefile.dep
View File

@@ -13,8 +13,8 @@ gallery.o: ../../../pikotools/convert/convert.h
gallery.o: ../../../pikotools/convert/inttostr.h
gallery.o: ../../../pikotools/membuffer/membuffer.h
gallery.o: ../../../pikotools/textstream/types.h
gallery.o: ../../../pikotools/utf8/utf8.h ../../../winix/core/error.h
gallery.o: ../../../pikotools/space/spaceparser.h
gallery.o: ../../../pikotools/utf8/utf8.h ../../../winix/core/winix_const.h
gallery.o: ../../../winix/core/error.h ../../../pikotools/space/spaceparser.h
gallery.o: ../../../pikotools/space/space.h ../../../winix/db/dbitemquery.h
gallery.o: ../../../winix/db/dbitemcolumns.h ../../../winix/core/user.h
gallery.o: ../../../winix/core/group.h ../../../winix/core/dircontainer.h
@@ -68,7 +68,8 @@ init.o: ../../../pikotools/convert/convert.h
init.o: ../../../pikotools/convert/inttostr.h
init.o: ../../../pikotools/membuffer/membuffer.h
init.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
init.o: ../../../winix/core/error.h ../../../pikotools/space/spaceparser.h
init.o: ../../../winix/core/winix_const.h ../../../winix/core/error.h
init.o: ../../../pikotools/space/spaceparser.h
init.o: ../../../pikotools/space/space.h ../../../winix/db/dbitemquery.h
init.o: ../../../winix/db/dbitemcolumns.h ../../../winix/core/user.h
init.o: ../../../winix/core/group.h ../../../winix/core/dircontainer.h
@@ -152,7 +153,8 @@ templates.o: ../../../pikotools/convert/convert.h
templates.o: ../../../pikotools/convert/inttostr.h
templates.o: ../../../pikotools/membuffer/membuffer.h
templates.o: ../../../pikotools/textstream/types.h
templates.o: ../../../pikotools/utf8/utf8.h ../../../winix/core/error.h
templates.o: ../../../pikotools/utf8/utf8.h ../../../winix/core/winix_const.h
templates.o: ../../../winix/core/error.h
templates.o: ../../../pikotools/space/spaceparser.h
templates.o: ../../../pikotools/space/space.h ../../../winix/db/dbitemquery.h
templates.o: ../../../winix/db/dbitemcolumns.h ../../../winix/core/user.h

35
plugins/group/Makefile.dep
View File

@@ -17,8 +17,8 @@ groupinfo.o: ../../../pikotools/convert/convert.h
groupinfo.o: ../../../pikotools/convert/inttostr.h
groupinfo.o: ../../../pikotools/membuffer/membuffer.h
groupinfo.o: ../../../pikotools/textstream/types.h
groupinfo.o: ../../../pikotools/utf8/utf8.h ../../../winix/core/error.h
groupinfo.o: ../../../winix/db/dbitemquery.h
groupinfo.o: ../../../pikotools/utf8/utf8.h ../../../winix/core/winix_const.h
groupinfo.o: ../../../winix/core/error.h ../../../winix/db/dbitemquery.h
groupinfo.o: ../../../winix/db/dbitemcolumns.h ../../../winix/core/user.h
groupinfo.o: ../../../winix/core/group.h ../../../winix/core/dircontainer.h
groupinfo.o: ../../../winix/core/ugcontainer.h ../../../winix/core/log.h
@@ -74,21 +74,21 @@ init.o: ../../../pikotools/textstream/types.h
init.o: ../../../winix/core/htmlfilter.h
init.o: ../../../winix/templates/htmltextstream.h
init.o: ../../../winix/core/textstream.h ../../../winix/core/misc.h
init.o: ../../../pikotools/utf8/utf8.h ../../../pikotools/space/spacetojson.h
init.o: ../../../winix/core/session.h ../../../winix/core/user.h
init.o: ../../../winix/core/plugindata.h ../../../winix/core/rebus.h
init.o: ../../../winix/core/ipban.h ../../../winix/core/mount.h
init.o: ../../../winix/templates/locale.h ../../../winix/core/system.h
init.o: ../../../winix/core/job.h ../../../winix/core/basethread.h
init.o: ../../../winix/core/synchro.h ../../../winix/core/dirs.h
init.o: ../../../winix/core/dircontainer.h ../../../winix/db/db.h
init.o: ../../../winix/db/dbbase.h ../../../winix/db/dbconn.h
init.o: ../../../winix/db/dbtextstream.h ../../../winix/core/error.h
init.o: ../../../winix/db/dbitemquery.h ../../../winix/core/item.h
init.o: ../../../winix/db/dbitemcolumns.h ../../../winix/core/user.h
init.o: ../../../winix/core/group.h ../../../winix/core/dircontainer.h
init.o: ../../../winix/core/ugcontainer.h ../../../winix/notify/notify.h
init.o: ../../../winix/notify/notifypool.h
init.o: ../../../pikotools/utf8/utf8.h ../../../winix/core/winix_const.h
init.o: ../../../pikotools/space/spacetojson.h ../../../winix/core/session.h
init.o: ../../../winix/core/user.h ../../../winix/core/plugindata.h
init.o: ../../../winix/core/rebus.h ../../../winix/core/ipban.h
init.o: ../../../winix/core/mount.h ../../../winix/templates/locale.h
init.o: ../../../winix/core/system.h ../../../winix/core/job.h
init.o: ../../../winix/core/basethread.h ../../../winix/core/synchro.h
init.o: ../../../winix/core/dirs.h ../../../winix/core/dircontainer.h
init.o: ../../../winix/db/db.h ../../../winix/db/dbbase.h
init.o: ../../../winix/db/dbconn.h ../../../winix/db/dbtextstream.h
init.o: ../../../winix/core/error.h ../../../winix/db/dbitemquery.h
init.o: ../../../winix/core/item.h ../../../winix/db/dbitemcolumns.h
init.o: ../../../winix/core/user.h ../../../winix/core/group.h
init.o: ../../../winix/core/dircontainer.h ../../../winix/core/ugcontainer.h
init.o: ../../../winix/notify/notify.h ../../../winix/notify/notifypool.h
init.o: ../../../winix/templates/patterns.h ../../../winix/templates/locale.h
init.o: ../../../winix/templates/localefilter.h ../../../ezc/src/ezc.h
init.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h
@@ -150,6 +150,7 @@ templates.o: ../../../pikotools/convert/convert.h
templates.o: ../../../pikotools/convert/inttostr.h
templates.o: ../../../pikotools/membuffer/membuffer.h
templates.o: ../../../pikotools/textstream/types.h
templates.o: ../../../winix/core/winix_const.h
templates.o: ../../../winix/templates/patterncacher.h
templates.o: ../../../winix/core/item.h
templates.o: ../../../winix/templates/indexpatterns.h

1
plugins/group/groupinfo.cpp
View File

@@ -79,7 +79,6 @@ bool GroupInfo::ParseGroups(const std::wstring & str, Groups & groups)
groups.Clear();
PT::Space & space = *groups.GetSpace();
conf_parser.SetSpace(space);
conf_parser.UTF8(config->utf8);
if( conf_parser.ParseString(str) == PT::SpaceParser::ok )
{

37
plugins/menu/Makefile.dep
View File

@@ -12,7 +12,8 @@ cache.o: ../../../pikotools/convert/convert.h
cache.o: ../../../pikotools/convert/inttostr.h
cache.o: ../../../pikotools/membuffer/membuffer.h
cache.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
cache.o: ../../../winix/core/error.h ../../../pikotools/space/spaceparser.h
cache.o: ../../../winix/core/winix_const.h ../../../winix/core/error.h
cache.o: ../../../pikotools/space/spaceparser.h
cache.o: ../../../pikotools/space/space.h ../../../winix/db/dbitemquery.h
cache.o: ../../../winix/db/dbitemcolumns.h ../../../winix/core/user.h
cache.o: ../../../winix/core/group.h ../../../winix/core/dircontainer.h
@@ -54,22 +55,23 @@ init.o: ../../../pikotools/space/spaceparser.h
init.o: ../../../pikotools/space/space.h ../../../winix/core/htmlfilter.h
init.o: ../../../winix/templates/htmltextstream.h
init.o: ../../../winix/core/textstream.h ../../../winix/core/misc.h
init.o: ../../../pikotools/utf8/utf8.h ../../../pikotools/space/spacetojson.h
init.o: ../../../winix/core/session.h ../../../winix/core/user.h
init.o: ../../../winix/core/plugindata.h ../../../winix/core/rebus.h
init.o: ../../../winix/core/ipban.h ../../../winix/core/mount.h
init.o: ../../../winix/templates/locale.h ../../../winix/core/plugin.h
init.o: ../../../winix/core/pluginmsg.h ../../../winix/core/log.h
init.o: ../../../winix/core/system.h ../../../winix/core/job.h
init.o: ../../../winix/core/basethread.h ../../../winix/core/synchro.h
init.o: ../../../winix/core/dirs.h ../../../winix/core/dircontainer.h
init.o: ../../../winix/db/db.h ../../../winix/db/dbbase.h
init.o: ../../../winix/db/dbconn.h ../../../winix/db/dbtextstream.h
init.o: ../../../winix/core/error.h ../../../winix/db/dbitemquery.h
init.o: ../../../winix/core/item.h ../../../winix/db/dbitemcolumns.h
init.o: ../../../winix/core/user.h ../../../winix/core/group.h
init.o: ../../../winix/core/dircontainer.h ../../../winix/core/ugcontainer.h
init.o: ../../../winix/notify/notify.h ../../../winix/notify/notifypool.h
init.o: ../../../pikotools/utf8/utf8.h ../../../winix/core/winix_const.h
init.o: ../../../pikotools/space/spacetojson.h ../../../winix/core/session.h
init.o: ../../../winix/core/user.h ../../../winix/core/plugindata.h
init.o: ../../../winix/core/rebus.h ../../../winix/core/ipban.h
init.o: ../../../winix/core/mount.h ../../../winix/templates/locale.h
init.o: ../../../winix/core/plugin.h ../../../winix/core/pluginmsg.h
init.o: ../../../winix/core/log.h ../../../winix/core/system.h
init.o: ../../../winix/core/job.h ../../../winix/core/basethread.h
init.o: ../../../winix/core/synchro.h ../../../winix/core/dirs.h
init.o: ../../../winix/core/dircontainer.h ../../../winix/db/db.h
init.o: ../../../winix/db/dbbase.h ../../../winix/db/dbconn.h
init.o: ../../../winix/db/dbtextstream.h ../../../winix/core/error.h
init.o: ../../../winix/db/dbitemquery.h ../../../winix/core/item.h
init.o: ../../../winix/db/dbitemcolumns.h ../../../winix/core/user.h
init.o: ../../../winix/core/group.h ../../../winix/core/dircontainer.h
init.o: ../../../winix/core/ugcontainer.h ../../../winix/notify/notify.h
init.o: ../../../winix/notify/notifypool.h
init.o: ../../../winix/templates/patterns.h ../../../winix/templates/locale.h
init.o: ../../../winix/templates/localefilter.h ../../../ezc/src/ezc.h
init.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h
@@ -135,6 +137,7 @@ templates.o: ../../../pikotools/convert/convert.h
templates.o: ../../../pikotools/convert/inttostr.h
templates.o: ../../../pikotools/membuffer/membuffer.h
templates.o: ../../../pikotools/textstream/types.h
templates.o: ../../../winix/core/winix_const.h
templates.o: ../../../winix/templates/patterncacher.h
templates.o: ../../../winix/core/item.h
templates.o: ../../../winix/templates/indexpatterns.h

3
plugins/stats/Makefile.dep
View File

@@ -11,6 +11,7 @@ init.o: ../../../pikotools/convert/convert.h
init.o: ../../../pikotools/convert/inttostr.h
init.o: ../../../pikotools/membuffer/membuffer.h
init.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
init.o: ../../../winix/core/winix_const.h
init.o: ../../../winix/core/logmanipulators.h ../../../winix/core/slog.h
init.o: ../../../winix/core/cur.h ../../../winix/core/request.h
init.o: ../../../winix/core/error.h ../../../winix/core/config.h
@@ -96,6 +97,7 @@ stats.o: ../../../pikotools/convert/convert.h
stats.o: ../../../pikotools/convert/inttostr.h
stats.o: ../../../pikotools/membuffer/membuffer.h
stats.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
stats.o: ../../../winix/core/winix_const.h
stats.o: ../../../winix/core/logmanipulators.h ../../../winix/core/slog.h
stats.o: ../../../winix/core/cur.h ../../../winix/core/request.h
stats.o: ../../../winix/core/error.h ../../../winix/core/config.h
@@ -124,6 +126,7 @@ templates.o: ../../../pikotools/membuffer/membuffer.h
templates.o: ../../../pikotools/textstream/types.h ../../../winix/core/item.h
templates.o: ../../../winix/core/error.h ../../../winix/core/textstream.h
templates.o: ../../../winix/core/misc.h ../../../pikotools/utf8/utf8.h
templates.o: ../../../winix/core/winix_const.h
templates.o: ../../../winix/templates/htmltextstream.h
templates.o: ../../../winix/core/textstream.h
templates.o: ../../../pikotools/space/spacetojson.h

17
plugins/stats/bot.cpp
View File

@@ -44,39 +44,38 @@ namespace Stats
void Bot::SetBrowserName(const char * name)
void Bot::SetBrowserName(const std::wstring & name)
{
browser_name = name;
browser_name = &name;
}
bool Bot::BrowserNameHas(const char * name)
bool Bot::BrowserNameHas(const wchar_t * name)
{
return strstr(browser_name, name) != 0;
return (browser_name->find(name) != std::wstring::npos);
}
bool Bot::IsGoogle()
{
return BrowserNameHas("Googlebot") && BrowserNameHas("+http://www.google.com/bot.html");
return BrowserNameHas(L"Googlebot") && BrowserNameHas(L"+http://www.google.com/bot.html");
}
bool Bot::IsYahoo()
{
return BrowserNameHas("Yahoo!") && BrowserNameHas("yahoo.com");
return BrowserNameHas(L"Yahoo!") && BrowserNameHas(L"yahoo.com");
}
bool Bot::IsBing()
{
if( BrowserNameHas("msnbot") && BrowserNameHas("+http://search.msn.com/msnbot.htm") )
if( BrowserNameHas(L"msnbot") && BrowserNameHas(L"+http://search.msn.com/msnbot.htm") )
return true;
return BrowserNameHas("bingbot") && BrowserNameHas("+http://www.bing.com/bingbot.htm");
return BrowserNameHas(L"bingbot") && BrowserNameHas(L"+http://www.bing.com/bingbot.htm");
}

10
plugins/stats/bot.h
View File

@@ -35,6 +35,10 @@
#ifndef headerfile_winix_plugins_stats_bot
#define headerfile_winix_plugins_stats_bot
#include <string>
namespace Winix
{
@@ -45,7 +49,7 @@ namespace Stats
struct Bot
{
void SetBrowserName(const char * name);
void SetBrowserName(const std::wstring & name);
bool IsGoogle();
bool IsYahoo();
@@ -54,9 +58,9 @@ struct Bot
private:
const char * browser_name;
const std::wstring * browser_name;
bool BrowserNameHas(const char * name);
bool BrowserNameHas(const wchar_t * name);
};

19
plugins/thread/Makefile.dep
View File

@@ -13,7 +13,8 @@ createthread.o: ../../../pikotools/convert/convert.h
createthread.o: ../../../pikotools/convert/inttostr.h
createthread.o: ../../../pikotools/membuffer/membuffer.h
createthread.o: ../../../pikotools/textstream/types.h
createthread.o: ../../../pikotools/utf8/utf8.h ../../../winix/core/error.h
createthread.o: ../../../pikotools/utf8/utf8.h
createthread.o: ../../../winix/core/winix_const.h ../../../winix/core/error.h
createthread.o: ../../../pikotools/space/spaceparser.h
createthread.o: ../../../pikotools/space/space.h
createthread.o: ../../../winix/db/dbitemquery.h
@@ -111,8 +112,8 @@ funthread.o: ../../../pikotools/convert/convert.h
funthread.o: ../../../pikotools/convert/inttostr.h
funthread.o: ../../../pikotools/membuffer/membuffer.h
funthread.o: ../../../pikotools/textstream/types.h
funthread.o: ../../../pikotools/utf8/utf8.h funthread.h
funthread.o: ../../../winix/functions/functionbase.h
funthread.o: ../../../pikotools/utf8/utf8.h ../../../winix/core/winix_const.h
funthread.o: funthread.h ../../../winix/functions/functionbase.h
funthread.o: ../../../winix/core/item.h ../../../winix/db/db.h
funthread.o: ../../../winix/db/dbbase.h ../../../winix/db/dbconn.h
funthread.o: ../../../winix/db/dbtextstream.h
@@ -173,6 +174,7 @@ init.o: ../../../pikotools/convert/convert.h
init.o: ../../../pikotools/convert/inttostr.h
init.o: ../../../pikotools/membuffer/membuffer.h
init.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
init.o: ../../../winix/core/winix_const.h
init.o: ../../../pikotools/space/spaceparser.h
init.o: ../../../pikotools/space/space.h ../../../winix/db/dbitemquery.h
init.o: ../../../winix/db/dbitemcolumns.h ../../../winix/core/user.h
@@ -262,7 +264,7 @@ reply.o: ../../../pikotools/space/spaceparser.h
reply.o: ../../../pikotools/space/space.h ../../../winix/core/htmlfilter.h
reply.o: ../../../winix/templates/htmltextstream.h
reply.o: ../../../winix/core/textstream.h ../../../winix/core/misc.h
reply.o: ../../../pikotools/utf8/utf8.h
reply.o: ../../../pikotools/utf8/utf8.h ../../../winix/core/winix_const.h
reply.o: ../../../pikotools/space/spacetojson.h ../../../winix/core/session.h
reply.o: ../../../winix/core/user.h ../../../winix/core/plugindata.h
reply.o: ../../../winix/core/rebus.h ../../../winix/core/ipban.h
@@ -346,7 +348,8 @@ showthreads.o: ../../../pikotools/convert/convert.h
showthreads.o: ../../../pikotools/convert/inttostr.h
showthreads.o: ../../../pikotools/membuffer/membuffer.h
showthreads.o: ../../../pikotools/textstream/types.h
showthreads.o: ../../../pikotools/utf8/utf8.h ../../../winix/core/error.h
showthreads.o: ../../../pikotools/utf8/utf8.h
showthreads.o: ../../../winix/core/winix_const.h ../../../winix/core/error.h
showthreads.o: ../../../pikotools/space/spaceparser.h
showthreads.o: ../../../pikotools/space/space.h
showthreads.o: ../../../winix/db/dbitemquery.h
@@ -409,7 +412,8 @@ templates.o: ../../../pikotools/convert/convert.h
templates.o: ../../../pikotools/convert/inttostr.h
templates.o: ../../../pikotools/membuffer/membuffer.h
templates.o: ../../../pikotools/textstream/types.h
templates.o: ../../../pikotools/utf8/utf8.h ../../../winix/core/error.h
templates.o: ../../../pikotools/utf8/utf8.h ../../../winix/core/winix_const.h
templates.o: ../../../winix/core/error.h
templates.o: ../../../pikotools/space/spaceparser.h
templates.o: ../../../pikotools/space/space.h ../../../winix/db/dbitemquery.h
templates.o: ../../../winix/db/dbitemcolumns.h ../../../winix/core/user.h
@@ -510,7 +514,8 @@ threadinfo.o: ../../../pikotools/convert/convert.h
threadinfo.o: ../../../pikotools/convert/inttostr.h
threadinfo.o: ../../../pikotools/membuffer/membuffer.h
threadinfo.o: ../../../pikotools/textstream/types.h
threadinfo.o: ../../../pikotools/utf8/utf8.h ../../../winix/core/error.h
threadinfo.o: ../../../pikotools/utf8/utf8.h
threadinfo.o: ../../../winix/core/winix_const.h ../../../winix/core/error.h
threadinfo.o: ../../../pikotools/space/spaceparser.h
threadinfo.o: ../../../pikotools/space/space.h
threadinfo.o: ../../../winix/db/dbitemquery.h

16
plugins/ticket/Makefile.dep
View File

@@ -13,6 +13,7 @@ createticket.o: ../../../pikotools/convert/inttostr.h
createticket.o: ../../../pikotools/membuffer/membuffer.h
createticket.o: ../../../pikotools/textstream/types.h
createticket.o: ../../../pikotools/utf8/utf8.h
createticket.o: ../../../winix/core/winix_const.h
createticket.o: ../../../winix/core/logmanipulators.h
createticket.o: ../../../winix/core/slog.h ../../../winix/core/cur.h
createticket.o: ../../../winix/core/request.h ../../../winix/core/error.h
@@ -143,6 +144,7 @@ editticket.o: ../../../winix/core/ugcontainer.h ../../../winix/core/log.h
editticket.o: ../../../winix/core/textstream.h ../../../winix/core/misc.h
editticket.o: ../../../winix/core/item.h ../../../winix/core/requesttypes.h
editticket.o: ../../../pikotools/utf8/utf8.h
editticket.o: ../../../winix/core/winix_const.h
editticket.o: ../../../winix/core/logmanipulators.h
editticket.o: ../../../winix/core/slog.h ../../../winix/core/cur.h
editticket.o: ../../../winix/core/request.h ../../../winix/core/error.h
@@ -248,7 +250,7 @@ funticket.o: ../../../winix/core/group.h ../../../winix/core/dircontainer.h
funticket.o: ../../../winix/core/ugcontainer.h ../../../winix/core/log.h
funticket.o: ../../../winix/core/textstream.h ../../../winix/core/misc.h
funticket.o: ../../../winix/core/item.h ../../../winix/core/requesttypes.h
funticket.o: ../../../pikotools/utf8/utf8.h
funticket.o: ../../../pikotools/utf8/utf8.h ../../../winix/core/winix_const.h
funticket.o: ../../../winix/core/logmanipulators.h ../../../winix/core/slog.h
funticket.o: ../../../winix/core/cur.h ../../../winix/core/request.h
funticket.o: ../../../winix/core/error.h ../../../winix/core/config.h
@@ -347,10 +349,11 @@ init.o: ../../../winix/core/group.h ../../../winix/core/dircontainer.h
init.o: ../../../winix/core/ugcontainer.h ../../../winix/core/log.h
init.o: ../../../winix/core/textstream.h ../../../winix/core/misc.h
init.o: ../../../winix/core/item.h ../../../winix/core/requesttypes.h
init.o: ../../../pikotools/utf8/utf8.h ../../../winix/core/logmanipulators.h
init.o: ../../../winix/core/slog.h ../../../winix/core/cur.h
init.o: ../../../winix/core/request.h ../../../winix/core/error.h
init.o: ../../../winix/core/config.h ../../../winix/core/htmlfilter.h
init.o: ../../../pikotools/utf8/utf8.h ../../../winix/core/winix_const.h
init.o: ../../../winix/core/logmanipulators.h ../../../winix/core/slog.h
init.o: ../../../winix/core/cur.h ../../../winix/core/request.h
init.o: ../../../winix/core/error.h ../../../winix/core/config.h
init.o: ../../../winix/core/htmlfilter.h
init.o: ../../../winix/templates/htmltextstream.h
init.o: ../../../pikotools/space/spacetojson.h ../../../winix/core/session.h
init.o: ../../../winix/core/user.h ../../../winix/core/plugindata.h
@@ -445,6 +448,7 @@ showtickets.o: ../../../winix/core/ugcontainer.h ../../../winix/core/log.h
showtickets.o: ../../../winix/core/textstream.h ../../../winix/core/misc.h
showtickets.o: ../../../winix/core/item.h ../../../winix/core/requesttypes.h
showtickets.o: ../../../pikotools/utf8/utf8.h
showtickets.o: ../../../winix/core/winix_const.h
showtickets.o: ../../../winix/core/logmanipulators.h
showtickets.o: ../../../winix/core/slog.h ../../../winix/core/cur.h
showtickets.o: ../../../winix/core/request.h ../../../winix/core/error.h
@@ -558,6 +562,7 @@ templates.o: ../../../winix/core/group.h ../../../winix/core/dircontainer.h
templates.o: ../../../winix/core/ugcontainer.h ../../../winix/core/log.h
templates.o: ../../../winix/core/textstream.h ../../../winix/core/misc.h
templates.o: ../../../winix/core/requesttypes.h
templates.o: ../../../winix/core/winix_const.h
templates.o: ../../../winix/core/logmanipulators.h ../../../winix/core/slog.h
templates.o: ../../../winix/core/cur.h ../../../winix/core/request.h
templates.o: ../../../winix/core/error.h ../../../winix/core/config.h
@@ -662,6 +667,7 @@ ticketinfo.o: ../../../winix/core/ugcontainer.h ../../../winix/core/log.h
ticketinfo.o: ../../../winix/core/textstream.h ../../../winix/core/misc.h
ticketinfo.o: ../../../winix/core/item.h ../../../winix/core/requesttypes.h
ticketinfo.o: ../../../pikotools/utf8/utf8.h
ticketinfo.o: ../../../winix/core/winix_const.h
ticketinfo.o: ../../../winix/core/logmanipulators.h
ticketinfo.o: ../../../winix/core/slog.h ../../../winix/core/cur.h
ticketinfo.o: ../../../winix/core/request.h ../../../winix/core/error.h

1
plugins/ticket/ticketinfo.cpp
View File

@@ -165,7 +165,6 @@ bool TicketInfo::ParseTicketConf(long mount_dir_id, const std::wstring & path)
log << log3 << "Ticket: parsing conf file: " << path << logend;
conf_tab[mount_dir_id].file_name = path;
conf_parser.UTF8(true);
conf_parser.SetSpace(conf_tab[mount_dir_id].conf);
conf_parser.SplitSingle(true);
conf_tab[mount_dir_id].conf.Clear();