diff --git a/core/Makefile.dep b/core/Makefile.dep index 85244c0..f845a74 100755 --- a/core/Makefile.dep +++ b/core/Makefile.dep @@ -22,19 +22,20 @@ app.o: ../functions/login.h ../functions/logout.h ../functions/ls.h app.o: ../functions/mkdir.h ../functions/mv.h ../functions/node.h app.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h app.o: ../functions/run.h ../functions/subject.h ../functions/funthread.h -app.o: ../core/thread.h ../functions/funticket.h ../functions/tinymce.h -app.o: ../functions/uname.h ../functions/upload.h ../functions/who.h -app.o: ../templates/templates.h ../templates/patterncacher.h ../core/item.h -app.o: misc.h ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h +app.o: ../core/thread.h ../functions/funticket.h ../core/ticket.h +app.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h +app.o: ../functions/uptime.h ../functions/who.h ../templates/templates.h +app.o: ../templates/patterncacher.h ../core/item.h misc.h +app.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h app.o: ../core/log.h ../templates/indexpatterns.h ../core/sessionmanager.h app.o: plugin.h pluginmsg.h bbcodeparser.o: bbcodeparser.h htmlfilter.h compress.o: compress.h log.h config.o: config.h confparser.h log.h plugin.h pluginmsg.h plugindata.h config.o: request.h requesttypes.h session.h item.h error.h user.h rebus.h -config.o: thread.h compress.h acceptencodingparser.h acceptbaseparser.h -config.o: htmlfilter.h postmultiparser.h ticket.h system.h dirs.h -config.o: dircontainer.h db.h group.h ugcontainer.h mounts.h mount.h users.h +config.o: compress.h acceptencodingparser.h acceptbaseparser.h htmlfilter.h +config.o: postmultiparser.h system.h dirs.h dircontainer.h db.h group.h +config.o: thread.h ugcontainer.h ticket.h mounts.h mount.h users.h config.o: lastcontainer.h groups.h loadavg.h sessionmanager.h config.o: sessioncontainer.h ../functions/functions.h config.o: ../functions/functionbase.h ../core/item.h ../core/db.h @@ -50,13 +51,14 @@ config.o: ../functions/login.h ../functions/logout.h ../functions/ls.h config.o: ../functions/mkdir.h ../functions/mv.h ../functions/node.h config.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h config.o: ../functions/run.h ../functions/subject.h ../functions/funthread.h -config.o: ../core/thread.h ../functions/funticket.h ../functions/tinymce.h -config.o: ../functions/uname.h ../functions/upload.h ../functions/who.h -config.o: ../templates/templates.h ../templates/patterncacher.h -config.o: ../core/item.h misc.h ../templates/ckeditorgetparser.h -config.o: ../core/httpsimpleparser.h ../core/log.h -config.o: ../templates/indexpatterns.h ../templates/localefilter.h -config.o: ../core/locale.h ../core/locale.h ../core/sessionmanager.h +config.o: ../core/thread.h ../functions/funticket.h ../core/ticket.h +config.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h +config.o: ../functions/uptime.h ../functions/who.h ../templates/templates.h +config.o: ../templates/patterncacher.h ../core/item.h misc.h +config.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h +config.o: ../core/log.h ../templates/indexpatterns.h +config.o: ../templates/localefilter.h ../core/locale.h ../core/locale.h +config.o: ../core/sessionmanager.h confparser.o: confparser.h misc.h item.h db.o: db.h item.h user.h group.h thread.h error.h log.h dircontainer.h db.o: ugcontainer.h ticket.h misc.h @@ -92,16 +94,15 @@ notify.o: log.h notify.h ../templatesnotify/templatesnotify.h notify.o: ../../ezc/src/ezc.h ../core/mount.h ../core/locale.h confparser.h notify.o: ../core/config.h ../templates/misc.h ../templates/localefilter.h notify.o: ../core/locale.h request.h requesttypes.h session.h item.h error.h -notify.o: user.h plugindata.h rebus.h thread.h compress.h -notify.o: acceptencodingparser.h acceptbaseparser.h htmlfilter.h -notify.o: postmultiparser.h config.h ticket.h system.h dirs.h dircontainer.h -notify.o: db.h group.h ugcontainer.h mounts.h mount.h users.h lastcontainer.h -notify.o: groups.h loadavg.h misc.h +notify.o: user.h plugindata.h rebus.h compress.h acceptencodingparser.h +notify.o: acceptbaseparser.h htmlfilter.h postmultiparser.h config.h system.h +notify.o: dirs.h dircontainer.h db.h group.h thread.h ugcontainer.h ticket.h +notify.o: mounts.h mount.h users.h lastcontainer.h groups.h loadavg.h misc.h plugin.o: plugin.h pluginmsg.h log.h plugindata.h config.h confparser.h plugin.o: request.h requesttypes.h session.h item.h error.h user.h rebus.h -plugin.o: thread.h compress.h acceptencodingparser.h acceptbaseparser.h -plugin.o: htmlfilter.h postmultiparser.h ticket.h system.h dirs.h -plugin.o: dircontainer.h db.h group.h ugcontainer.h mounts.h mount.h users.h +plugin.o: compress.h acceptencodingparser.h acceptbaseparser.h htmlfilter.h +plugin.o: postmultiparser.h system.h dirs.h dircontainer.h db.h group.h +plugin.o: thread.h ugcontainer.h ticket.h mounts.h mount.h users.h plugin.o: lastcontainer.h groups.h loadavg.h sessionmanager.h plugin.o: sessioncontainer.h ../functions/functions.h plugin.o: ../functions/functionbase.h ../core/item.h ../core/db.h @@ -117,20 +118,21 @@ plugin.o: ../functions/login.h ../functions/logout.h ../functions/ls.h plugin.o: ../functions/mkdir.h ../functions/mv.h ../functions/node.h plugin.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h plugin.o: ../functions/run.h ../functions/subject.h ../functions/funthread.h -plugin.o: ../core/thread.h ../functions/funticket.h ../functions/tinymce.h -plugin.o: ../functions/uname.h ../functions/upload.h ../functions/who.h -plugin.o: ../templates/templates.h ../templates/patterncacher.h -plugin.o: ../core/item.h misc.h ../templates/ckeditorgetparser.h -plugin.o: ../core/httpsimpleparser.h ../core/log.h -plugin.o: ../templates/indexpatterns.h ../templates/localefilter.h -plugin.o: ../core/locale.h ../core/locale.h ../core/sessionmanager.h +plugin.o: ../core/thread.h ../functions/funticket.h ../core/ticket.h +plugin.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h +plugin.o: ../functions/uptime.h ../functions/who.h ../templates/templates.h +plugin.o: ../templates/patterncacher.h ../core/item.h misc.h +plugin.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h +plugin.o: ../core/log.h ../templates/indexpatterns.h +plugin.o: ../templates/localefilter.h ../core/locale.h ../core/locale.h +plugin.o: ../core/sessionmanager.h plugindata.o: plugindata.h plugin.h pluginmsg.h log.h config.h confparser.h plugindata.o: request.h requesttypes.h session.h item.h error.h user.h -plugindata.o: rebus.h thread.h compress.h acceptencodingparser.h -plugindata.o: acceptbaseparser.h htmlfilter.h postmultiparser.h ticket.h -plugindata.o: system.h dirs.h dircontainer.h db.h group.h ugcontainer.h -plugindata.o: mounts.h mount.h users.h lastcontainer.h groups.h loadavg.h -plugindata.o: sessionmanager.h sessioncontainer.h ../functions/functions.h +plugindata.o: rebus.h compress.h acceptencodingparser.h acceptbaseparser.h +plugindata.o: htmlfilter.h postmultiparser.h system.h dirs.h dircontainer.h +plugindata.o: db.h group.h thread.h ugcontainer.h ticket.h mounts.h mount.h +plugindata.o: users.h lastcontainer.h groups.h loadavg.h sessionmanager.h +plugindata.o: sessioncontainer.h ../functions/functions.h plugindata.o: ../functions/functionbase.h ../core/item.h ../core/db.h plugindata.o: ../core/request.h ../core/config.h ../core/system.h plugindata.o: ../core/notify.h ../../ezc/src/ezc.h @@ -146,8 +148,9 @@ plugindata.o: ../functions/ls.h ../functions/mkdir.h ../functions/mv.h plugindata.o: ../functions/node.h ../functions/priv.h ../functions/reload.h plugindata.o: ../functions/rm.h ../functions/run.h ../functions/subject.h plugindata.o: ../functions/funthread.h ../core/thread.h -plugindata.o: ../functions/funticket.h ../functions/tinymce.h -plugindata.o: ../functions/uname.h ../functions/upload.h ../functions/who.h +plugindata.o: ../functions/funticket.h ../core/ticket.h +plugindata.o: ../functions/tinymce.h ../functions/uname.h +plugindata.o: ../functions/upload.h ../functions/uptime.h ../functions/who.h plugindata.o: ../templates/templates.h ../templates/patterncacher.h plugindata.o: ../core/item.h misc.h ../templates/ckeditorgetparser.h plugindata.o: ../core/httpsimpleparser.h ../core/log.h @@ -156,16 +159,16 @@ plugindata.o: ../core/locale.h ../core/locale.h ../core/sessionmanager.h postmultiparser.o: postmultiparser.h error.h log.h requesttypes.h config.h postmultiparser.o: confparser.h rebus.o: log.h rebus.h misc.h item.h request.h requesttypes.h session.h -rebus.o: error.h user.h plugindata.h thread.h compress.h -rebus.o: acceptencodingparser.h acceptbaseparser.h htmlfilter.h -rebus.o: postmultiparser.h config.h confparser.h ticket.h +rebus.o: error.h user.h plugindata.h compress.h acceptencodingparser.h +rebus.o: acceptbaseparser.h htmlfilter.h postmultiparser.h config.h +rebus.o: confparser.h request.o: request.h requesttypes.h session.h item.h error.h log.h user.h -request.o: plugindata.h rebus.h thread.h compress.h acceptencodingparser.h +request.o: plugindata.h rebus.h compress.h acceptencodingparser.h request.o: acceptbaseparser.h htmlfilter.h postmultiparser.h config.h -request.o: confparser.h ticket.h getparser.h httpsimpleparser.h postparser.h +request.o: confparser.h getparser.h httpsimpleparser.h postparser.h request.o: cookieparser.h plugin.h pluginmsg.h system.h dirs.h dircontainer.h -request.o: db.h group.h ugcontainer.h mounts.h mount.h users.h -request.o: lastcontainer.h groups.h loadavg.h sessionmanager.h +request.o: db.h group.h thread.h ugcontainer.h ticket.h mounts.h mount.h +request.o: users.h lastcontainer.h groups.h loadavg.h sessionmanager.h request.o: sessioncontainer.h ../functions/functions.h request.o: ../functions/functionbase.h ../core/item.h ../core/db.h request.o: ../core/request.h ../core/config.h ../core/system.h @@ -180,23 +183,23 @@ request.o: ../functions/login.h ../functions/logout.h ../functions/ls.h request.o: ../functions/mkdir.h ../functions/mv.h ../functions/node.h request.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h request.o: ../functions/run.h ../functions/subject.h ../functions/funthread.h -request.o: ../core/thread.h ../functions/funticket.h ../functions/tinymce.h -request.o: ../functions/uname.h ../functions/upload.h ../functions/who.h -request.o: ../templates/templates.h ../templates/patterncacher.h -request.o: ../core/item.h misc.h ../templates/ckeditorgetparser.h -request.o: ../core/httpsimpleparser.h ../core/log.h -request.o: ../templates/indexpatterns.h ../templates/localefilter.h -request.o: ../core/locale.h ../core/locale.h ../core/sessionmanager.h -request.o: ../functions/functionbase.h +request.o: ../core/thread.h ../functions/funticket.h ../core/ticket.h +request.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h +request.o: ../functions/uptime.h ../functions/who.h ../templates/templates.h +request.o: ../templates/patterncacher.h ../core/item.h misc.h +request.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h +request.o: ../core/log.h ../templates/indexpatterns.h +request.o: ../templates/localefilter.h ../core/locale.h ../core/locale.h +request.o: ../core/sessionmanager.h ../functions/functionbase.h session.o: session.h item.h error.h log.h user.h plugindata.h rebus.h sessioncontainer.o: sessioncontainer.h session.h item.h error.h log.h user.h sessioncontainer.o: plugindata.h rebus.h lastcontainer.h sessionmanager.o: sessionmanager.h sessioncontainer.h session.h item.h sessionmanager.o: error.h log.h user.h plugindata.h rebus.h lastcontainer.h -sessionmanager.o: config.h confparser.h request.h requesttypes.h thread.h -sessionmanager.o: compress.h acceptencodingparser.h acceptbaseparser.h -sessionmanager.o: htmlfilter.h postmultiparser.h ticket.h system.h dirs.h -sessionmanager.o: dircontainer.h db.h group.h ugcontainer.h mounts.h mount.h +sessionmanager.o: config.h confparser.h request.h requesttypes.h compress.h +sessionmanager.o: acceptencodingparser.h acceptbaseparser.h htmlfilter.h +sessionmanager.o: postmultiparser.h system.h dirs.h dircontainer.h db.h +sessionmanager.o: group.h thread.h ugcontainer.h ticket.h mounts.h mount.h sessionmanager.o: users.h groups.h loadavg.h sessionparser.h plugin.h sessionmanager.o: pluginmsg.h ../functions/functions.h sessionmanager.o: ../functions/functionbase.h ../core/item.h ../core/db.h @@ -215,8 +218,9 @@ sessionmanager.o: ../functions/mkdir.h ../functions/mv.h ../functions/node.h sessionmanager.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h sessionmanager.o: ../functions/run.h ../functions/subject.h sessionmanager.o: ../functions/funthread.h ../core/thread.h -sessionmanager.o: ../functions/funticket.h ../functions/tinymce.h -sessionmanager.o: ../functions/uname.h ../functions/upload.h +sessionmanager.o: ../functions/funticket.h ../core/ticket.h +sessionmanager.o: ../functions/tinymce.h ../functions/uname.h +sessionmanager.o: ../functions/upload.h ../functions/uptime.h sessionmanager.o: ../functions/who.h ../templates/templates.h sessionmanager.o: ../templates/patterncacher.h ../core/item.h misc.h sessionmanager.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h @@ -225,10 +229,10 @@ sessionmanager.o: ../templates/localefilter.h ../core/locale.h sessionmanager.o: ../core/locale.h ../core/sessionmanager.h sessionparser.o: sessionparser.h session.h item.h error.h log.h user.h sessionparser.o: plugindata.h rebus.h sessioncontainer.h lastcontainer.h -sessionparser.o: users.h ugcontainer.h request.h requesttypes.h thread.h -sessionparser.o: compress.h acceptencodingparser.h acceptbaseparser.h -sessionparser.o: htmlfilter.h postmultiparser.h config.h confparser.h -sessionparser.o: ticket.h db.h group.h dircontainer.h +sessionparser.o: users.h ugcontainer.h request.h requesttypes.h compress.h +sessionparser.o: acceptencodingparser.h acceptbaseparser.h htmlfilter.h +sessionparser.o: postmultiparser.h config.h confparser.h db.h group.h +sessionparser.o: thread.h dircontainer.h ticket.h system.o: system.h dirs.h item.h dircontainer.h db.h user.h group.h thread.h system.o: error.h log.h ugcontainer.h ticket.h request.h requesttypes.h system.o: session.h plugindata.h rebus.h compress.h acceptencodingparser.h @@ -250,14 +254,14 @@ system.o: ../functions/login.h ../functions/logout.h ../functions/ls.h system.o: ../functions/mkdir.h ../functions/mv.h ../functions/node.h system.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h system.o: ../functions/run.h ../functions/subject.h ../functions/funthread.h -system.o: ../core/thread.h ../functions/funticket.h ../functions/tinymce.h -system.o: ../functions/uname.h ../functions/upload.h ../functions/who.h -system.o: ../templates/templates.h ../templates/patterncacher.h -system.o: ../core/item.h ../templates/ckeditorgetparser.h -system.o: ../core/httpsimpleparser.h ../core/log.h -system.o: ../templates/indexpatterns.h ../core/sessionmanager.h +system.o: ../core/thread.h ../functions/funticket.h ../core/ticket.h +system.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h +system.o: ../functions/uptime.h ../functions/who.h ../templates/templates.h +system.o: ../templates/patterncacher.h ../core/item.h +system.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h +system.o: ../core/log.h ../templates/indexpatterns.h ../core/sessionmanager.h users.o: users.h user.h ugcontainer.h log.h lastcontainer.h request.h users.o: requesttypes.h session.h item.h error.h plugindata.h rebus.h -users.o: thread.h compress.h acceptencodingparser.h acceptbaseparser.h -users.o: htmlfilter.h postmultiparser.h config.h confparser.h ticket.h db.h -users.o: group.h dircontainer.h +users.o: compress.h acceptencodingparser.h acceptbaseparser.h htmlfilter.h +users.o: postmultiparser.h config.h confparser.h db.h group.h thread.h +users.o: dircontainer.h ticket.h diff --git a/core/app.cpp b/core/app.cpp index c8c6790..3b409f5 100755 --- a/core/app.cpp +++ b/core/app.cpp @@ -196,7 +196,7 @@ return true; void App::ProcessRequest() { - request.Clear(); + request.Clear(); // !! dac na koniec request.Read(); // when BaseUrlRedirect() return true we didn't have to set everything in request.Read() @@ -212,13 +212,15 @@ void App::ProcessRequest() functions.Parse(); system.mounts.CalcCurMount(); - - ReadAdditionalInfo(); + Make(); } request.SendAll(); // !! czemu request sam sie chce wyslac? wrzucic to tutaj do app notify.ItemChanged(request.notify_code); + + if( request.function ) + request.function->Clear(); } @@ -295,15 +297,15 @@ bool sent = false; if( request.is_item && request.item.auth == Item::auth_none && - request.item.content_type == Item::ct_raw && request.status == WINIX_ERR_OK && request.pfunction ) + request.item.content_type == Item::ct_raw && request.status == WINIX_ERR_OK && request.function ) { - if( request.pfunction->fun.url == "cat" ) + if( request.function->fun.url == "cat" ) { request.page << request.item.content; sent = true; } else - if( request.pfunction->fun.url == "run" ) + if( request.function->fun.url == "run" ) { templates.GenerateRunRaw(); sent = true; @@ -320,9 +322,9 @@ bool sent = false; void App::Make() { - if( request.dir_table.empty() ) + if( request.dir_tab.empty() ) { - log << log1 << "Content: there is no a root dir (dir_table is empty)" << logend; + log << log1 << "Content: there is no a root dir (dir_tab is empty)" << logend; return; } @@ -350,9 +352,9 @@ void App::Make() if( !request.redirect_to.empty() ) return; - if( request.dir_table.empty() ) + if( request.dir_tab.empty() ) { - log << log1 << "App: there is no a root dir (dir_table is empty -- after calling a function)" << logend; + log << log1 << "App: there is no a root dir (dir_tab is empty -- after calling a function)" << logend; return; } @@ -360,7 +362,7 @@ void App::Make() MakePage(); // !! dodac parametr do konfiga wlaczajacy te informacje - //request->PrintGetTable(); + //request->PrintGetTab(); //request->PrintEnv(); //request->PrintIn(); } @@ -368,31 +370,4 @@ void App::Make() -// !! dac lepsza nazwe i czy napewno w app to ma byc? -void App::ReadAdditionalInfo() -{ - if( request.dir_table.empty() ) - return; - - if( system.mounts.pmount->type == Mount::thread ) - { - if( db.GetThreadByDirId(request.dir_table.back()->id, request.thread) == WINIX_ERR_OK ) - request.is_thread = true; - } - else - if( system.mounts.pmount->type == Mount::ticket ) - { - if( db.GetTicketByDirId(request.dir_table.back()->id, request.ticket) == WINIX_ERR_OK ) - { - request.is_ticket = true; - - if( !request.is_item && (!request.pfunction || request.pfunction->fun.url == "ticket") ) - { - db.GetItemById(request.ticket.item_id, request.item); - // don't set request->is_item here - } - } - } -} - diff --git a/core/app.h b/core/app.h index 64afc33..fc3d099 100755 --- a/core/app.h +++ b/core/app.h @@ -99,7 +99,6 @@ private: void DeleteAllPluginsData(); void MakePage(); void Make(); - void ReadAdditionalInfo(); void SaveSessionsIfNeeded(); // !! wywalic do managara sesji?? // !! dodac do session managera? diff --git a/core/cookieparser.h b/core/cookieparser.h index ba5871e..3edf6e0 100755 --- a/core/cookieparser.h +++ b/core/cookieparser.h @@ -21,7 +21,7 @@ class CookieParser : public HttpSimpleParser { const char * cookie_string; - CookieTable & cookie_table; + CookieTab & cookie_tab; protected: @@ -41,7 +41,7 @@ protected: // Cookie names are case insensitive according to section 3.1 of RFC 2965 ToLower(name); - std::pair res = cookie_table.insert( std::make_pair(name, value) ); + std::pair res = cookie_tab.insert( std::make_pair(name, value) ); log << log2 << "Cookie, name: \"" << name << "\", value: \"" << value << "\""; @@ -58,7 +58,7 @@ protected: public: - CookieParser(const char * cookie_string_, CookieTable & cookie_table_) : cookie_string(cookie_string_), cookie_table(cookie_table_) + CookieParser(const char * cookie_string_, CookieTab & cookie_tab_) : cookie_string(cookie_string_), cookie_tab(cookie_tab_) { HttpSimpleParser::separator = ';'; HttpSimpleParser::value_can_be_quoted = true; diff --git a/core/db.cpp b/core/db.cpp index d78dda1..0ae72de 100755 --- a/core/db.cpp +++ b/core/db.cpp @@ -855,9 +855,9 @@ return AssertQuery(query.str()); -void Db::GetItems(std::vector & item_table, const ItemQuery & item_query) +void Db::GetItems(std::vector & item_tab, const ItemQuery & item_query) { - item_table.clear(); + item_tab.clear(); PGresult * r = 0; try @@ -876,7 +876,7 @@ void Db::GetItems(std::vector & item_table, const ItemQuery & item_query) for(int i = 0 ; i & item_table, const ItemQuery & item_query) -void Db::GetItems(std::vector & item_table, const ItemQuery & item_query) +void Db::GetItems(std::vector & item_tab, const ItemQuery & item_query) { - item_table.clear(); + item_tab.clear(); PGresult * r = 0; try @@ -905,7 +905,7 @@ void Db::GetItems(std::vector & item_table, const ItemQuery & item_query) for(int i = 0 ; i & item_table, long id) +void Db::GetItem(std::vector & item_tab, long id) { PGresult * r = 0; @@ -979,7 +979,7 @@ void Db::GetItem(std::vector & item_table, long id) for(int i = 0 ; i & user_table) +void Db::GetUsers(UGContainer & user_tab) { PGresult * r = 0; @@ -1503,7 +1503,7 @@ void Db::GetUsers(UGContainer & user_table) User u; long last_id = -1; - UGContainer::Iterator iter = user_table.End(); + UGContainer::Iterator iter = user_tab.End(); for(int i = 0 ; i & user_table) log << log1 << "Db: get user: id:" << u.id << ", name:" << u.name << ", super_user:" << u.super_user << logend; - iter = user_table.PushBack( u ); + iter = user_tab.PushBack( u ); - if( iter == user_table.End() ) + if( iter == user_tab.End() ) log << log1 << "Db: can't add a user: " << u.name << logend; last_id = u.id; @@ -1529,7 +1529,7 @@ void Db::GetUsers(UGContainer & user_table) long group_id = atol( AssertValue(r, i, cgroup_id) ); - if( !PQgetisnull(r, i, cgroup_id) && group_id!=-1 && iter!=user_table.End() ) + if( !PQgetisnull(r, i, cgroup_id) && group_id!=-1 && iter!=user_tab.End() ) { iter->groups.push_back(group_id); log << log3 << "Db: user:" << iter->name << " is a member of group_id:" << group_id << logend; @@ -1545,7 +1545,7 @@ void Db::GetUsers(UGContainer & user_table) -void Db::GetGroups(UGContainer & group_table) +void Db::GetGroups(UGContainer & group_tab) { PGresult * r = 0; @@ -1578,13 +1578,13 @@ void Db::GetGroups(UGContainer & group_table) g.name = AssertValue(r, i, cname); log << log3 << "Db: get group, id:" << g.id << ", group:" << g.name << logend; - iter = group_table.PushBack( g ); + iter = group_tab.PushBack( g ); last_id = g.id; } long user_id = atol( AssertValue(r, i, cuser_id) ); - if( !PQgetisnull(r, i, cuser_id) && user_id!=-1 && !group_table.Empty() ) + if( !PQgetisnull(r, i, cuser_id) && user_id!=-1 && !group_tab.Empty() ) { iter->members.push_back(user_id); log << log3 << "Db: get group member: user_id:" << user_id << logend; diff --git a/core/db.h b/core/db.h index 174d24c..89c7054 100755 --- a/core/db.h +++ b/core/db.h @@ -133,12 +133,12 @@ public: }; - void GetItems(std::vector & item_table, const ItemQuery & item_query); - void GetItems(std::vector & item_table, const ItemQuery & item_query); + void GetItems(std::vector & item_tab, const ItemQuery & item_query); + void GetItems(std::vector & item_tab, const ItemQuery & item_query); // !! pobiera tylko jeden item (cos wymyslec innego z nazwa albo argumentem) - void GetItem(std::vector & item_table, long id); + void GetItem(std::vector & item_tab, long id); bool GetPriv(Item & item, long id); @@ -151,9 +151,9 @@ public: bool DelItem(const Item & item); - void GetDirs(DirContainer & dir_table); - void GetUsers(UGContainer & user_table); - void GetGroups(UGContainer & group_table); + void GetDirs(DirContainer & dir_tab); + void GetUsers(UGContainer & user_tab); + void GetGroups(UGContainer & group_tab); // !! nowy interfejs long Size(long parent_id, Item::Type type = Item::none); diff --git a/core/dirs.cpp b/core/dirs.cpp index 72f88a5..e30fbea 100755 --- a/core/dirs.cpp +++ b/core/dirs.cpp @@ -27,7 +27,7 @@ void Dirs::SetRequest(Request * prequest) void Dirs::Clear() { - dir_table.Clear(); + dir_tab.Clear(); } @@ -40,9 +40,9 @@ bool Dirs::HasReadExecAccessForRoot(const Item & item) void Dirs::CheckRootDir() { - DirContainer::Iterator i = dir_table.GetRoot(); + DirContainer::Iterator i = dir_tab.GetRoot(); - if( i != dir_table.End() ) + if( i != dir_tab.End() ) { if( !HasReadExecAccessForRoot(*i) ) { @@ -70,7 +70,7 @@ void Dirs::CheckRootDir() // !! zrobic jakis wyjatek do wprowadzania roota? if( db->AddItem(root) == WINIX_ERR_OK ) { - dir_table.PushBack(root); + dir_tab.PushBack(root); } } @@ -81,9 +81,9 @@ void Dirs::ReadDirs() { Clear(); - db->GetDirs(dir_table); + db->GetDirs(dir_tab); CheckRootDir(); - dir_table.FindSpecialFolders(); + dir_tab.FindSpecialFolders(); } @@ -106,9 +106,9 @@ return !name.empty(); bool Dirs::IsDir(long id) { - DirContainer::Iterator i = dir_table.FindId(id); + DirContainer::Iterator i = dir_tab.FindId(id); - if( i == dir_table.End() ) + if( i == dir_tab.End() ) return false; return true; @@ -117,15 +117,15 @@ return true; -bool Dirs::GetDirChilds(long parent, std::vector & childs_table) +bool Dirs::GetDirChilds(long parent, std::vector & childs_tab) { if( parent != -1 && !IsDir(parent) ) return false; - DirContainer::ParentIterator i = dir_table.FindFirstParent(parent); + DirContainer::ParentIterator i = dir_tab.FindFirstParent(parent); - for( ; i != dir_table.ParentEnd() ; i = dir_table.NextParent(i) ) - childs_table.push_back( &(*i->second) ); + for( ; i != dir_tab.ParentEnd() ; i = dir_tab.NextParent(i) ) + childs_tab.push_back( &(*i->second) ); return true; } @@ -133,7 +133,7 @@ return true; DirContainer::ParentIterator Dirs::FindFirstParent(long parent_id) { - DirContainer::ParentIterator i = dir_table.FindFirstParent(parent_id); + DirContainer::ParentIterator i = dir_tab.FindFirstParent(parent_id); return i; } @@ -141,13 +141,13 @@ return i; DirContainer::ParentIterator Dirs::NextParent(DirContainer::ParentIterator i) { - return dir_table.NextParent(i); + return dir_tab.NextParent(i); } DirContainer::ParentIterator Dirs::ParentEnd() { - return dir_table.ParentEnd(); + return dir_tab.ParentEnd(); } @@ -163,9 +163,9 @@ DirContainer::Iterator i; while( true ) { - i = dir_table.FindId(id); + i = dir_tab.FindId(id); - if( i == dir_table.End() || + if( i == dir_tab.End() || i->parent_id == id ) // means a loop (something wrong in the db) return false; @@ -184,7 +184,7 @@ DirContainer::Iterator i; bool Dirs::ChangeParent(long dir_id, long new_parent_id) { - return dir_table.ChangeParent(dir_id, new_parent_id); + return dir_tab.ChangeParent(dir_id, new_parent_id); } @@ -198,9 +198,9 @@ DirContainer::Iterator i; while( true ) { - i = dir_table.FindId(dir_id); + i = dir_tab.FindId(dir_id); - if( i==dir_table.End() || i->parent_id==-1 ) + if( i==dir_tab.End() || i->parent_id==-1 ) return false; if( i->parent_id == parent_id ) @@ -215,9 +215,9 @@ DirContainer::Iterator i; Item * Dirs::GetRootDir() { - DirContainer::Iterator root = dir_table.GetRoot(); + DirContainer::Iterator root = dir_tab.GetRoot(); - if( root == dir_table.End() ) + if( root == dir_tab.End() ) return 0; return &(*root); @@ -226,9 +226,9 @@ return &(*root); Item * Dirs::GetEtcDir() { - DirContainer::Iterator etc = dir_table.GetEtc(); + DirContainer::Iterator etc = dir_tab.GetEtc(); - if( etc == dir_table.End() ) + if( etc == dir_tab.End() ) return 0; return &(*etc); @@ -237,9 +237,9 @@ return &(*etc); Item * Dirs::GetDir(const std::string & name, long parent) { - DirContainer::ParentIterator i = dir_table.FindFirstParent(parent); + DirContainer::ParentIterator i = dir_tab.FindFirstParent(parent); - for( ; i!=dir_table.ParentEnd() ; i = dir_table.NextParent(i) ) + for( ; i!=dir_tab.ParentEnd() ; i = dir_tab.NextParent(i) ) if( i->second->url == name ) return &(*i->second); @@ -250,9 +250,9 @@ return 0; Item * Dirs::GetDir(const std::string & path) { - DirContainer::Iterator root = dir_table.GetRoot(); + DirContainer::Iterator root = dir_tab.GetRoot(); - if( root == dir_table.End() ) + if( root == dir_tab.End() ) // ops, we do not have a root dir return 0; @@ -276,9 +276,9 @@ return pitem; Item * Dirs::GetDir(long id) { - DirContainer::Iterator i = dir_table.FindId(id); + DirContainer::Iterator i = dir_tab.FindId(id); - if( i == dir_table.End() ) + if( i == dir_tab.End() ) return 0; return &(*i); @@ -289,7 +289,7 @@ return &(*i); Item * Dirs::AddDir(const Item & item) { - return &(*dir_table.PushBack(item)); + return &(*dir_tab.PushBack(item)); } @@ -405,11 +405,11 @@ void Dirs::SplitPath(const std::string & path, std::string & dir, std::string & // !! dodac kasowanie z bazy bool Dirs::DelDir(long dir_id) { - return dir_table.DelById(dir_id); + return dir_tab.DelById(dir_id); } -Error Dirs::AddDirectory(Item & item, bool add_to_dir_table) +Error Dirs::AddDirectory(Item & item, bool add_to_dir_tab) { if( item.type != Item::dir ) return WINIX_ERR_DIR_EXPECTED; @@ -420,8 +420,8 @@ Error Dirs::AddDirectory(Item & item, bool add_to_dir_table) { Item * pdir = AddDir(item); - if( add_to_dir_table && request->dir_table.back()->id == item.parent_id ) - request->dir_table.push_back(pdir); + if( add_to_dir_tab && request->dir_tab.back()->id == item.parent_id ) + request->dir_tab.push_back(pdir); } return status; diff --git a/core/dirs.h b/core/dirs.h index 90cc811..7ef3741 100755 --- a/core/dirs.h +++ b/core/dirs.h @@ -36,7 +36,7 @@ public: // these methods return false if there is no such a dir bool IsDir(long dir_id); - bool GetDirChilds(long parent_id, std::vector & childs_table); + bool GetDirChilds(long parent_id, std::vector & childs_tab); bool MakePath(long dir_id, std::string & path); bool ChangeParent(long dir_id, long new_parent_id); bool HasParent(long dir_id, long parent_id); @@ -63,14 +63,14 @@ public: // !! jak juz wczesniejsze nazwy beda zmienione to tutaj damy AddDir() - Error AddDirectory(Item & item, bool add_to_dir_table = false); + Error AddDirectory(Item & item, bool add_to_dir_tab = false); private: Request * request; Db * db; - DirContainer dir_table; + DirContainer dir_tab; size_t AnalyzeDir(Item * pdir, const std::string & path, long & dir_id, std::string & dir); std::string analyze_temp; diff --git a/core/getparser.h b/core/getparser.h index 09a2b78..fbd117d 100755 --- a/core/getparser.h +++ b/core/getparser.h @@ -18,7 +18,7 @@ class GetParser : public HttpSimpleParser { const char * get_string; - GetTable & get_table; + GetTab & get_tab; protected: @@ -33,7 +33,7 @@ protected: virtual void Parameter(std::string &, std::string & value) { - get_table.push_back(value); + get_tab.push_back(value); log << log2 << "Get, value: \"" << value << "\"" << logend; } @@ -42,7 +42,7 @@ protected: public: - GetParser(const char * get_string_, GetTable & get_table_) : get_string(get_string_), get_table(get_table_) + GetParser(const char * get_string_, GetTab & get_tab_) : get_string(get_string_), get_tab(get_tab_) { HttpSimpleParser::separator = '/'; HttpSimpleParser::read_name = false; diff --git a/core/mounts.cpp b/core/mounts.cpp index 58b61d0..7271129 100755 --- a/core/mounts.cpp +++ b/core/mounts.cpp @@ -119,12 +119,12 @@ void Mounts::CalcCurMount() { std::vector::reverse_iterator i; - // when the program starts (when the dir_table is empty() + // when the program starts (when the dir_tab is empty() // we don't want to call MountCmsForRoot() - if( request->dir_table.empty() ) + if( request->dir_tab.empty() ) return; - for(i = request->dir_table.rbegin() ; i!=request->dir_table.rend() ; ++i) + for(i = request->dir_tab.rbegin() ; i!=request->dir_tab.rend() ; ++i) { std::map::iterator m = mount_tab.find( (*i)->id ); diff --git a/core/notify.cpp b/core/notify.cpp index 7a03fc5..ff4cea5 100755 --- a/core/notify.cpp +++ b/core/notify.cpp @@ -211,9 +211,9 @@ void Notify::CreateItemDir(std::string & dir, bool clear) if( clear ) dir.clear(); - for(size_t a=0 ; adir_table.size() ; ++a) + for(size_t a=0 ; adir_tab.size() ; ++a) { - dir += request->dir_table[a]->url; + dir += request->dir_tab[a]->url; dir += '/'; } } diff --git a/core/postmultiparser.cpp b/core/postmultiparser.cpp index a74e0cd..0772c50 100755 --- a/core/postmultiparser.cpp +++ b/core/postmultiparser.cpp @@ -349,14 +349,14 @@ void PostMultiParser::ReadContent() void PostMultiParser::AddNormalPostVar() { - if( post_table->size() >= WINIX_POSTTABLE_MAXSIZE ) + if( post_tab->size() >= WINIX_POSTTABLE_MAXSIZE ) { err = WINIX_ERR_INPUT_TOO_LARGE; log << log1 << "PMP: more than " << WINIX_POSTTABLE_MAXSIZE << " post variables (skipping)" << logend; return; } - std::pair res = post_table->insert( std::make_pair(name, content) ); + std::pair res = post_tab->insert( std::make_pair(name, content) ); bool added = res.second; log << log2 << "PMP: POST var, name: \"" << name << "\""; @@ -370,7 +370,7 @@ void PostMultiParser::AddNormalPostVar() void PostMultiParser::AddFilePostVar() { - if( post_file_table->size() >= WINIX_POSTTABLE_MAXSIZE ) + if( post_file_tab->size() >= WINIX_POSTTABLE_MAXSIZE ) { err = WINIX_ERR_INPUT_TOO_LARGE; log << log1 << "PMP: more than " << WINIX_POSTTABLE_MAXSIZE << " post file variables (skipping)" << logend; @@ -379,7 +379,7 @@ void PostMultiParser::AddFilePostVar() post_file_temp.filename = filename; post_file_temp.tmp_filename = tmp_filename; - std::pair res = post_file_table->insert( std::make_pair(name, post_file_temp) ); + std::pair res = post_file_tab->insert( std::make_pair(name, post_file_temp) ); bool added = res.second; log << log2 << "PMP: POST FILE var, name: \"" << name << "\""; @@ -531,7 +531,7 @@ void PostMultiParser::ReadChar() -Error PostMultiParser::Parse(FCGX_Stream * in_, PostTable & post_table_, PostFileTable & post_file_table_) +Error PostMultiParser::Parse(FCGX_Stream * in_, PostTab & post_tab_, PostFileTab & post_file_tab_) { in = in_; last = 0; @@ -539,8 +539,8 @@ Error PostMultiParser::Parse(FCGX_Stream * in_, PostTable & post_table_, PostFil line_end_dos = false; in_buffer_ind = WINIX_POSTMULTI_INPUT_BUFFER; in_buffer_len = WINIX_POSTMULTI_INPUT_BUFFER; - post_table = &post_table_; - post_file_table = &post_file_table_; + post_tab = &post_tab_; + post_file_tab = &post_file_tab_; tmp_filename_postfix = 1; ReadChar(); @@ -554,8 +554,8 @@ Error PostMultiParser::Parse(FCGX_Stream * in_, PostTable & post_table_, PostFil if( err != WINIX_ERR_OK ) { - post_table->clear(); - post_file_table->clear(); + post_tab->clear(); + post_file_tab->clear(); if( err != WINIX_ERR_INPUT_TOO_LARGE && err != WINIX_ERR_CANT_CREATE_FILE ) log << log1 << "PMP: syntax error" << logend; diff --git a/core/postmultiparser.h b/core/postmultiparser.h index 96770b6..5f22717 100755 --- a/core/postmultiparser.h +++ b/core/postmultiparser.h @@ -34,7 +34,7 @@ public: ~PostMultiParser(); void SetConfig(Config * pconfig); - Error Parse(FCGX_Stream * in_, PostTable & post_table_, PostFileTable & post_file_table_); + Error Parse(FCGX_Stream * in_, PostTab & post_tab_, PostFileTab & post_file_tab_); private: @@ -48,8 +48,8 @@ private: size_t in_buffer_ind; size_t in_buffer_len; - PostTable * post_table; - PostFileTable * post_file_table; + PostTab * post_tab; + PostFileTab * post_file_tab; int last; // last read character diff --git a/core/postparser.h b/core/postparser.h index ceeb671..bb23bd6 100755 --- a/core/postparser.h +++ b/core/postparser.h @@ -22,7 +22,7 @@ class PostParser : public HttpSimpleParser { FCGX_Stream * in; - PostTable & post_table; + PostTab & post_tab; protected: @@ -35,7 +35,7 @@ protected: virtual void Parameter(std::string & name, std::string & value) { - std::pair res = post_table.insert( std::make_pair(name, value) ); + std::pair res = post_tab.insert( std::make_pair(name, value) ); log << log2 << "Method POST, name: \"" << name << "\", value: \"" << value << "\""; @@ -48,7 +48,7 @@ protected: public: - PostParser(FCGX_Stream * in_, PostTable & post_table_) : in(in_), post_table(post_table_) + PostParser(FCGX_Stream * in_, PostTab & post_tab_) : in(in_), post_tab(post_tab_) { } diff --git a/core/request.cpp b/core/request.cpp index f982146..ebc066e 100755 --- a/core/request.cpp +++ b/core/request.cpp @@ -47,14 +47,14 @@ void Request::ClearPostFileTmp() { // deleting temporary files (if exists) - while( !post_file_table.empty() ) + while( !post_file_tab.empty() ) { - const std::string & tmp_filename = post_file_table.begin()->second.tmp_filename; + const std::string & tmp_filename = post_file_tab.begin()->second.tmp_filename; if( unlink(tmp_filename.c_str()) == 0 ) log << log3 << "Request: deleted tmp file: " << tmp_filename << logend; - post_file_table.erase(post_file_table.begin()); + post_file_tab.erase(post_file_tab.begin()); } } @@ -67,10 +67,10 @@ void Request::Clear() if( ++id == 0 ) ++id; - get_table.clear(); - post_table.clear(); - post_file_table.clear(); - cookie_table.clear(); + get_tab.clear(); + post_tab.clear(); + post_file_tab.clear(); + cookie_tab.clear(); method = none; role = responder; @@ -78,7 +78,7 @@ void Request::Clear() headers.str(""); page.str(""); debug.str(""); - notify.str(""); + //notify.str(""); env_request_method = &char_empty; env_request_uri = &char_empty; @@ -93,22 +93,14 @@ void Request::Clear() session = 0; - item_table.clear(); + item_tab.clear(); item.Clear(); - dir_table.clear(); + dir_tab.clear(); is_item = false; - pfunction = 0; - param_table.clear(); + function = 0; + param_tab.clear(); status = WINIX_ERR_OK; - - is_thread = false; - thread.Clear(); - thread_tab.clear(); - - is_ticket = false; - ticket.Clear(); - ticket_tab.clear(); notify_code = 0; browser_msie = false; @@ -154,11 +146,11 @@ void Request::SetCookie(const char * name, long value, tm * expires) bool Request::IsPostVar(const char * var) { - PostTable::iterator p; + PostTab::iterator p; - p = post_table.find(var); + p = post_tab.find(var); - if( p == post_table.end() ) + if( p == post_tab.end() ) return false; return true; @@ -168,9 +160,9 @@ return true; std::string * Request::PostVar(const char * var) { -PostTable::iterator p = post_table.find(var); +PostTab::iterator p = post_tab.find(var); - if( p == post_table.end() ) + if( p == post_tab.end() ) return 0; return &(p->second); @@ -180,9 +172,9 @@ return &(p->second); bool Request::PostVar(const char * var, std::string & result) { -PostTable::iterator p = post_table.find(var); +PostTab::iterator p = post_tab.find(var); - if( p == post_table.end() ) + if( p == post_tab.end() ) { result.clear(); return false; @@ -200,11 +192,11 @@ return true; // -void Request::PrintGetTable() +void Request::PrintGetTab() { - debug << "get_table: " << get_table.size() << "\n"; + debug << "get_tab: " << get_tab.size() << "\n"; - for(GetTable::iterator i = get_table.begin() ; i != get_table.end() ; ++i) + for(GetTab::iterator i = get_tab.begin() ; i != get_tab.end() ; ++i) debug << " \"" << *i << "\"\n"; debug << std::endl; @@ -327,9 +319,9 @@ void Request::CheckMethod() bool Request::AllPostVarEmpty() { -PostTable::iterator i; +PostTab::iterator i; - for(i=post_table.begin() ; i!=post_table.end() ; ++i) + for(i=post_tab.begin() ; i!=post_tab.end() ; ++i) if( !i->second.empty() ) return false; @@ -342,7 +334,7 @@ return true; void Request::ReadParameters() { // !! wrzucic jako skladowa klasy - GetParser get_parser(env_request_uri, get_table); + GetParser get_parser(env_request_uri, get_tab); get_parser.Parse(); if( method == post ) @@ -352,17 +344,17 @@ void Request::ReadParameters() log << log3 << "Request: post content type: multipart/form-data" << logend; post_multi_parser.SetConfig(config); - post_multi_parser.Parse(in, post_table, post_file_table); + post_multi_parser.Parse(in, post_tab, post_file_tab); } else { // !! wrzucic jako skladowa klasy - PostParser post_parser(in, post_table); + PostParser post_parser(in, post_tab); post_parser.Parse(); } } - CookieParser cookie_parser(env_http_cookie, cookie_table); + CookieParser cookie_parser(env_http_cookie, cookie_tab); cookie_parser.Parse(); accept_encoding_parser.Parse(env_http_accept_encoding); @@ -491,7 +483,7 @@ void Request::SendPage(bool compressing, const std::string & source_ref) const std::string * source = &source_ref; bool raw = is_item && item.content_type == Item::ct_raw && status == WINIX_ERR_OK && - pfunction && (pfunction->fun.url == "cat" || pfunction->fun.url == "run"); + function && (function->fun.url == "cat" || function->fun.url == "run"); if( config->html_filter && !raw ) { @@ -550,9 +542,9 @@ bool compressing = config->compression && role == responder && redirect_to.empty bool Request::IsParam(const char * param_name) { - ParamTable::iterator i; + ParamTab::iterator i; - for(i=param_table.begin() ; i!=param_table.end() ; ++i) + for(i=param_tab.begin() ; i!=param_tab.end() ; ++i) { // !! make sure that exists std::string::operator==(const char*) // (optimization) @@ -566,9 +558,9 @@ return false; const std::string & Request::ParamValue(const char * param_name) { - ParamTable::iterator i; + ParamTab::iterator i; - for(i=param_table.begin() ; i!=param_table.end() ; ++i) + for(i=param_tab.begin() ; i!=param_tab.end() ; ++i) { if( i->name == param_name ) { diff --git a/core/request.h b/core/request.h index 9f17673..5047174 100755 --- a/core/request.h +++ b/core/request.h @@ -19,12 +19,10 @@ #include "session.h" #include "item.h" #include "error.h" -#include "thread.h" #include "compress.h" #include "acceptencodingparser.h" #include "htmlfilter.h" #include "postmultiparser.h" -#include "ticket.h" #include "config.h" @@ -49,14 +47,13 @@ struct Request enum Role { responder, authorizer } role; // headers, page and debug - // notify (for mailing) - std::ostringstream headers, page, debug, notify; + std::ostringstream headers, page, debug; - - GetTable get_table; - PostTable post_table; - PostFileTable post_file_table; - CookieTable cookie_table; + // raw parameters + GetTab get_tab; + PostTab post_tab; + PostFileTab post_file_tab; + CookieTab cookie_tab; // environment variables // they are not null -- when the server doesn't have such a variable @@ -78,41 +75,32 @@ struct Request bool browser_konqueror; // current session - // is set after calling session_manager.SetSession() Session * session; // current directory - std::vector dir_table; + std::vector dir_tab; + // true if a file exists bool is_item; - // this item is used for many purposes such as editing, adding an item etc. + // current file (if exists) Item item; + // winix function // null if there is no a function - FunctionBase * pfunction; + FunctionBase * function; // parameters (name:value) - ParamTable param_table; - + ParamTab param_tab; + + // request status Error status; // last notify int notify_code; - // items in the current directory - // maybe without contents? - std::vector item_table; - - // current thread (if exists) - bool is_thread; - Thread thread; - std::vector thread_tab; - - // current ticket (if exists) - bool is_ticket; - Ticket ticket; - std::vector ticket_tab; + // usually items in the current directory (depends on the function) + std::vector item_tab; // if not empty means an address for redirecting to std::string redirect_to; @@ -124,7 +112,7 @@ struct Request bool send_as_attachment; // for debugging - void PrintGetTable(); + void PrintGetTab(); void PrintEnv(); void PrintIn(); @@ -150,7 +138,7 @@ struct Request void ReadParameters(); void Read(); void SendAll(); - void SendNotify(); + //void SendNotify(); void SetConfig(Config * pconfig); @@ -165,7 +153,7 @@ private: h_403 }; - bool CanUse(long user_id, const char * group_name); + void SendSessionCookie(); void CheckIE(); diff --git a/core/requesttypes.h b/core/requesttypes.h index de4b173..0208bf1 100755 --- a/core/requesttypes.h +++ b/core/requesttypes.h @@ -34,11 +34,11 @@ struct Param // some global types used by Request class -typedef std::vector GetTable; -typedef std::map PostTable; -typedef std::map PostFileTable; -typedef std::map CookieTable; -typedef std::vector ParamTable; +typedef std::vector GetTab; +typedef std::map PostTab; +typedef std::map PostFileTab; +typedef std::map CookieTab; +typedef std::vector ParamTab; diff --git a/core/sessionmanager.cpp b/core/sessionmanager.cpp index 8e6010c..8d38ab3 100755 --- a/core/sessionmanager.cpp +++ b/core/sessionmanager.cpp @@ -45,13 +45,13 @@ void SessionManager::SetSystem(System * psystem) void SessionManager::SetLastContainer(LastContainer * plast_container) { - session_table.SetLastContainer(plast_container); + session_tab.SetLastContainer(plast_container); } bool SessionManager::IsSession(long id) { - if( session_table.FindById(id) == session_table.End() ) + if( session_tab.FindById(id) == session_tab.End() ) return false; return true; @@ -92,15 +92,15 @@ return id; void SessionManager::CreateTemporarySession() { - SessionContainer::Iterator i = session_table.FindById( 0 ); + SessionContainer::Iterator i = session_tab.FindById( 0 ); - if( i == session_table.End() ) + if( i == session_tab.End() ) { Session s; s.id = 0; - session_table.PushBack(s); - request->session = &session_table.Back(); + session_tab.PushBack(s); + request->session = &session_tab.Back(); } else { @@ -119,11 +119,11 @@ int attempts = 100; { s.id = CreateSessionId(); - bool added = session_table.PushBack(s); + bool added = session_tab.PushBack(s); if( added ) { - request->session = &session_table.Back(); + request->session = &session_tab.Back(); request->session->new_session = true; log << log2 << "SM: created a new session: " << request->session->id << logend; @@ -144,15 +144,15 @@ int attempts = 100; bool SessionManager::SetSessionFromCookie(const std::string & cookie) { long id = atol(cookie.c_str()); - SessionContainer::Iterator s = session_table.FindById(id); + SessionContainer::Iterator s = session_tab.FindById(id); - if( s == session_table.End() ) + if( s == session_tab.End() ) return false; // that session is in the table request->session = &(*s); request->session->new_session = false; - session_table.UpdateLastTime(s, std::time(0)); + session_tab.UpdateLastTime(s, std::time(0)); if( request->method == Request::get ) request->session->last_time_get = request->session->last_time; @@ -171,9 +171,9 @@ return true; void SessionManager::SetSession() { - CookieTable::iterator i = request->cookie_table.find(config->http_session_id_name); + CookieTab::iterator i = request->cookie_tab.find(config->http_session_id_name); - if( i == request->cookie_table.end() ) + if( i == request->cookie_tab.end() ) { CreateSession(); } @@ -183,7 +183,7 @@ void SessionManager::SetSession() { // there is no such a session // deleting the old cookie - request->cookie_table.erase(i); + request->cookie_tab.erase(i); // and creating a new one CreateSession(); @@ -205,14 +205,14 @@ void SessionManager::SetSession() SessionContainer::Iterator SessionManager::SessionBegin() { - return session_table.Begin(); + return session_tab.Begin(); } SessionContainer::Iterator SessionManager::SessionEnd() { - return session_table.End(); + return session_tab.End(); } @@ -220,7 +220,7 @@ SessionContainer::Iterator SessionManager::SessionEnd() void SessionManager::DeleteOldSessions() { - session_table.DelFirstByTimeInterval(config->session_max_idle); + session_tab.DelFirstByTimeInterval(config->session_max_idle); if( ++session_checker > 1000 ) { @@ -228,7 +228,7 @@ void SessionManager::DeleteOldSessions() log << log3 << "SM: checking sessions which have 'remember me' flag set" << logend; session_checker = 0; - session_table.DelFirstByTimeInterval(config->session_remember_max_idle, false); + session_tab.DelFirstByTimeInterval(config->session_remember_max_idle, false); } } @@ -236,11 +236,11 @@ void SessionManager::DeleteOldSessions() void SessionManager::DeleteAllPluginsData() { - SessionContainer::Iterator i = session_table.Begin(); + SessionContainer::Iterator i = session_tab.Begin(); Session * old_session = request->session; - for( ; i!=session_table.End() ; ++i ) + for( ; i!=session_tab.End() ; ++i ) { request->session = &(*i); i->plugin_data.DeleteAll(); @@ -261,10 +261,10 @@ SessionContainer::Iterator i; sp.SetUsers(&system->users); Session * old_session = request->session; - sp.Parse(config->session_file, session_table); - i = session_table.Begin(); + sp.Parse(config->session_file, session_tab); + i = session_tab.Begin(); - for( ; i!=session_table.End() ; ++i ) + for( ; i!=session_tab.End() ; ++i ) { i->plugin_data.Resize(plugin.Size()); request->session = &(*i); @@ -294,9 +294,9 @@ void SessionManager::SaveSessions() log << log2 << "SM: saving sessions" << logend; long len = 0; - SessionContainer::Iterator i = session_table.Begin(); + SessionContainer::Iterator i = session_tab.Begin(); - for( ; i!=session_table.End() ; ++i ) + for( ; i!=session_tab.End() ; ++i ) { if( i->id != 0 && i->puser ) { diff --git a/core/sessionmanager.h b/core/sessionmanager.h index 0126d31..b84601e 100755 --- a/core/sessionmanager.h +++ b/core/sessionmanager.h @@ -27,7 +27,7 @@ class SessionManager Request * request; System * system; - SessionContainer session_table; + SessionContainer session_tab; bool IsSession(long s); diff --git a/core/system.cpp b/core/system.cpp index 1fe45a9..4c63d8d 100755 --- a/core/system.cpp +++ b/core/system.cpp @@ -114,15 +114,17 @@ Item * pdir; { // !! zrobic nowy interfejs // !! GetItem pozamieniac na GetFile - // !! i nie uzywac request->item_table (zrobic sobie lokalny tutaj) - db->GetItem(request->item_table, item_id); + // !! i nie uzywac request->item_tab (zrobic sobie lokalny tutaj) + db->GetItem(request->item_tab, item_id); - if( !request->item_table.empty() ) + if( !request->item_tab.empty() ) { - if( !dirs.MakePath(request->item_table[0].parent_id, path) ) - log << log1 << "Content: Can't redirect: no dirs for item id: " << request->item_table[0].id << ", requested directory id: " << request->item_table[0].parent_id << logend; + if( !dirs.MakePath(request->item_tab[0].parent_id, path) ) + log << log1 << "Content: Can't redirect: no dirs for item id: " + << request->item_tab[0].id << ", requested directory id: " + << request->item_tab[0].parent_id << logend; - request->redirect_to += path + request->item_table[0].url; + request->redirect_to += path + request->item_tab[0].url; } else { @@ -138,7 +140,7 @@ Item * pdir; void System::RedirectToLastDir() { // !! dac sprawdzenie czy istnieje - RedirectTo( *request->dir_table.back() ); + RedirectTo( *request->dir_tab.back() ); } @@ -147,7 +149,7 @@ void System::RedirectToLastItem() if( request->is_item ) RedirectTo(request->item); else - RedirectTo( *request->dir_table.back() );// !! dac sprawdzenie czy istnieje + RedirectTo( *request->dir_tab.back() );// !! dac sprawdzenie czy istnieje } @@ -337,7 +339,7 @@ bool System::DirsHaveReadExecPerm() { std::vector::iterator i; - for(i = request->dir_table.begin() ; i!=request->dir_table.end() ; ++i) + for(i = request->dir_tab.begin() ; i!=request->dir_tab.end() ; ++i) { if( !HasReadExecAccess(**i) ) return false; @@ -348,15 +350,15 @@ return true; // if we don't have access we only remove the item from the table -void System::CheckAccessToItems(std::vector & item_table) +void System::CheckAccessToItems(std::vector & item_tab) { size_t i = 0; - while( i < item_table.size() ) + while( i < item_tab.size() ) { - if( !HasReadAccess(item_table[i]) ) + if( !HasReadAccess(item_tab[i]) ) { - item_table.erase(item_table.begin() + i); + item_tab.erase(item_tab.begin() + i); } else { diff --git a/core/system.h b/core/system.h index 354c052..3d0332e 100755 --- a/core/system.h +++ b/core/system.h @@ -77,7 +77,7 @@ public: bool HasReadExecAccess(const Item & item); bool HasReadExecAccessToPath(long dir_id); bool DirsHaveReadExecPerm(); - void CheckAccessToItems(std::vector & item_table); + void CheckAccessToItems(std::vector & item_tab); bool CanUseHtml(long user_id); bool CanUseBBCode(long user_id); diff --git a/functions/Makefile.dep b/functions/Makefile.dep index f51665d..bf42d58 100755 --- a/functions/Makefile.dep +++ b/functions/Makefile.dep @@ -79,8 +79,8 @@ ckeditor.o: functions.h functionparser.h adduser.h cat.h chmod.h ckeditor.o: privchanger.h chown.h cp.h createthread.h createticket.h ckeditor.o: default.h download.h editticket.h emacs.h last.h login.h logout.h ckeditor.o: ls.h mkdir.h mv.h node.h priv.h reload.h rm.h run.h subject.h -ckeditor.o: funthread.h ../core/thread.h funticket.h tinymce.h uname.h -ckeditor.o: upload.h who.h +ckeditor.o: funthread.h ../core/thread.h funticket.h ../core/ticket.h +ckeditor.o: tinymce.h uname.h upload.h uptime.h who.h cp.o: cp.h functionbase.h ../core/item.h ../core/db.h ../core/item.h cp.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h cp.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h @@ -116,8 +116,8 @@ createthread.o: functions.h functionparser.h adduser.h cat.h chmod.h createthread.o: privchanger.h chown.h ckeditor.h cp.h createticket.h createthread.o: default.h download.h editticket.h emacs.h last.h login.h createthread.o: logout.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h run.h -createthread.o: subject.h funthread.h ../core/thread.h funticket.h tinymce.h -createthread.o: uname.h upload.h who.h +createthread.o: subject.h funthread.h ../core/thread.h funticket.h +createthread.o: ../core/ticket.h tinymce.h uname.h upload.h uptime.h who.h createticket.o: createticket.h functionbase.h ../core/item.h ../core/db.h createticket.o: ../core/item.h ../core/user.h ../core/group.h createticket.o: ../core/thread.h ../core/error.h ../core/log.h @@ -139,7 +139,7 @@ createticket.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h createticket.o: createthread.h default.h download.h editticket.h emacs.h createticket.o: last.h login.h logout.h ls.h mkdir.h mv.h node.h priv.h createticket.o: reload.h rm.h run.h subject.h funthread.h ../core/thread.h -createticket.o: funticket.h tinymce.h uname.h upload.h who.h +createticket.o: funticket.h tinymce.h uname.h upload.h uptime.h who.h default.o: default.h functionbase.h ../core/item.h ../core/db.h default.o: ../core/item.h ../core/user.h ../core/group.h ../core/thread.h default.o: ../core/error.h ../core/log.h ../core/dircontainer.h @@ -189,8 +189,9 @@ editticket.o: functions.h functionparser.h adduser.h cat.h chmod.h editticket.o: privchanger.h chown.h ckeditor.h cp.h createthread.h editticket.o: createticket.h default.h download.h emacs.h last.h login.h editticket.o: logout.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h run.h -editticket.o: subject.h funthread.h ../core/thread.h funticket.h tinymce.h -editticket.o: uname.h upload.h who.h readticket.h ../core/ticket.h +editticket.o: subject.h funthread.h ../core/thread.h funticket.h +editticket.o: ../core/ticket.h tinymce.h uname.h upload.h uptime.h who.h +editticket.o: readticket.h emacs.o: emacs.h functionbase.h ../core/item.h ../core/db.h ../core/item.h emacs.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h emacs.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h @@ -213,8 +214,8 @@ emacs.o: ../core/sessioncontainer.h functions.h functionparser.h adduser.h emacs.o: cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h createthread.h emacs.o: createticket.h default.h download.h editticket.h last.h login.h emacs.o: logout.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h run.h -emacs.o: subject.h funthread.h ../core/thread.h funticket.h tinymce.h uname.h -emacs.o: upload.h who.h +emacs.o: subject.h funthread.h ../core/thread.h funticket.h ../core/ticket.h +emacs.o: tinymce.h uname.h upload.h uptime.h who.h functionbase.o: functionbase.h ../core/item.h ../core/db.h ../core/item.h functionbase.o: ../core/user.h ../core/group.h ../core/thread.h functionbase.o: ../core/error.h ../core/log.h ../core/dircontainer.h @@ -236,21 +237,22 @@ functionbase.o: privchanger.h chown.h ckeditor.h cp.h createthread.h functionbase.o: createticket.h default.h download.h editticket.h emacs.h functionbase.o: last.h login.h logout.h ls.h mkdir.h mv.h node.h priv.h functionbase.o: reload.h rm.h run.h subject.h funthread.h ../core/thread.h -functionbase.o: funticket.h tinymce.h uname.h upload.h who.h +functionbase.o: funticket.h ../core/ticket.h tinymce.h uname.h upload.h +functionbase.o: uptime.h who.h functionparser.o: functionparser.h ../core/request.h ../core/requesttypes.h functionparser.o: ../core/session.h ../core/item.h ../core/error.h functionparser.o: ../core/log.h ../core/user.h ../core/plugindata.h -functionparser.o: ../core/rebus.h ../core/thread.h ../core/compress.h +functionparser.o: ../core/rebus.h ../core/compress.h functionparser.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h functionparser.o: ../core/htmlfilter.h ../core/postmultiparser.h -functionparser.o: ../core/config.h ../core/confparser.h ../core/ticket.h -functionparser.o: ../core/db.h ../core/group.h ../core/dircontainer.h -functionparser.o: ../core/ugcontainer.h ../core/system.h ../core/dirs.h -functionparser.o: ../core/db.h ../core/request.h ../core/mounts.h -functionparser.o: ../core/mount.h ../core/users.h ../core/lastcontainer.h -functionparser.o: ../core/groups.h ../core/loadavg.h ../core/log.h -functionparser.o: ../core/item.h ../core/error.h functions.h functionbase.h -functionparser.o: ../core/config.h ../core/notify.h +functionparser.o: ../core/config.h ../core/confparser.h ../core/db.h +functionparser.o: ../core/group.h ../core/thread.h ../core/dircontainer.h +functionparser.o: ../core/ugcontainer.h ../core/ticket.h ../core/system.h +functionparser.o: ../core/dirs.h ../core/db.h ../core/request.h +functionparser.o: ../core/mounts.h ../core/mount.h ../core/users.h +functionparser.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h +functionparser.o: ../core/log.h ../core/item.h ../core/error.h functions.h +functionparser.o: functionbase.h ../core/config.h ../core/notify.h functionparser.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h functionparser.o: ../core/mount.h ../core/locale.h ../templates/misc.h functionparser.o: ../templates/localefilter.h ../core/locale.h @@ -259,7 +261,7 @@ functionparser.o: chown.h ckeditor.h cp.h createthread.h createticket.h functionparser.o: default.h download.h editticket.h emacs.h last.h login.h functionparser.o: logout.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h functionparser.o: run.h subject.h funthread.h ../core/thread.h funticket.h -functionparser.o: tinymce.h uname.h upload.h who.h +functionparser.o: ../core/ticket.h tinymce.h uname.h upload.h uptime.h who.h functions.o: functions.h functionbase.h ../core/item.h ../core/db.h functions.o: ../core/item.h ../core/user.h ../core/group.h ../core/thread.h functions.o: ../core/error.h ../core/log.h ../core/dircontainer.h @@ -279,10 +281,10 @@ functions.o: functionparser.h adduser.h cat.h chmod.h privchanger.h chown.h functions.o: ckeditor.h cp.h createthread.h createticket.h default.h functions.o: download.h editticket.h emacs.h last.h login.h logout.h ls.h functions.o: mkdir.h mv.h node.h priv.h reload.h rm.h run.h subject.h -functions.o: funthread.h ../core/thread.h funticket.h tinymce.h uname.h -functions.o: upload.h who.h ../core/log.h ../core/misc.h -functions.o: ../templates/templates.h ../templates/patterncacher.h -functions.o: ../core/item.h ../templates/misc.h +functions.o: funthread.h ../core/thread.h funticket.h ../core/ticket.h +functions.o: tinymce.h uname.h upload.h uptime.h who.h ../core/log.h +functions.o: ../core/misc.h ../templates/templates.h +functions.o: ../templates/patterncacher.h ../core/item.h ../templates/misc.h functions.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h functions.o: ../core/log.h ../templates/indexpatterns.h functions.o: ../core/sessionmanager.h ../core/sessioncontainer.h @@ -317,6 +319,7 @@ funticket.o: ../core/groups.h ../core/loadavg.h ../core/notify.h funticket.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h funticket.o: ../core/mount.h ../core/locale.h ../templates/misc.h funticket.o: ../templates/localefilter.h ../core/locale.h ../core/system.h +funticket.o: ../core/ticket.h last.o: last.h functionbase.h ../core/item.h ../core/db.h ../core/item.h last.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h last.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h @@ -395,8 +398,8 @@ mkdir.o: ../core/system.h functions.h functionparser.h adduser.h cat.h mkdir.o: chmod.h privchanger.h chown.h ckeditor.h cp.h createthread.h mkdir.o: createticket.h default.h download.h editticket.h emacs.h last.h mkdir.o: login.h logout.h ls.h mv.h node.h priv.h reload.h rm.h run.h -mkdir.o: subject.h funthread.h ../core/thread.h funticket.h tinymce.h uname.h -mkdir.o: upload.h who.h +mkdir.o: subject.h funthread.h ../core/thread.h funticket.h ../core/ticket.h +mkdir.o: tinymce.h uname.h upload.h uptime.h who.h mv.o: mv.h functionbase.h ../core/item.h ../core/db.h ../core/item.h mv.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h mv.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h @@ -445,26 +448,26 @@ priv.o: ../core/system.h privchanger.h privchanger.o: privchanger.h ../core/request.h ../core/requesttypes.h privchanger.o: ../core/session.h ../core/item.h ../core/error.h ../core/log.h privchanger.o: ../core/user.h ../core/plugindata.h ../core/rebus.h -privchanger.o: ../core/thread.h ../core/compress.h -privchanger.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h -privchanger.o: ../core/htmlfilter.h ../core/postmultiparser.h -privchanger.o: ../core/config.h ../core/confparser.h ../core/ticket.h -privchanger.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h -privchanger.o: ../core/db.h ../core/request.h ../core/mounts.h -privchanger.o: ../core/mount.h ../core/users.h ../core/ugcontainer.h -privchanger.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h -privchanger.o: ../core/loadavg.h ../core/db.h +privchanger.o: ../core/compress.h ../core/acceptencodingparser.h +privchanger.o: ../core/acceptbaseparser.h ../core/htmlfilter.h +privchanger.o: ../core/postmultiparser.h ../core/config.h +privchanger.o: ../core/confparser.h ../core/system.h ../core/dirs.h +privchanger.o: ../core/dircontainer.h ../core/db.h ../core/request.h +privchanger.o: ../core/mounts.h ../core/mount.h ../core/users.h +privchanger.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h +privchanger.o: ../core/group.h ../core/loadavg.h ../core/db.h +privchanger.o: ../core/thread.h ../core/ticket.h readticket.o: readticket.h ../core/request.h ../core/requesttypes.h readticket.o: ../core/session.h ../core/item.h ../core/error.h ../core/log.h readticket.o: ../core/user.h ../core/plugindata.h ../core/rebus.h -readticket.o: ../core/thread.h ../core/compress.h -readticket.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h -readticket.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/config.h -readticket.o: ../core/confparser.h ../core/ticket.h ../core/ticket.h -readticket.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h -readticket.o: ../core/db.h ../core/request.h ../core/mounts.h ../core/mount.h -readticket.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h -readticket.o: ../core/groups.h ../core/group.h ../core/loadavg.h +readticket.o: ../core/compress.h ../core/acceptencodingparser.h +readticket.o: ../core/acceptbaseparser.h ../core/htmlfilter.h +readticket.o: ../core/postmultiparser.h ../core/config.h ../core/confparser.h +readticket.o: ../core/ticket.h ../core/system.h ../core/dirs.h +readticket.o: ../core/dircontainer.h ../core/db.h ../core/request.h +readticket.o: ../core/mounts.h ../core/mount.h ../core/users.h +readticket.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h +readticket.o: ../core/group.h ../core/loadavg.h reload.o: reload.h functionbase.h ../core/item.h ../core/db.h ../core/item.h reload.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h reload.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h @@ -504,11 +507,11 @@ rm.o: ../functions/functions.h functionparser.h adduser.h cat.h chmod.h rm.o: privchanger.h chown.h ckeditor.h cp.h createthread.h createticket.h rm.o: default.h download.h editticket.h emacs.h last.h login.h logout.h ls.h rm.o: mkdir.h mv.h node.h priv.h reload.h run.h subject.h funthread.h -rm.o: ../core/thread.h funticket.h tinymce.h uname.h upload.h who.h -rm.o: ../templates/templates.h ../templates/patterncacher.h ../core/item.h -rm.o: ../templates/misc.h ../templates/ckeditorgetparser.h -rm.o: ../core/httpsimpleparser.h ../core/log.h ../templates/indexpatterns.h -rm.o: ../core/sessionmanager.h +rm.o: ../core/thread.h funticket.h ../core/ticket.h tinymce.h uname.h +rm.o: upload.h uptime.h who.h ../templates/templates.h +rm.o: ../templates/patterncacher.h ../core/item.h ../templates/misc.h +rm.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h +rm.o: ../core/log.h ../templates/indexpatterns.h ../core/sessionmanager.h run.o: run.h functionbase.h ../core/item.h ../core/db.h ../core/item.h run.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h run.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h @@ -539,7 +542,7 @@ subject.o: ../core/notify.h ../templatesnotify/templatesnotify.h subject.o: ../../ezc/src/ezc.h ../core/mount.h ../core/locale.h subject.o: ../templates/misc.h ../templates/localefilter.h ../core/locale.h subject.o: ../core/system.h -tinymce.o: tinymce.h functions.h functionbase.h ../core/item.h ../core/db.h +tinymce.o: tinymce.h functionbase.h ../core/item.h ../core/db.h tinymce.o: ../core/item.h ../core/user.h ../core/group.h ../core/thread.h tinymce.o: ../core/error.h ../core/log.h ../core/dircontainer.h tinymce.o: ../core/ugcontainer.h ../core/ticket.h ../core/request.h @@ -553,12 +556,12 @@ tinymce.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h tinymce.o: ../core/notify.h ../templatesnotify/templatesnotify.h tinymce.o: ../../ezc/src/ezc.h ../core/mount.h ../core/locale.h tinymce.o: ../templates/misc.h ../templates/localefilter.h ../core/locale.h -tinymce.o: ../core/system.h functionparser.h adduser.h cat.h chmod.h -tinymce.o: privchanger.h chown.h ckeditor.h cp.h createthread.h +tinymce.o: ../core/system.h functions.h functionparser.h adduser.h cat.h +tinymce.o: chmod.h privchanger.h chown.h ckeditor.h cp.h createthread.h tinymce.o: createticket.h default.h download.h editticket.h emacs.h last.h tinymce.o: login.h logout.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h -tinymce.o: run.h subject.h funthread.h ../core/thread.h funticket.h uname.h -tinymce.o: upload.h who.h +tinymce.o: run.h subject.h funthread.h ../core/thread.h funticket.h +tinymce.o: ../core/ticket.h uname.h upload.h uptime.h who.h uname.o: uname.h functionbase.h ../core/item.h ../core/db.h ../core/item.h uname.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h uname.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h @@ -593,7 +596,23 @@ upload.o: functionparser.h adduser.h cat.h chmod.h privchanger.h chown.h upload.o: ckeditor.h cp.h createthread.h createticket.h default.h download.h upload.o: editticket.h emacs.h last.h login.h logout.h ls.h mkdir.h mv.h upload.o: node.h priv.h reload.h rm.h run.h subject.h funthread.h -upload.o: ../core/thread.h funticket.h tinymce.h uname.h who.h +upload.o: ../core/thread.h funticket.h ../core/ticket.h tinymce.h uname.h +upload.o: uptime.h who.h +uptime.o: uname.h functionbase.h ../core/item.h ../core/db.h ../core/item.h +uptime.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h +uptime.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h +uptime.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h +uptime.o: ../core/session.h ../core/plugindata.h ../core/rebus.h +uptime.o: ../core/compress.h ../core/acceptencodingparser.h +uptime.o: ../core/acceptbaseparser.h ../core/htmlfilter.h +uptime.o: ../core/postmultiparser.h ../core/config.h ../core/confparser.h +uptime.o: ../core/config.h ../core/system.h ../core/dirs.h ../core/db.h +uptime.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h +uptime.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h +uptime.o: ../core/notify.h ../templatesnotify/templatesnotify.h +uptime.o: ../../ezc/src/ezc.h ../core/mount.h ../core/locale.h +uptime.o: ../templates/misc.h ../templates/localefilter.h ../core/locale.h +uptime.o: ../core/system.h who.o: who.h functionbase.h ../core/item.h ../core/db.h ../core/item.h who.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h who.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h diff --git a/functions/Makefile.o.dep b/functions/Makefile.o.dep index cf6d58a..f5bf292 100755 --- a/functions/Makefile.o.dep +++ b/functions/Makefile.o.dep @@ -1 +1 @@ -o = adduser.o cat.o chmod.o chown.o ckeditor.o cp.o createthread.o createticket.o default.o download.o editticket.o emacs.o functionbase.o functionparser.o functions.o funthread.o funticket.o last.o login.o logout.o ls.o mkdir.o mv.o node.o priv.o privchanger.o readticket.o reload.o rm.o run.o subject.o tinymce.o uname.o upload.o who.o +o = adduser.o cat.o chmod.o chown.o ckeditor.o cp.o createthread.o createticket.o default.o download.o editticket.o emacs.o functionbase.o functionparser.o functions.o funthread.o funticket.o last.o login.o logout.o ls.o mkdir.o mv.o node.o priv.o privchanger.o readticket.o reload.o rm.o run.o subject.o tinymce.o uname.o upload.o uptime.o who.o diff --git a/functions/cp.cpp b/functions/cp.cpp index 8fd3b6c..312893b 100755 --- a/functions/cp.cpp +++ b/functions/cp.cpp @@ -162,10 +162,10 @@ void Cp::CpPrepare() void Cp::CpFilesInDir(const Item & dir, long dst_dir_id) { cp_iq.WhereParentId(dir.id); - db->GetItems(request->item_table, cp_iq); + db->GetItems(request->item_tab, cp_iq); - for(size_t i=0 ; iitem_table.size() ; ++i) - CpItem(request->item_table[i], dst_dir_id); + for(size_t i=0 ; iitem_tab.size() ; ++i) + CpItem(request->item_tab[i], dst_dir_id); } @@ -315,9 +315,9 @@ void Cp::MakePost() cp_remove_defaults = request->IsPostVar("removedefaults"); if( request->IsPostVar("onlycontent") ) - CpContentOfDirCheck(*request->dir_table.back()); + CpContentOfDirCheck(*request->dir_tab.back()); else - CpDirCheck(*request->dir_table.back()); + CpDirCheck(*request->dir_tab.back()); } } } diff --git a/functions/createthread.cpp b/functions/createthread.cpp index 90117e4..169d4d5 100755 --- a/functions/createthread.cpp +++ b/functions/createthread.cpp @@ -24,13 +24,13 @@ CreateThread::CreateThread() // returning true if we can create a thread in the current directory bool CreateThread::HasAccess() { - if( request->dir_table.empty() ) + if( request->dir_tab.empty() ) return false; if( request->is_item ) return false; - if( !system->HasWriteAccess(*request->dir_table.back()) ) + if( !system->HasWriteAccess(*request->dir_tab.back()) ) return false; if( !system->mounts.pmount || system->mounts.pmount->type != Mount::thread ) @@ -43,7 +43,7 @@ bool CreateThread::HasAccess() if( !system->mounts.pmount->IsPar(Mount::par_createthread_on) ) return true; - if( system->mounts.pmount->IsArg(Mount::par_createthread_on, request->dir_table.size()) ) + if( system->mounts.pmount->IsArg(Mount::par_createthread_on, request->dir_tab.size()) ) return true; return false; @@ -73,21 +73,21 @@ return true; -void CreateThread::ReadThread(Thread & thread) +void CreateThread::ReadThread() { - thread.parent_id = request->dir_table.back()->id; + thread.parent_id = request->dir_tab.back()->id; } void CreateThread::AddThread() { - request->thread.dir_id = request->dir_table.back()->id; - request->thread.closed = false; - request->thread.items = 1; - request->thread.last_item = request->item; // set by PostFunEmacsAdd() + thread.dir_id = request->dir_tab.back()->id; + thread.closed = false; + thread.items = 1; + thread.last_item = request->item; // set by PostFunEmacsAdd() - request->status = db->AddThread(request->thread); + request->status = db->AddThread(thread); } @@ -112,7 +112,7 @@ void CreateThread::MakePost() { functions->ReadItem(request->item, Item::dir); functions->SetUser(request->item); - ReadThread(request->thread); + ReadThread(); request->item.privileges = 0777; // !! tymczasowo 777 aby wszyscy mogli wysylac posty if( !FunCreateThreadCheckAbuse() ) @@ -128,7 +128,7 @@ void CreateThread::MakePost() functions->ReadItemContentWithType(request->item); request->item.type = Item::file; request->item.privileges = 0644; // !! tymczasowo - request->item.parent_id = request->dir_table.back()->id; + request->item.parent_id = request->dir_tab.back()->id; request->status = system->AddFile(request->item); if( request->status == WINIX_ERR_OK ) diff --git a/functions/createthread.h b/functions/createthread.h index 0634349..cbb0e67 100755 --- a/functions/createthread.h +++ b/functions/createthread.h @@ -28,8 +28,10 @@ public: private: + Thread thread; + bool FunCreateThreadCheckAbuse(); - void ReadThread(Thread & thread); + void ReadThread(); void AddThread(); void PostFunCreateThreadLogAndRedirect(); }; diff --git a/functions/createticket.cpp b/functions/createticket.cpp index 6a70f91..7016c4c 100755 --- a/functions/createticket.cpp +++ b/functions/createticket.cpp @@ -21,16 +21,21 @@ CreateTicket::CreateTicket() } +void CreateTicket::Clear() +{ + functions->fun_ticket.Clear(); +} + // returning true if we can create a ticket in the current directory bool CreateTicket::HasAccess() { - if( request->dir_table.empty() ) + if( request->dir_tab.empty() ) return false; if( request->is_item ) return false; - if( !system->HasWriteAccess(*request->dir_table.back()) ) + if( !system->HasWriteAccess(*request->dir_tab.back()) ) return false; if( !system->mounts.pmount || system->mounts.pmount->type != Mount::ticket ) @@ -46,7 +51,7 @@ bool CreateTicket::HasAccess() if( !system->mounts.pmount->IsPar(Mount::par_createticket_on) ) return true; - if( system->mounts.pmount->IsArg(Mount::par_createticket_on, request->dir_table.size()) ) + if( system->mounts.pmount->IsArg(Mount::par_createticket_on, request->dir_tab.size()) ) return true; return false; @@ -81,10 +86,10 @@ void CreateTicket::AddTicket() { static std::string temp; - request->ticket.dir_id = request->dir_table.back()->id; // a new directory created by Mkdir() - request->ticket.item_id = request->item.id; // this id is set by PostFunEmacsAdd() + functions->fun_ticket.ticket.dir_id = request->dir_tab.back()->id; // a new directory created by Mkdir() + functions->fun_ticket.ticket.item_id = request->item.id; // this id is set by PostFunEmacsAdd() - request->status = db->AddTicket(request->ticket); + request->status = db->AddTicket(functions->fun_ticket.ticket); } @@ -110,7 +115,7 @@ void CreateTicket::MakePost() functions->SetUser(request->item); ReadTicket read_ticket; - read_ticket.Read(system, request, &request->ticket); + read_ticket.Read(system, request, &functions->fun_ticket.ticket); request->item.privileges = 0777; // !! tymczasowo 777 aby wszyscy mogli wysylac posty @@ -127,7 +132,7 @@ void CreateTicket::MakePost() functions->ReadItemContentWithType(request->item); request->item.type = Item::file; request->item.privileges = 0644; // !! tymczasowo - request->item.parent_id = request->dir_table.back()->id; + request->item.parent_id = request->dir_tab.back()->id; request->status = system->AddFile(request->item); diff --git a/functions/createticket.h b/functions/createticket.h index 0e30eaf..e37e28f 100755 --- a/functions/createticket.h +++ b/functions/createticket.h @@ -23,6 +23,7 @@ class CreateTicket : public FunctionBase public: CreateTicket(); + void Clear(); bool HasAccess(); void MakePost(); diff --git a/functions/default.cpp b/functions/default.cpp index 91c4dfd..29480ca 100755 --- a/functions/default.cpp +++ b/functions/default.cpp @@ -70,7 +70,7 @@ return defaultid; void Default::MakePost() { - if( !system->HasWriteAccess(*request->dir_table.back()) ) + if( !system->HasWriteAccess(*request->dir_tab.back()) ) { request->status = WINIX_ERR_PERMISSION_DENIED; return; @@ -80,10 +80,10 @@ void Default::MakePost() try { long defaultid = PostFunDefaultParsePath(); - request->status = db->EditDefaultItem(request->dir_table.back()->id, defaultid); + request->status = db->EditDefaultItem(request->dir_tab.back()->id, defaultid); if( request->status == WINIX_ERR_OK ) - request->dir_table.back()->default_item = defaultid; + request->dir_tab.back()->default_item = defaultid; } catch(const Error & e) { @@ -92,7 +92,7 @@ void Default::MakePost() if( request->status == WINIX_ERR_OK ) - system->RedirectTo(*request->dir_table.back()); + system->RedirectTo(*request->dir_tab.back()); else log << log1 << "Content: PostFunDefaultItem: Error: " << request->status << logend; } @@ -102,7 +102,7 @@ void Default::MakePost() void Default::MakeGet() { - if( !system->HasWriteAccess(*request->dir_table.back()) ) + if( !system->HasWriteAccess(*request->dir_tab.back()) ) { request->status = WINIX_ERR_PERMISSION_DENIED; return; diff --git a/functions/editticket.cpp b/functions/editticket.cpp index 470ec99..430f21e 100755 --- a/functions/editticket.cpp +++ b/functions/editticket.cpp @@ -23,6 +23,11 @@ EditTicket::EditTicket() } +void EditTicket::Clear() +{ + functions->fun_ticket.Clear(); +} + bool EditTicket::HasAccess() { @@ -30,13 +35,15 @@ bool EditTicket::HasAccess() if( !request->session->puser ) return false; - if( request->dir_table.empty() ) + if( request->dir_tab.empty() ) return false; - if( request->is_item || !request->is_ticket ) + functions->fun_ticket.ReadTicket(); + + if( request->is_item || !functions->fun_ticket.is_ticket ) return false; - if( !system->HasWriteAccess(*request->dir_table.back()) ) + if( !system->HasWriteAccess(*request->dir_tab.back()) ) return false; if( !system->mounts.pmount || system->mounts.pmount->type != Mount::ticket ) @@ -55,13 +62,13 @@ void EditTicket::EditTicketCheckFirstItem() return; - if( request->ticket.item_id == -1 ) + if( functions->fun_ticket.ticket.item_id == -1 ) { // creating a new item (the item was deleted by a user) Item item; - item.parent_id = request->dir_table.back()->id; - item.subject = request->dir_table.back()->subject; + item.parent_id = request->dir_tab.back()->id; + item.subject = request->dir_tab.back()->subject; item.type = Item::file; item.privileges = 0644; // !! tymczasowo functions->SetUser(item); @@ -72,7 +79,7 @@ void EditTicket::EditTicketCheckFirstItem() if( request->status == WINIX_ERR_OK ) { log << log2 << "Content: added the first item with content for the ticket, item.id: " << item.id << logend; - request->ticket.item_id = item.id; + functions->fun_ticket.ticket.item_id = item.id; } } } @@ -88,14 +95,14 @@ void EditTicket::EditTicketModTicket() ReadTicket read_ticket; read_ticket.Read(system, request, &ticket); - request->ticket.type = ticket.type; - request->ticket.status = ticket.status; - request->ticket.priority = ticket.priority; - request->ticket.category = ticket.category; - request->ticket.expected = ticket.expected; - request->ticket.progress = ticket.progress; + functions->fun_ticket.ticket.type = ticket.type; + functions->fun_ticket.ticket.status = ticket.status; + functions->fun_ticket.ticket.priority = ticket.priority; + functions->fun_ticket.ticket.category = ticket.category; + functions->fun_ticket.ticket.expected = ticket.expected; + functions->fun_ticket.ticket.progress = ticket.progress; - request->status = db->EditTicketById(request->ticket); + request->status = db->EditTicketById(functions->fun_ticket.ticket); } @@ -107,7 +114,7 @@ void EditTicket::EditTicketModDir() // we don't modify the url - Item & dir = *request->dir_table.back(); + Item & dir = *request->dir_tab.back(); bool edit_dir_subject = (dir.subject != request->item.subject); if( edit_dir_subject ) @@ -127,7 +134,7 @@ void EditTicket::EditTicketModFirstItem() functions->ReadItemContentWithType(request->item); Item item; - db->GetItemById(request->ticket.item_id, item); + db->GetItemById(functions->fun_ticket.ticket.item_id, item); item.subject = request->item.subject; item.content = request->item.content; item.content_type = request->item.content_type; @@ -186,7 +193,7 @@ void EditTicket::MakePost() return; } - if( db->GetTicketByDirId(request->dir_table.back()->id, request->ticket) != WINIX_ERR_OK ) + if( db->GetTicketByDirId(request->dir_tab.back()->id, functions->fun_ticket.ticket) != WINIX_ERR_OK ) { request->status = WINIX_ERR_PERMISSION_DENIED; return; @@ -203,10 +210,10 @@ void EditTicket::MakePost() void EditTicket::MakeGet() { - db->GetItemById(request->ticket.item_id, request->item); + db->GetItemById(functions->fun_ticket.ticket.item_id, request->item); // the subject we get from the last directory - request->item.subject = request->dir_table.back()->subject; + request->item.subject = request->dir_tab.back()->subject; } diff --git a/functions/editticket.h b/functions/editticket.h index e3da110..1e81993 100755 --- a/functions/editticket.h +++ b/functions/editticket.h @@ -23,6 +23,7 @@ class EditTicket : public FunctionBase public: EditTicket(); + void Clear(); bool HasAccess(); void MakePost(); void MakeGet(); diff --git a/functions/emacs.cpp b/functions/emacs.cpp index 6d1c4c1..84f9850 100755 --- a/functions/emacs.cpp +++ b/functions/emacs.cpp @@ -36,7 +36,7 @@ bool Emacs::HasAccess(const Item & item) if( !system->mounts.pmount->IsPar(Mount::par_emacs_on) ) return true; - if( system->mounts.pmount->IsArg(Mount::par_emacs_on, request->dir_table.size()) ) + if( system->mounts.pmount->IsArg(Mount::par_emacs_on, request->dir_tab.size()) ) return true; return false; @@ -47,7 +47,7 @@ return false; bool Emacs::HasAccess() { if( !request->is_item ) - return HasAccess(*request->dir_table.back()); // adding a new item + return HasAccess(*request->dir_tab.back()); // adding a new item else return HasAccess(request->item); // editing an existing item @@ -86,7 +86,7 @@ void Emacs::PostFunEmacsModifyMountPoint(bool adding) if( system->mounts.pmount->type == Mount::thread ) { if( adding ) - db->EditThreadAddItem(request->dir_table.back()->id, request->item.id); + db->EditThreadAddItem(request->dir_tab.back()->id, request->item.id); system->RedirectToLastDir(); } diff --git a/functions/functionbase.cpp b/functions/functionbase.cpp index 2c4de5f..fcd2943 100755 --- a/functions/functionbase.cpp +++ b/functions/functionbase.cpp @@ -72,6 +72,13 @@ bool FunctionBase::HasAccess() } +void FunctionBase::Clear() +{ + // this method is called at the end of a request + // you can clear your variables +} + + void FunctionBase::MakePost() { // do nothing by default diff --git a/functions/functionbase.h b/functions/functionbase.h index 2c89e83..642747a 100755 --- a/functions/functionbase.h +++ b/functions/functionbase.h @@ -36,6 +36,7 @@ public: Item fun; virtual bool HasAccess(); + virtual void Clear(); virtual void MakePost(); virtual void MakeGet(); diff --git a/functions/functionparser.cpp b/functions/functionparser.cpp index 030a239..74e287a 100755 --- a/functions/functionparser.cpp +++ b/functions/functionparser.cpp @@ -17,7 +17,7 @@ void FunctionParser::SkipEmptyString(const char * msg) { - for( ; get_index != get_table_len && request->get_table[get_index].empty() ; ++get_index ) + for( ; get_index != get_tab_len && request->get_tab[get_index].empty() ; ++get_index ) log << log3 << msg << logend; } @@ -38,7 +38,7 @@ void FunctionParser::ParseDirectories() while( true ) { - request->dir_table.push_back( pdir ); + request->dir_tab.push_back( pdir ); log << log3 << "FP: Directory: "; if( pdir->parent_id == -1 ) @@ -48,10 +48,10 @@ void FunctionParser::ParseDirectories() SkipEmptyString("FP: Directory: skipped empty string"); - if( get_index == get_table_len ) + if( get_index == get_tab_len ) break; - pdir = system->dirs.GetDir(request->get_table[get_index], pdir->id); + pdir = system->dirs.GetDir(request->get_tab[get_index], pdir->id); if( !pdir ) break; @@ -66,12 +66,12 @@ void FunctionParser::ParseItem() { SkipEmptyString("FP: Item: skipped empty string"); - if( get_index == get_table_len ) + if( get_index == get_tab_len ) return; - // request->dir_table has at least one element - long parent_id = request->dir_table.back()->id; - const std::string & url = request->get_table[get_index]; + // request->dir_tab has at least one element + long parent_id = request->dir_tab.back()->id; + const std::string & url = request->get_tab[get_index]; request->status = db->GetItem(parent_id, url, request->item); @@ -100,16 +100,16 @@ void FunctionParser::ParseFunction() { SkipEmptyString("FP: Function: skipped empty string"); - if( get_index == get_table_len ) + if( get_index == get_tab_len ) return; - request->pfunction = functions->Find(request->get_table[get_index]); + request->function = functions->Find(request->get_tab[get_index]); - if( request->pfunction ) + if( request->function ) { ++get_index; - log << log3 << "FP: Function: " << request->pfunction->fun.url << logend; + log << log3 << "FP: Function: " << request->function->fun.url << logend; } } @@ -140,7 +140,7 @@ size_t i; param.value = par.substr(i+1); } - request->param_table.push_back(param); + request->param_tab.push_back(param); log << log3 << "FP: Param: name=" << param.name; @@ -158,10 +158,10 @@ void FunctionParser::ParseParams() { SkipEmptyString("FP: Params: skipped empty string"); - if( get_index == get_table_len ) + if( get_index == get_tab_len ) break; - ParseParams(request->get_table[get_index]); + ParseParams(request->get_tab[get_index]); } } @@ -177,8 +177,8 @@ void FunctionParser::Parse(Request * prequest, Db * pdb, Functions * pfunctions, request->status = WINIX_ERR_OK; get_index = 0; - get_table_len = request->get_table.size(); - request->pfunction = 0; + get_tab_len = request->get_tab.size(); + request->function = 0; request->is_item = false; ParseDirectories(); @@ -188,7 +188,7 @@ void FunctionParser::Parse(Request * prequest, Db * pdb, Functions * pfunctions, ParseFunction(); - if( !request->pfunction ) + if( !request->function ) { ParseItem(); @@ -197,10 +197,10 @@ void FunctionParser::Parse(Request * prequest, Db * pdb, Functions * pfunctions, ParseFunction(); - if( !request->pfunction && get_index != get_table_len ) + if( !request->function && get_index != get_tab_len ) { request->status = WINIX_ERR_NO_FUNCTION; - log << log3 << "FP: Parse: unknown function: \"" << request->get_table[get_index] << "\"" << logend; + log << log3 << "FP: Parse: unknown function: \"" << request->get_tab[get_index] << "\"" << logend; return; } } diff --git a/functions/functionparser.h b/functions/functionparser.h index a7a4420..e25fdac 100755 --- a/functions/functionparser.h +++ b/functions/functionparser.h @@ -26,8 +26,8 @@ class FunctionParser Functions * functions; System * system; - GetTable::size_type get_index; - GetTable::size_type get_table_len; + GetTab::size_type get_index; + GetTab::size_type get_tab_len; void SkipEmptyString(const char * msg); diff --git a/functions/functions.cpp b/functions/functions.cpp index 476c9c0..3d33696 100755 --- a/functions/functions.cpp +++ b/functions/functions.cpp @@ -124,6 +124,7 @@ void Functions::Create() Add(fun_tinymce); Add(fun_uname); Add(fun_upload); + Add(fun_uptime); Add(fun_who); } @@ -138,14 +139,14 @@ void Functions::Parse() void Functions::SetDefaultFunctionForFile() { if( request->item.auth != Item::auth_none ) - request->pfunction = &fun_download; + request->function = &fun_download; else if( system->HasReadExecAccess(request->item) ) - request->pfunction = &fun_run; + request->function = &fun_run; else - request->pfunction = &fun_cat; + request->function = &fun_cat; - log << log3 << "Content: default function: " << request->pfunction->fun.url << logend; + log << log3 << "Content: default function: " << request->function->fun.url << logend; } @@ -153,7 +154,7 @@ void Functions::SetDefaultFunctionForFile() void Functions::SetDefaultFunctionForDir() { - long default_item = request->dir_table.back()->default_item; + long default_item = request->dir_tab.back()->default_item; if( default_item != -1 ) { @@ -165,20 +166,20 @@ void Functions::SetDefaultFunctionForDir() if( system->mounts.pmount->type == Mount::thread ) { - request->pfunction = &fun_thread; - log << log3 << "Content: default function: " << request->pfunction->fun.url << logend; + request->function = &fun_thread; + log << log3 << "Content: default function: " << request->function->fun.url << logend; } else if( system->mounts.pmount->type == Mount::ticket ) { - request->pfunction = &fun_ticket; - log << log3 << "Content: default function: " << request->pfunction->fun.url << logend; + request->function = &fun_ticket; + log << log3 << "Content: default function: " << request->function->fun.url << logend; } else { // cms - request->pfunction = &fun_ls; - log << log3 << "Content: default function: " << request->pfunction->fun.url << logend; + request->function = &fun_ls; + log << log3 << "Content: default function: " << request->function->fun.url << logend; } } @@ -205,7 +206,7 @@ void Functions::MakeGet() // in authorizer mode only cat function is available // (and must be default) - if( request->pfunction ) + if( request->function ) { request->status = WINIX_ERR_NO_ITEM; log << log1 << "Content: in authorizer mode only 'cat' funtion is available and must " @@ -213,30 +214,30 @@ void Functions::MakeGet() return; } - request->pfunction = &fun_cat; + request->function = &fun_cat; } - if( !request->pfunction ) + if( !request->function ) SetDefaultFunction(); if( !request->redirect_to.empty() ) return; - if( !request->pfunction ) + if( !request->function ) { request->status = WINIX_ERR_NO_FUNCTION; log << log1 << "Functions: no function (neither cat nor ls)" << logend; return; } - if( !request->pfunction->HasAccess() ) + if( !request->function->HasAccess() ) { request->status = WINIX_ERR_PERMISSION_DENIED; return; } - request->pfunction->MakeGet(); + request->function->MakeGet(); } @@ -249,23 +250,23 @@ void Functions::MakePost() return; } - if( !request->pfunction ) + if( !request->function ) SetDefaultFunction(); - if( !request->pfunction ) + if( !request->function ) { request->status = WINIX_ERR_NO_FUNCTION; log << log1 << "Functions: MakePost: no function" << logend; return; } - if( !request->pfunction->HasAccess() ) + if( !request->function->HasAccess() ) { request->status = WINIX_ERR_PERMISSION_DENIED; return; } - request->pfunction->MakePost(); + request->function->MakePost(); } @@ -321,9 +322,9 @@ bool Functions::ReadItemUrlSubject(Item & item, Item::Type item_type) if( item.subject.empty() ) { - item.subject = request->dir_table.back()->subject; + item.subject = request->dir_tab.back()->subject; item.subject += "_msg_"; - item.subject += ToStr(db->Size(request->dir_table.back()->id, Item::file)); + item.subject += ToStr(db->Size(request->dir_tab.back()->id, Item::file)); } // if item.url is empty then it will be set from item.subject @@ -387,7 +388,7 @@ bool Functions::ReadItem(Item & item, Item::Type item_type) return false; item.type = item_type; - item.parent_id = request->dir_table.back()->id; // !! moze to dac jako parametr? + item.parent_id = request->dir_tab.back()->id; // !! moze to dac jako parametr? bool edit_with_url = ReadItemUrlSubject(item, item_type); @@ -411,5 +412,5 @@ void Functions::SetUser(Item & item) request->PostVar("guestname", item.guest_name); } - item.group_id = request->dir_table.back()->group_id; + item.group_id = request->dir_tab.back()->group_id; } diff --git a/functions/functions.h b/functions/functions.h index 5b17e68..1196920 100755 --- a/functions/functions.h +++ b/functions/functions.h @@ -42,6 +42,7 @@ #include "tinymce.h" #include "uname.h" #include "upload.h" +#include "uptime.h" #include "who.h" @@ -82,6 +83,7 @@ public: Fun::Tinymce fun_tinymce; Fun::Uname fun_uname; Fun::Upload fun_upload; + Fun::Uptime fun_uptime; Fun::Who fun_who; diff --git a/functions/funthread.cpp b/functions/funthread.cpp index cdf55f5..cd198f9 100755 --- a/functions/funthread.cpp +++ b/functions/funthread.cpp @@ -18,6 +18,22 @@ namespace Fun FunThread::FunThread() { fun.url = "thread"; + Clear(); +} + + + +bool FunThread::HasAccess() +{ + return !request->is_item; +} + + +void FunThread::Clear() +{ + is_thread = false; + thread.Clear(); + thread_tab.clear(); } @@ -25,12 +41,12 @@ void FunThread::CreateSortIndexByDate() { size_t i; - for(i = 0; i < request->thread_tab.size() ; ++i) + for(i = 0; i < thread_tab.size() ; ++i) { - Item * pdir = system->dirs.GetDir(request->thread_tab[i].dir_id); + Item * pdir = system->dirs.GetDir(thread_tab[i].dir_id); if( pdir ) - request->thread_tab[i].sort = (long)mktime(&pdir->date_creation); + thread_tab[i].sort = (long)mktime(&pdir->date_creation); } } @@ -44,29 +60,24 @@ bool FunThread::FunThreadSort(const Thread & t1, const Thread & t2) void FunThread::MakeGet() { - // !! dac do hasaccess() - if( request->is_item ) - { - request->status = WINIX_ERR_PERMISSION_DENIED; - return; - } + is_thread = (db->GetThreadByDirId(request->dir_tab.back()->id, thread) == WINIX_ERR_OK); Db::ItemQuery iq; if( system->mounts.pmount->IsArg(Mount::par_thread, "sort_desc") ) iq.sort_asc = false; - iq.WhereParentId(request->dir_table.back()->id); + iq.WhereParentId(request->dir_tab.back()->id); iq.WhereType(Item::file); iq.WhereAuth(Item::auth_none); - db->GetItems(request->item_table, iq); - db->GetThreads(request->dir_table.back()->id, request->thread_tab); + db->GetItems(request->item_tab, iq); + db->GetThreads(request->dir_tab.back()->id, thread_tab); - system->CheckAccessToItems(request->item_table); + system->CheckAccessToItems(request->item_tab); CreateSortIndexByDate(); - std::sort(request->thread_tab.begin(), request->thread_tab.end(), FunThreadSort); + std::sort(thread_tab.begin(), thread_tab.end(), FunThreadSort); } diff --git a/functions/funthread.h b/functions/funthread.h index daf1e75..5699e2d 100755 --- a/functions/funthread.h +++ b/functions/funthread.h @@ -23,8 +23,15 @@ class FunThread : public FunctionBase public: FunThread(); + bool HasAccess(); + void Clear(); void MakeGet(); + // current thread (if exists) + bool is_thread; + Thread thread; + std::vector thread_tab; + private: static bool FunThreadSort(const Thread & t1, const Thread & t2); diff --git a/functions/funticket.cpp b/functions/funticket.cpp index 41c1a74..49f985c 100755 --- a/functions/funticket.cpp +++ b/functions/funticket.cpp @@ -16,26 +16,55 @@ namespace Fun FunTicket::FunTicket() { fun.url = "ticket"; + Clear(); +} + + +bool FunTicket::HasAccess() +{ + if( request->is_item || system->mounts.pmount->type != Mount::ticket ) + return false; + +return true; +} + + +void FunTicket::Clear() +{ + item.Clear(); + is_ticket = false; + ticket.Clear(); + ticket_tab.clear(); +} + + +void FunTicket::ReadTicket() +{ + if( db->GetTicketByDirId(request->dir_tab.back()->id, ticket) == WINIX_ERR_OK ) + { + is_ticket = true; + db->GetItemById(ticket.item_id, item); + } } void FunTicket::TicketDeleteFirst() { - if( !request->is_ticket ) + if( !is_ticket ) return; - for(size_t i=0 ; iitem_table.size() ; ++i) + for(size_t i=0 ; iitem_tab.size() ; ++i) { - if( request->item_table[i].id == request->ticket.item_id ) + if( request->item_tab[i].id == ticket.item_id ) { // this is the first item with the content for the ticket - if( !system->HasReadAccess(request->item_table[i]) ) + if( !system->HasReadAccess(request->item_tab[i]) ) { request->status = WINIX_ERR_PERMISSION_DENIED; } - request->item_table.erase(request->item_table.begin() + i); + request->item_tab.erase(request->item_tab.begin() + i); break; } } @@ -45,23 +74,19 @@ void FunTicket::TicketDeleteFirst() void FunTicket::MakeGet() { - if( request->is_item || system->mounts.pmount->type != Mount::ticket ) - { - request->status = WINIX_ERR_PERMISSION_DENIED; - return; - } + ReadTicket(); Db::ItemQuery iq; - iq.WhereParentId(request->dir_table.back()->id); + iq.WhereParentId(request->dir_tab.back()->id); iq.WhereType(Item::file); iq.WhereAuth(Item::auth_none); - db->GetItems(request->item_table, iq); - db->GetTickets(request->dir_table.back()->id, request->ticket_tab); + db->GetItems(request->item_tab, iq); + db->GetTickets(request->dir_tab.back()->id, ticket_tab); TicketDeleteFirst(); - system->CheckAccessToItems(request->item_table); + system->CheckAccessToItems(request->item_tab); } diff --git a/functions/funticket.h b/functions/funticket.h index 2d1eadd..b0358fe 100755 --- a/functions/funticket.h +++ b/functions/funticket.h @@ -11,7 +11,8 @@ #define headerfilecmslucontentticket #include "functionbase.h" - +#include "core/ticket.h" +#include "core/item.h" namespace Fun @@ -23,7 +24,16 @@ class FunTicket : public FunctionBase public: FunTicket(); + bool HasAccess(); + void Clear(); void MakeGet(); + void ReadTicket(); + + // those object are used by editticket and createticket winix functions too + Item item; + bool is_ticket; + Ticket ticket; + std::vector ticket_tab; private: diff --git a/functions/ls.cpp b/functions/ls.cpp index b7078e5..9afbaaa 100755 --- a/functions/ls.cpp +++ b/functions/ls.cpp @@ -29,17 +29,17 @@ void Ls::MakeGet() iq.sel_content = false; - iq.WhereParentId(request->dir_table.back()->id); + iq.WhereParentId(request->dir_tab.back()->id); iq.WhereType(Item::file); if( request->IsParam("ckeditor_browse") ) { iq.WhereAuth(Item::auth_image); - db->GetItems(request->item_table, iq); + db->GetItems(request->item_tab, iq); } else { - db->GetItems(request->item_table, iq); + db->GetItems(request->item_tab, iq); } } } diff --git a/functions/mkdir.cpp b/functions/mkdir.cpp index 89deb71..98b3105 100755 --- a/functions/mkdir.cpp +++ b/functions/mkdir.cpp @@ -41,7 +41,7 @@ bool Mkdir::HasAccess(const Item & item) if( !system->mounts.pmount->IsPar(Mount::par_mkdir_on) ) return true; - if( system->mounts.pmount->IsArg(Mount::par_mkdir_on, request->dir_table.size()) ) + if( system->mounts.pmount->IsArg(Mount::par_mkdir_on, request->dir_tab.size()) ) return true; return false; @@ -50,7 +50,7 @@ return false; bool Mkdir::HasAccess() { - if( request->is_item || !HasAccess(*request->dir_table.back()) ) + if( request->is_item || !HasAccess(*request->dir_tab.back()) ) return false; return true; @@ -59,13 +59,13 @@ return true; -void Mkdir::PostFunMkdir(bool add_to_dir_table, int privileges) +void Mkdir::PostFunMkdir(bool add_to_dir_tab, int privileges) { functions->ReadItem(request->item, Item::dir); functions->SetUser(request->item); request->item.privileges = privileges; - request->status = system->dirs.AddDirectory(request->item, add_to_dir_table); + request->status = system->dirs.AddDirectory(request->item, add_to_dir_tab); if( request->status == WINIX_ERR_OK ) { diff --git a/functions/mkdir.h b/functions/mkdir.h index d5f2f4b..d4d90ec 100755 --- a/functions/mkdir.h +++ b/functions/mkdir.h @@ -30,7 +30,7 @@ private: bool HasAccess(const Item & item); // !! moze to powinien byc skladnik modelu? bool FunMkdirCheckAccess(); - void PostFunMkdir(bool add_to_dir_table, int privileges); + void PostFunMkdir(bool add_to_dir_tab, int privileges); }; diff --git a/functions/mv.cpp b/functions/mv.cpp index 86dcaa4..3493e30 100755 --- a/functions/mv.cpp +++ b/functions/mv.cpp @@ -27,10 +27,10 @@ bool Mv::MoveCheckAccessFromToDir() Item * last; Item * last_but_one = 0; - last = request->dir_table[request->dir_table.size()-1]; + last = request->dir_tab[request->dir_tab.size()-1]; - if( request->dir_table.size() >= 2 ) - last_but_one = request->dir_table[request->dir_table.size()-2]; + if( request->dir_tab.size() >= 2 ) + last_but_one = request->dir_tab[request->dir_tab.size()-2]; if( request->method != Request::post ) { @@ -64,7 +64,7 @@ bool Mv::MoveCheckAccessFrom() { // moving a file - if( !system->HasWriteAccess(*request->dir_table.back()) ) + if( !system->HasWriteAccess(*request->dir_tab.back()) ) { request->status = WINIX_ERR_PERMISSION_DENIED; return false; @@ -237,16 +237,16 @@ Db::ItemQuery iq; iq.sel_type = true; iq.sel_url = true; iq.sel_auth = true; - iq.WhereParentId(request->dir_table.back()->id); + iq.WhereParentId(request->dir_tab.back()->id); - db->GetItems(request->item_table, iq); + db->GetItems(request->item_tab, iq); - for(size_t i=0 ; iitem_table.size() ; ++i) + for(size_t i=0 ; iitem_tab.size() ; ++i) { - if( request->item_table[i].type == Item::dir ) - MoveDir(request->item_table[i], false); + if( request->item_tab[i].type == Item::dir ) + MoveDir(request->item_tab[i], false); else - MoveFile(request->item_table[i], false); + MoveFile(request->item_tab[i], false); } system->RedirectToLastDir(); @@ -355,7 +355,7 @@ void Mv::MakePost() } else { - MoveDir(*request->dir_table.back()); + MoveDir(*request->dir_tab.back()); } } } diff --git a/functions/node.cpp b/functions/node.cpp index 99d7174..b54d022 100755 --- a/functions/node.cpp +++ b/functions/node.cpp @@ -21,14 +21,14 @@ Node::Node() void Node::MakeGet() { - if( request->param_table.empty() ) + if( request->param_tab.empty() ) { //request->status = Error //!!zglosic 404 return; } - long id = atol( request->param_table[0].name.c_str() ); + long id = atol( request->param_tab[0].name.c_str() ); system->RedirectTo(id); } diff --git a/functions/privchanger.cpp b/functions/privchanger.cpp index e93a0e0..9cdd147 100755 --- a/functions/privchanger.cpp +++ b/functions/privchanger.cpp @@ -174,12 +174,12 @@ void PrivChanger::PrivFilesInDir(long parent_id) iq.WhereParentId(parent_id); iq.WhereType(Item::file); - db->GetItems(request->item_table, iq); + db->GetItems(request->item_tab, iq); - std::vector::iterator i = request->item_table.begin(); + std::vector::iterator i = request->item_tab.begin(); - for( ; i != request->item_table.end() ; ++i) + for( ; i != request->item_tab.end() ; ++i) { PrivLog("changed file: ", -1, i->url); ChangePriv(*i, user_id_file, group_id_file, priv_file); @@ -253,16 +253,16 @@ void PrivChanger::PrivDir() if( request->IsPostVar("changecurrentdir") ) { - Item & last_dir = *request->dir_table.back(); + Item & last_dir = *request->dir_tab.back(); PrivLog("changed dir: ", last_dir.id, last_dir.url); - ChangePriv(*request->dir_table.back(), user_id_dir, group_id_dir, priv_dir); + ChangePriv(*request->dir_tab.back(), user_id_dir, group_id_dir, priv_dir); } subdirectories = request->IsPostVar("changesubdirs"); // go through all directories - PrivDir(request->dir_table.back()->id); + PrivDir(request->dir_tab.back()->id); system->RedirectToLastDir(); } @@ -284,7 +284,7 @@ void PrivChanger::PrivOneItem() } else { - ChangePriv(*request->dir_table.back(), user_id_file, group_id_file, priv_file); + ChangePriv(*request->dir_tab.back(), user_id_file, group_id_file, priv_file); system->RedirectToLastDir(); } } diff --git a/functions/readticket.cpp b/functions/readticket.cpp index e4bc2ce..11e28e1 100755 --- a/functions/readticket.cpp +++ b/functions/readticket.cpp @@ -108,7 +108,7 @@ void ReadTicket::Read(System * psystem, Request * prequest, Ticket * pticket) request = prequest; ticket = pticket; - ticket->parent_id = request->dir_table.back()->id; + ticket->parent_id = request->dir_tab.back()->id; ReadTicketType(); ReadTicketStatus(); diff --git a/functions/rm.cpp b/functions/rm.cpp index 278d044..5675ebb 100755 --- a/functions/rm.cpp +++ b/functions/rm.cpp @@ -62,7 +62,7 @@ return true; bool Rm::HasAccess() { if( !request->is_item ) - return HasAccess(*request->dir_table.back()); + return HasAccess(*request->dir_tab.back()); else return HasAccess(request->item); @@ -100,10 +100,10 @@ void Rm::RemoveAllDirs(long dir_id) plugin.Call(WINIX_DIR_PREPARE_TO_REMOVE, dir_id); rm_auth_iq.WhereParentId(dir_id); - db->GetItems(request->item_table, rm_auth_iq); + db->GetItems(request->item_tab, rm_auth_iq); - for(size_t i=0 ; iitem_table.size() ; ++i) - RemoveAuth(request->item_table[i]); + for(size_t i=0 ; iitem_tab.size() ; ++i) + RemoveAuth(request->item_tab[i]); if( db->DelDirById(dir_id) == WINIX_ERR_OK ) { @@ -123,21 +123,21 @@ void Rm::RemoveAllDirs() RemoveAuthPrepareQuery(); // this method deletes recursively all directories - RemoveAllDirs(request->dir_table.back()->id); - request->dir_table.erase(--request->dir_table.end()); + RemoveAllDirs(request->dir_tab.back()->id); + request->dir_tab.erase(--request->dir_tab.end()); - if( request->dir_table.empty() ) + if( request->dir_tab.empty() ) { // we have deleted the root directory system->dirs.CheckRootDir(); // adding a new root dir Item * proot = system->dirs.GetRootDir(); if( proot ) - request->dir_table.push_back(proot); + request->dir_tab.push_back(proot); else // there is no a root dir // CheckRootDir() didn't add the root dir (probably problem with the database) - // make sure that ::Make() will check that the dir_table is empty and returns + // make sure that ::Make() will check that the dir_tab is empty and returns return; } @@ -147,7 +147,7 @@ void Rm::RemoveAllDirs() void Rm::RemoveDir() { - if( request->param_table.empty() ) + if( request->param_tab.empty() ) request->status = WINIX_ERR_PERMISSION_DENIED; // use parameter "r" for removing a directory else if( request->IsParam("r") ) @@ -189,9 +189,9 @@ void Rm::RemoveAuth(Item & item) void Rm::RemoveFile() { - // for safety we check if param_table is empty + // for safety we check if param_tab is empty // a user can use "confirm" but can make a mistake when typing - if( !request->param_table.empty() ) + if( !request->param_tab.empty() ) { request->status = WINIX_ERR_UNKNOWN_PARAM; return; diff --git a/functions/subject.cpp b/functions/subject.cpp index fa95c30..553728b 100755 --- a/functions/subject.cpp +++ b/functions/subject.cpp @@ -31,7 +31,7 @@ bool Subject::SubjectCheckAccess() if( request->is_item ) access = system->HasWriteAccess(request->item); else - access = system->HasWriteAccess(*request->dir_table.back()); + access = system->HasWriteAccess(*request->dir_tab.back()); if( !access ) request->status = WINIX_ERR_PERMISSION_DENIED; @@ -43,7 +43,7 @@ return access; void Subject::EditDirSubject() { - Item & dir = *request->dir_table.back(); + Item & dir = *request->dir_tab.back(); request->PostVar("subject", dir.subject); db->EditSubjectById(dir, dir.id); diff --git a/functions/upload.cpp b/functions/upload.cpp index 409cdbb..0ffece4 100755 --- a/functions/upload.cpp +++ b/functions/upload.cpp @@ -69,7 +69,7 @@ return true; bool Upload::HasAccess() { - if( request->is_item || !HasAccess(*request->dir_table.back()) ) + if( request->is_item || !HasAccess(*request->dir_tab.back()) ) return false; return true; @@ -140,14 +140,14 @@ return true; void Upload::UploadMulti() { request->item.Clear(); // clearing and setting date - request->item.parent_id = request->dir_table.back()->id; + request->item.parent_id = request->dir_tab.back()->id; request->item.type = Item::file; request->item.privileges = 0644; // !! tymczasowo functions->SetUser(request->item); - PostFileTable::iterator i = request->post_file_table.begin(); + PostFileTab::iterator i = request->post_file_tab.begin(); - for( ; i != request->post_file_table.end() ; ++i) + for( ; i != request->post_file_tab.end() ; ++i) { const char * file_name = i->second.filename.c_str(); @@ -183,7 +183,7 @@ void Upload::UploadSingle() functions->SetUser(request->item); request->item.privileges = 0644; // !! tymczasowo - const char * file_name = request->post_file_table.begin()->second.filename.c_str(); + const char * file_name = request->post_file_tab.begin()->second.filename.c_str(); request->item.auth = SelectFileType(file_name); if( !has_subject ) @@ -203,7 +203,7 @@ void Upload::UploadSingle() if( request->status == WINIX_ERR_OK ) { - const std::string & tmp_filename = request->post_file_table.begin()->second.tmp_filename; + const std::string & tmp_filename = request->post_file_tab.begin()->second.tmp_filename; UploadSaveFile(tmp_filename, request->item.auth_path); request->status = db->EditAuthById(request->item, request->item.id); } @@ -217,7 +217,7 @@ void Upload::UploadSingle() // !! dodac usuwanie plikow statycznych przez rm void Upload::MakePost() { - if( request->post_file_table.empty() ) + if( request->post_file_tab.empty() ) { request->status = WINIX_ERR_PERMISSION_DENIED; return; @@ -226,7 +226,7 @@ void Upload::MakePost() if( !FunUploadCheckAbuse() ) return; - if( request->post_file_table.size() > 1 ) + if( request->post_file_tab.size() > 1 ) UploadMulti(); else UploadSingle(); diff --git a/functions/uptime.cpp b/functions/uptime.cpp new file mode 100755 index 0000000..bbd31cd --- /dev/null +++ b/functions/uptime.cpp @@ -0,0 +1,25 @@ +/* + * This file is a part of Winix + * and is not publicly distributed + * + * Copyright (c) 2008-2010, Tomasz Sowa + * All rights reserved. + * + */ + +#include "uptime.h" + + +namespace Fun +{ + +Uptime::Uptime() +{ + fun.url = "uptime"; +} + + + + +} // namespace + diff --git a/functions/uptime.h b/functions/uptime.h new file mode 100755 index 0000000..507049e --- /dev/null +++ b/functions/uptime.h @@ -0,0 +1,34 @@ +/* + * This file is a part of Winix + * and is not publicly distributed + * + * Copyright (c) 2010, Tomasz Sowa + * All rights reserved. + * + */ + +#ifndef headerfilecmslucontentuptime +#define headerfilecmslucontentuptime + +#include "functionbase.h" + + + +namespace Fun +{ + + +class Uptime : public FunctionBase +{ +public: + + Uptime(); + +private: + +}; + + +} // namespace + +#endif diff --git a/html/fun_createthread.html b/html/fun_createthread.html index 7c64648..eb935e1 100755 --- a/html/fun_createthread.html +++ b/html/fun_createthread.html @@ -8,13 +8,29 @@ {form_thread_legend}

{title}:

- + - [include "fun_emacs_post.html"] + + [# !! change names form_emacs_content_thread and form_emacs_content_ticket] + +

{form_emacs_content_thread}

+ + +

{form_emacs_content_type}

+ + + + [if-no user_logged]

{nick}:

- +

{rebus_how_is_it} [rebus_question]?

diff --git a/html/fun_createticket.html b/html/fun_createticket.html index 73f0aba..0e7e7fd 100755 --- a/html/fun_createticket.html +++ b/html/fun_createticket.html @@ -155,7 +155,23 @@ -[include "fun_emacs_post.html"] +[# !! change names form_emacs_content_thread and form_emacs_content_ticket] + +

{form_emacs_content_ticket}

+ + + +

{form_emacs_content_type}

+ + + + [if-no user_logged] diff --git a/html/fun_last.html b/html/fun_last.html index cf9dab2..e896b72 100755 --- a/html/fun_last.html +++ b/html/fun_last.html @@ -2,7 +2,7 @@ [if-one last_tab] - + [for last_tab] [end] diff --git a/html/fun_thread.html b/html/fun_thread.html index f65d5f1..a18a143 100755 --- a/html/fun_thread.html +++ b/html/fun_thread.html @@ -9,7 +9,7 @@ [if-one thread_tab]
{last_table_login}{last_table_ip}{last_table_login_date}{last_table_logout_date}
{last_tab_login}{last_tab_ip}{last_tab_login_date}{last_tab_logout_date}
[last_tab_name][last_tab_ip][last_tab_start][last_tab_end]
- + [for thread_tab] diff --git a/html/fun_ticket.html b/html/fun_ticket.html index 0d5a5a4..6eb13d2 100755 --- a/html/fun_ticket.html +++ b/html/fun_ticket.html @@ -12,12 +12,12 @@ [if-one ticket_tab]
{thread_table_title}{thread_table_author}{thread_table_replies}{thread_table_last_post}
{thread_tab_title}{thread_tab_author}{thread_tab_replies}{thread_tab_last_post}
[thread_tab_subject]
- - [if-any ticket_type_tab][end] - [if-any ticket_status_tab][end] + + [if-any ticket_type_tab][end] + [if-any ticket_status_tab][end] - [if-any ticket_priority_tab][end] - [if-any ticket_expected_tab][end] + [if-any ticket_priority_tab][end] + [if-any ticket_expected_tab][end] [for ticket_tab] @@ -44,7 +44,7 @@ [if-any ticket_expected_tab][end]
{ticket_table_name}{ticket_table_type}{ticket_table_status}{ticket_tab_name}{ticket_tab_type}{ticket_tab_status}{ticket_info_progress}{ticket_table_priority}{ticket_table_expected}{ticket_tab_priority}{ticket_tab_expected}
{ticket_info_expected}:[ticket_expected]
{ticket_info_progress}:[ticket_progress]%
- [item_print_content] + [ticket_item_print_content] [if-one dir_can_use_emacs] diff --git a/html/fun_who.html b/html/fun_who.html index 06f20a7..96b7a63 100755 --- a/html/fun_who.html +++ b/html/fun_who.html @@ -3,7 +3,7 @@ [if-any who_tab] - + [for who_tab] [end] diff --git a/html/stats_info.html b/html/stats_info.html new file mode 100755 index 0000000..502e617 --- /dev/null +++ b/html/stats_info.html @@ -0,0 +1,11 @@ + diff --git a/locale/en b/locale/en index 7131bd3..6c1a32b 100755 --- a/locale/en +++ b/locale/en @@ -98,10 +98,10 @@ form_emacs_content_type_raw = raw last_header = Last logged users -last_table_login = Login -last_table_ip = IP -last_table_login_date = Login time -last_table_logout_date = Logout time +last_tab_login = Login +last_tab_ip = IP +last_tab_login_date = Login time +last_tab_logout_date = Logout time last_none = There is no anything information. @@ -127,19 +127,19 @@ rm_file_header = Are you sure you want to delete the file? rm_dir_header = Are you sure you want to delete the directory? thread_create_new = Create a new thread -thread_table_title = Thread title -thread_table_author = Author -thread_table_replies = Rep. -thread_table_last_post = Last post +thread_tab_title = Thread title +thread_tab_author = Author +thread_tab_replies = Rep. +thread_tab_last_post = Last post thread_reply_in_this_thread = Reply in this thread ticket_progress_image_path = ticket_progress ticket_create_new = Create a new ticket -ticket_table_name = Ticket -ticket_table_type = Type -ticket_table_status = Status -ticket_table_priority = Priority -ticket_table_expected = Expected in +ticket_tab_name = Ticket +ticket_tab_type = Type +ticket_tab_status = Status +ticket_tab_priority = Priority +ticket_tab_expected = Expected in ticket_info_type = Type ticket_info_status = Status @@ -157,9 +157,9 @@ upload_content = File description upload_submit = Upload who_header = Sessions -who_table_index = Ind. -who_table_start = Start -who_table_last_active = Last active +who_tab_index = Ind. +who_tab_start = Start +who_tab_last_active = Last active who_none = There is no any sessions. admin_options = Other administrative options diff --git a/locale/pl b/locale/pl index b9703a6..2f463ad 100755 --- a/locale/pl +++ b/locale/pl @@ -99,10 +99,10 @@ form_emacs_content_type_raw = surowa posta last_header = Ostatnio logowani u¿ytkownicy -last_table_login = Login -last_table_ip = Adres IP -last_table_login_date = Czas zalogowania -last_table_logout_date = Czas wylogowania +last_tab_login = Login +last_tab_ip = Adres IP +last_tab_login_date = Czas zalogowania +last_tab_logout_date = Czas wylogowania last_none = Nie ma dostêpnych ¿adnych informacji. @@ -129,19 +129,19 @@ rm_file_header = Czy napewno chcesz usun rm_dir_header = Czy napewno chcesz usun±æ podany katalog? thread_create_new = Za³ó¿ nowy w±tek -thread_table_title = Tytu³ w±tku -thread_table_author = Autor -thread_table_replies = Odp. -thread_table_last_post = Ostatni post +thread_tab_title = Tytu³ w±tku +thread_tab_author = Autor +thread_tab_replies = Odp. +thread_tab_last_post = Ostatni post thread_reply_in_this_thread = Odpowiedz w tym w±tku ticket_progress_image_path = ticket_progress ticket_create_new = Za³ó¿ nowe zg³oszenie -ticket_table_name = Zg³oszenie -ticket_table_type = Rodzaj -ticket_table_status = Status -ticket_table_priority = Priorytet -ticket_table_expected = Oczeki-
wany w +ticket_tab_name = Zg³oszenie +ticket_tab_type = Rodzaj +ticket_tab_status = Status +ticket_tab_priority = Priorytet +ticket_tab_expected = Oczeki-
wany w ticket_info_type = Rodzaj zg³oszenia @@ -161,9 +161,9 @@ upload_submit = Wy who_header = Lista sesji -who_table_index = L.p. -who_table_start = Start -who_table_last_active = Ostatnio aktywny +who_tab_index = L.p. +who_tab_start = Start +who_tab_last_active = Ostatnio aktywny who_none = Nie ma ¿adnych dostêpnych sesji. admin_options = Inne opcje administracyjne diff --git a/main/Makefile.dep b/main/Makefile.dep index a0f905c..b9089e7 100755 --- a/main/Makefile.dep +++ b/main/Makefile.dep @@ -26,9 +26,10 @@ main.o: ../functions/login.h ../functions/logout.h ../functions/ls.h main.o: ../functions/mkdir.h ../functions/mv.h ../functions/node.h main.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h main.o: ../functions/run.h ../functions/subject.h ../functions/funthread.h -main.o: ../core/thread.h ../functions/funticket.h ../functions/tinymce.h -main.o: ../functions/uname.h ../functions/upload.h ../functions/who.h -main.o: ../templates/templates.h ../templates/patterncacher.h ../core/item.h -main.o: ../templates/misc.h ../templates/ckeditorgetparser.h -main.o: ../core/httpsimpleparser.h ../core/log.h ../templates/indexpatterns.h -main.o: ../core/sessionmanager.h ../core/plugin.h ../core/pluginmsg.h +main.o: ../core/thread.h ../functions/funticket.h ../core/ticket.h +main.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h +main.o: ../functions/uptime.h ../functions/who.h ../templates/templates.h +main.o: ../templates/patterncacher.h ../core/item.h ../templates/misc.h +main.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h +main.o: ../core/log.h ../templates/indexpatterns.h ../core/sessionmanager.h +main.o: ../core/plugin.h ../core/pluginmsg.h diff --git a/plugins/stats/Makefile.dep b/plugins/stats/Makefile.dep index 3390328..b453dc8 100755 --- a/plugins/stats/Makefile.dep +++ b/plugins/stats/Makefile.dep @@ -4,17 +4,17 @@ bot.o: bot.h init.o: ../../core/log.h ../../core/request.h ../../core/requesttypes.h init.o: ../../core/session.h ../../core/item.h ../../core/error.h init.o: ../../core/log.h ../../core/user.h ../../core/plugindata.h -init.o: ../../core/rebus.h ../../core/thread.h ../../core/compress.h +init.o: ../../core/rebus.h ../../core/compress.h init.o: ../../core/acceptencodingparser.h ../../core/acceptbaseparser.h init.o: ../../core/htmlfilter.h ../../core/postmultiparser.h -init.o: ../../core/config.h ../../core/confparser.h ../../core/ticket.h -init.o: ../../core/config.h ../../core/db.h ../../core/group.h -init.o: ../../core/dircontainer.h ../../core/ugcontainer.h bot.h stats.h -init.o: templates.h ../../core/plugin.h ../../core/pluginmsg.h -init.o: ../../core/request.h ../../core/system.h ../../core/dirs.h -init.o: ../../core/db.h ../../core/mounts.h ../../core/mount.h -init.o: ../../core/users.h ../../core/lastcontainer.h ../../core/groups.h -init.o: ../../core/loadavg.h ../../core/sessionmanager.h +init.o: ../../core/config.h ../../core/confparser.h ../../core/config.h +init.o: ../../core/db.h ../../core/group.h ../../core/thread.h +init.o: ../../core/dircontainer.h ../../core/ugcontainer.h +init.o: ../../core/ticket.h bot.h stats.h templates.h ../../core/plugin.h +init.o: ../../core/pluginmsg.h ../../core/request.h ../../core/system.h +init.o: ../../core/dirs.h ../../core/db.h ../../core/mounts.h +init.o: ../../core/mount.h ../../core/users.h ../../core/lastcontainer.h +init.o: ../../core/groups.h ../../core/loadavg.h ../../core/sessionmanager.h init.o: ../../core/sessioncontainer.h ../../functions/functions.h init.o: ../../functions/functionbase.h ../../core/item.h ../../core/system.h init.o: ../../core/notify.h ../../templatesnotify/templatesnotify.h @@ -33,8 +33,9 @@ init.o: ../../functions/mkdir.h ../../functions/mv.h ../../functions/node.h init.o: ../../functions/priv.h ../../functions/reload.h ../../functions/rm.h init.o: ../../functions/run.h ../../functions/subject.h init.o: ../../functions/funthread.h ../../core/thread.h -init.o: ../../functions/funticket.h ../../functions/tinymce.h -init.o: ../../functions/uname.h ../../functions/upload.h +init.o: ../../functions/funticket.h ../../core/ticket.h +init.o: ../../functions/tinymce.h ../../functions/uname.h +init.o: ../../functions/upload.h ../../functions/uptime.h init.o: ../../functions/who.h ../../templates/templates.h init.o: ../../templates/patterncacher.h ../../core/item.h init.o: ../../templates/misc.h ../../templates/ckeditorgetparser.h @@ -76,8 +77,9 @@ templates.o: ../../functions/node.h ../../functions/priv.h templates.o: ../../functions/reload.h ../../functions/rm.h templates.o: ../../functions/run.h ../../functions/subject.h templates.o: ../../functions/funthread.h ../../core/thread.h -templates.o: ../../functions/funticket.h ../../functions/tinymce.h -templates.o: ../../functions/uname.h ../../functions/upload.h +templates.o: ../../functions/funticket.h ../../core/ticket.h +templates.o: ../../functions/tinymce.h ../../functions/uname.h +templates.o: ../../functions/upload.h ../../functions/uptime.h templates.o: ../../functions/who.h ../../templates/templates.h templates.o: ../../templates/patterncacher.h ../../core/item.h templates.o: ../../templates/misc.h ../../templates/ckeditorgetparser.h diff --git a/plugins/stats/init.cpp b/plugins/stats/init.cpp index 0640b75..6c94f9b 100755 --- a/plugins/stats/init.cpp +++ b/plugins/stats/init.cpp @@ -39,8 +39,8 @@ void CalcItemId(Request * request) if( request->is_item ) current_item_id = request->item.id; else - if( !request->dir_table.empty() ) - current_item_id = request->dir_table.back()->id; + if( !request->dir_tab.empty() ) + current_item_id = request->dir_tab.back()->id; else current_item_id = -1; } diff --git a/templates/Makefile.dep b/templates/Makefile.dep index 63f78d1..ca3dc7d 100755 --- a/templates/Makefile.dep +++ b/templates/Makefile.dep @@ -6,13 +6,13 @@ adduser.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h adduser.o: indexpatterns.h ../core/locale.h ../core/config.h adduser.o: ../core/request.h ../core/requesttypes.h ../core/session.h adduser.o: ../core/item.h ../core/error.h ../core/log.h ../core/user.h -adduser.o: ../core/plugindata.h ../core/rebus.h ../core/thread.h -adduser.o: ../core/compress.h ../core/acceptencodingparser.h -adduser.o: ../core/acceptbaseparser.h ../core/htmlfilter.h -adduser.o: ../core/postmultiparser.h ../core/config.h ../core/ticket.h -adduser.o: ../core/db.h ../core/group.h ../core/dircontainer.h -adduser.o: ../core/ugcontainer.h ../core/system.h ../core/dirs.h ../core/db.h -adduser.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h +adduser.o: ../core/plugindata.h ../core/rebus.h ../core/compress.h +adduser.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h +adduser.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/config.h +adduser.o: ../core/db.h ../core/group.h ../core/thread.h +adduser.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/ticket.h +adduser.o: ../core/system.h ../core/dirs.h ../core/db.h ../core/request.h +adduser.o: ../core/mounts.h ../core/mount.h ../core/users.h adduser.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h adduser.o: ../core/sessionmanager.h ../core/sessioncontainer.h adduser.o: ../core/system.h @@ -22,17 +22,18 @@ dir.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h dir.o: indexpatterns.h ../core/locale.h ../core/config.h ../core/request.h dir.o: ../core/requesttypes.h ../core/session.h ../core/item.h dir.o: ../core/error.h ../core/log.h ../core/user.h ../core/plugindata.h -dir.o: ../core/rebus.h ../core/thread.h ../core/compress.h -dir.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h -dir.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/config.h -dir.o: ../core/ticket.h ../core/db.h ../core/group.h ../core/dircontainer.h -dir.o: ../core/ugcontainer.h ../core/system.h ../core/dirs.h ../core/db.h -dir.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h -dir.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h -dir.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h -dir.o: ../core/misc.h ../functions/functions.h ../functions/functionbase.h -dir.o: ../core/item.h ../core/notify.h ../templatesnotify/templatesnotify.h -dir.o: ../core/mount.h ../templates/misc.h ../functions/functionparser.h +dir.o: ../core/rebus.h ../core/compress.h ../core/acceptencodingparser.h +dir.o: ../core/acceptbaseparser.h ../core/htmlfilter.h +dir.o: ../core/postmultiparser.h ../core/config.h ../core/db.h +dir.o: ../core/group.h ../core/thread.h ../core/dircontainer.h +dir.o: ../core/ugcontainer.h ../core/ticket.h ../core/system.h ../core/dirs.h +dir.o: ../core/db.h ../core/request.h ../core/mounts.h ../core/mount.h +dir.o: ../core/users.h ../core/lastcontainer.h ../core/groups.h +dir.o: ../core/loadavg.h ../core/sessionmanager.h ../core/sessioncontainer.h +dir.o: ../core/system.h ../core/misc.h ../functions/functions.h +dir.o: ../functions/functionbase.h ../core/item.h ../core/notify.h +dir.o: ../templatesnotify/templatesnotify.h ../core/mount.h +dir.o: ../templates/misc.h ../functions/functionparser.h dir.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h dir.o: ../functions/privchanger.h ../functions/chown.h dir.o: ../functions/ckeditor.h ../functions/cp.h ../functions/createthread.h @@ -43,23 +44,23 @@ dir.o: ../functions/ls.h ../functions/mkdir.h ../functions/mv.h dir.o: ../functions/node.h ../functions/priv.h ../functions/reload.h dir.o: ../functions/rm.h ../functions/run.h ../functions/subject.h dir.o: ../functions/funthread.h ../core/thread.h ../functions/funticket.h -dir.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h -dir.o: ../functions/who.h +dir.o: ../core/ticket.h ../functions/tinymce.h ../functions/uname.h +dir.o: ../functions/upload.h ../functions/uptime.h ../functions/who.h doc.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h misc.h doc.o: localefilter.h ../core/locale.h ../core/confparser.h doc.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h doc.o: indexpatterns.h ../core/locale.h ../core/config.h ../core/request.h doc.o: ../core/requesttypes.h ../core/session.h ../core/item.h doc.o: ../core/error.h ../core/log.h ../core/user.h ../core/plugindata.h -doc.o: ../core/rebus.h ../core/thread.h ../core/compress.h -doc.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h -doc.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/config.h -doc.o: ../core/ticket.h ../core/db.h ../core/group.h ../core/dircontainer.h -doc.o: ../core/ugcontainer.h ../core/system.h ../core/dirs.h ../core/db.h -doc.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h -doc.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h -doc.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h -doc.o: ../core/request.h ../core/misc.h +doc.o: ../core/rebus.h ../core/compress.h ../core/acceptencodingparser.h +doc.o: ../core/acceptbaseparser.h ../core/htmlfilter.h +doc.o: ../core/postmultiparser.h ../core/config.h ../core/db.h +doc.o: ../core/group.h ../core/thread.h ../core/dircontainer.h +doc.o: ../core/ugcontainer.h ../core/ticket.h ../core/system.h ../core/dirs.h +doc.o: ../core/db.h ../core/request.h ../core/mounts.h ../core/mount.h +doc.o: ../core/users.h ../core/lastcontainer.h ../core/groups.h +doc.o: ../core/loadavg.h ../core/sessionmanager.h ../core/sessioncontainer.h +doc.o: ../core/system.h ../core/request.h ../core/misc.h indexpatterns.o: indexpatterns.h ../../ezc/src/ezc.h localefilter.h indexpatterns.o: ../core/locale.h ../core/confparser.h ../core/locale.h indexpatterns.o: ../core/config.h ../core/log.h @@ -69,30 +70,32 @@ item.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h item.o: indexpatterns.h ../core/locale.h ../core/config.h ../core/request.h item.o: ../core/requesttypes.h ../core/session.h ../core/item.h item.o: ../core/error.h ../core/log.h ../core/user.h ../core/plugindata.h -item.o: ../core/rebus.h ../core/thread.h ../core/compress.h -item.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h -item.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/config.h -item.o: ../core/ticket.h ../core/db.h ../core/group.h ../core/dircontainer.h -item.o: ../core/ugcontainer.h ../core/system.h ../core/dirs.h ../core/db.h -item.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h -item.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h -item.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h -item.o: ../core/request.h ../core/misc.h ../core/bbcodeparser.h +item.o: ../core/rebus.h ../core/compress.h ../core/acceptencodingparser.h +item.o: ../core/acceptbaseparser.h ../core/htmlfilter.h +item.o: ../core/postmultiparser.h ../core/config.h ../core/db.h +item.o: ../core/group.h ../core/thread.h ../core/dircontainer.h +item.o: ../core/ugcontainer.h ../core/ticket.h ../core/system.h +item.o: ../core/dirs.h ../core/db.h ../core/request.h ../core/mounts.h +item.o: ../core/mount.h ../core/users.h ../core/lastcontainer.h +item.o: ../core/groups.h ../core/loadavg.h ../core/sessionmanager.h +item.o: ../core/sessioncontainer.h ../core/system.h ../core/request.h +item.o: ../core/misc.h ../core/bbcodeparser.h last.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h misc.h last.o: localefilter.h ../core/locale.h ../core/confparser.h last.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h last.o: indexpatterns.h ../core/locale.h ../core/config.h ../core/request.h last.o: ../core/requesttypes.h ../core/session.h ../core/item.h last.o: ../core/error.h ../core/log.h ../core/user.h ../core/plugindata.h -last.o: ../core/rebus.h ../core/thread.h ../core/compress.h -last.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h -last.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/config.h -last.o: ../core/ticket.h ../core/db.h ../core/group.h ../core/dircontainer.h -last.o: ../core/ugcontainer.h ../core/system.h ../core/dirs.h ../core/db.h -last.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h -last.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h -last.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h -last.o: ../core/lastcontainer.h ../core/request.h ../core/misc.h +last.o: ../core/rebus.h ../core/compress.h ../core/acceptencodingparser.h +last.o: ../core/acceptbaseparser.h ../core/htmlfilter.h +last.o: ../core/postmultiparser.h ../core/config.h ../core/db.h +last.o: ../core/group.h ../core/thread.h ../core/dircontainer.h +last.o: ../core/ugcontainer.h ../core/ticket.h ../core/system.h +last.o: ../core/dirs.h ../core/db.h ../core/request.h ../core/mounts.h +last.o: ../core/mount.h ../core/users.h ../core/lastcontainer.h +last.o: ../core/groups.h ../core/loadavg.h ../core/sessionmanager.h +last.o: ../core/sessioncontainer.h ../core/system.h ../core/lastcontainer.h +last.o: ../core/request.h ../core/misc.h localefilter.o: localefilter.h ../core/locale.h ../core/confparser.h localefilter.o: ../../ezc/src/ezc.h ../core/misc.h ../core/item.h ls.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h misc.h @@ -101,11 +104,11 @@ ls.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h ls.o: indexpatterns.h ../core/locale.h ../core/config.h ../core/request.h ls.o: ../core/requesttypes.h ../core/session.h ../core/item.h ../core/error.h ls.o: ../core/log.h ../core/user.h ../core/plugindata.h ../core/rebus.h -ls.o: ../core/thread.h ../core/compress.h ../core/acceptencodingparser.h +ls.o: ../core/compress.h ../core/acceptencodingparser.h ls.o: ../core/acceptbaseparser.h ../core/htmlfilter.h -ls.o: ../core/postmultiparser.h ../core/config.h ../core/ticket.h -ls.o: ../core/db.h ../core/group.h ../core/dircontainer.h -ls.o: ../core/ugcontainer.h ../core/system.h ../core/dirs.h ../core/db.h +ls.o: ../core/postmultiparser.h ../core/config.h ../core/db.h ../core/group.h +ls.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h +ls.o: ../core/ticket.h ../core/system.h ../core/dirs.h ../core/db.h ls.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h ls.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h ls.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h @@ -117,28 +120,30 @@ misc.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h misc.o: indexpatterns.h ../core/locale.h ../core/config.h ../core/request.h misc.o: ../core/requesttypes.h ../core/session.h ../core/error.h misc.o: ../core/log.h ../core/user.h ../core/plugindata.h ../core/rebus.h -misc.o: ../core/thread.h ../core/compress.h ../core/acceptencodingparser.h +misc.o: ../core/compress.h ../core/acceptencodingparser.h misc.o: ../core/acceptbaseparser.h ../core/htmlfilter.h -misc.o: ../core/postmultiparser.h ../core/config.h ../core/ticket.h -misc.o: ../core/db.h ../core/group.h ../core/dircontainer.h -misc.o: ../core/ugcontainer.h ../core/system.h ../core/dirs.h ../core/db.h -misc.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h -misc.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h -misc.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h +misc.o: ../core/postmultiparser.h ../core/config.h ../core/db.h +misc.o: ../core/group.h ../core/thread.h ../core/dircontainer.h +misc.o: ../core/ugcontainer.h ../core/ticket.h ../core/system.h +misc.o: ../core/dirs.h ../core/db.h ../core/request.h ../core/mounts.h +misc.o: ../core/mount.h ../core/users.h ../core/lastcontainer.h +misc.o: ../core/groups.h ../core/loadavg.h ../core/sessionmanager.h +misc.o: ../core/sessioncontainer.h ../core/system.h mount.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h mount.o: misc.h localefilter.h ../core/locale.h ../core/confparser.h mount.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h mount.o: indexpatterns.h ../core/locale.h ../core/config.h ../core/request.h mount.o: ../core/requesttypes.h ../core/session.h ../core/item.h mount.o: ../core/error.h ../core/log.h ../core/user.h ../core/plugindata.h -mount.o: ../core/rebus.h ../core/thread.h ../core/compress.h -mount.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h -mount.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/config.h -mount.o: ../core/ticket.h ../core/db.h ../core/group.h ../core/dircontainer.h -mount.o: ../core/ugcontainer.h ../core/system.h ../core/dirs.h ../core/db.h -mount.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h -mount.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h -mount.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h +mount.o: ../core/rebus.h ../core/compress.h ../core/acceptencodingparser.h +mount.o: ../core/acceptbaseparser.h ../core/htmlfilter.h +mount.o: ../core/postmultiparser.h ../core/config.h ../core/db.h +mount.o: ../core/group.h ../core/thread.h ../core/dircontainer.h +mount.o: ../core/ugcontainer.h ../core/ticket.h ../core/system.h +mount.o: ../core/dirs.h ../core/db.h ../core/request.h ../core/mounts.h +mount.o: ../core/mount.h ../core/users.h ../core/lastcontainer.h +mount.o: ../core/groups.h ../core/loadavg.h ../core/sessionmanager.h +mount.o: ../core/sessioncontainer.h ../core/system.h patterncacher.o: patterncacher.h ../core/item.h ../../ezc/src/ezc.h patterncacher.o: ../core/log.h priv.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h misc.h @@ -147,17 +152,18 @@ priv.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h priv.o: indexpatterns.h ../core/locale.h ../core/config.h ../core/request.h priv.o: ../core/requesttypes.h ../core/session.h ../core/item.h priv.o: ../core/error.h ../core/log.h ../core/user.h ../core/plugindata.h -priv.o: ../core/rebus.h ../core/thread.h ../core/compress.h -priv.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h -priv.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/config.h -priv.o: ../core/ticket.h ../core/db.h ../core/group.h ../core/dircontainer.h -priv.o: ../core/ugcontainer.h ../core/system.h ../core/dirs.h ../core/db.h -priv.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h -priv.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h -priv.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h -priv.o: ../core/misc.h ../functions/functions.h ../functions/functionbase.h -priv.o: ../core/item.h ../core/notify.h ../templatesnotify/templatesnotify.h -priv.o: ../core/mount.h ../templates/misc.h ../functions/functionparser.h +priv.o: ../core/rebus.h ../core/compress.h ../core/acceptencodingparser.h +priv.o: ../core/acceptbaseparser.h ../core/htmlfilter.h +priv.o: ../core/postmultiparser.h ../core/config.h ../core/db.h +priv.o: ../core/group.h ../core/thread.h ../core/dircontainer.h +priv.o: ../core/ugcontainer.h ../core/ticket.h ../core/system.h +priv.o: ../core/dirs.h ../core/db.h ../core/request.h ../core/mounts.h +priv.o: ../core/mount.h ../core/users.h ../core/lastcontainer.h +priv.o: ../core/groups.h ../core/loadavg.h ../core/sessionmanager.h +priv.o: ../core/sessioncontainer.h ../core/system.h ../core/misc.h +priv.o: ../functions/functions.h ../functions/functionbase.h ../core/item.h +priv.o: ../core/notify.h ../templatesnotify/templatesnotify.h ../core/mount.h +priv.o: ../templates/misc.h ../functions/functionparser.h priv.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h priv.o: ../functions/privchanger.h ../functions/chown.h priv.o: ../functions/ckeditor.h ../functions/cp.h ../functions/createthread.h @@ -168,55 +174,56 @@ priv.o: ../functions/logout.h ../functions/ls.h ../functions/mkdir.h priv.o: ../functions/mv.h ../functions/node.h ../functions/priv.h priv.o: ../functions/reload.h ../functions/rm.h ../functions/run.h priv.o: ../functions/subject.h ../functions/funthread.h ../core/thread.h -priv.o: ../functions/funticket.h ../functions/tinymce.h ../functions/uname.h -priv.o: ../functions/upload.h ../functions/who.h +priv.o: ../functions/funticket.h ../core/ticket.h ../functions/tinymce.h +priv.o: ../functions/uname.h ../functions/upload.h ../functions/uptime.h +priv.o: ../functions/who.h rebus.o: ../core/request.h templates.h ../../ezc/src/ezc.h patterncacher.h rebus.o: ../core/item.h misc.h localefilter.h ../core/locale.h rebus.o: ../core/confparser.h ckeditorgetparser.h ../core/httpsimpleparser.h rebus.o: ../core/log.h indexpatterns.h ../core/locale.h ../core/config.h rebus.o: ../core/request.h ../core/requesttypes.h ../core/session.h rebus.o: ../core/item.h ../core/error.h ../core/log.h ../core/user.h -rebus.o: ../core/plugindata.h ../core/rebus.h ../core/thread.h -rebus.o: ../core/compress.h ../core/acceptencodingparser.h -rebus.o: ../core/acceptbaseparser.h ../core/htmlfilter.h -rebus.o: ../core/postmultiparser.h ../core/config.h ../core/ticket.h -rebus.o: ../core/db.h ../core/group.h ../core/dircontainer.h -rebus.o: ../core/ugcontainer.h ../core/system.h ../core/dirs.h ../core/db.h -rebus.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h -rebus.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h -rebus.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h +rebus.o: ../core/plugindata.h ../core/rebus.h ../core/compress.h +rebus.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h +rebus.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/config.h +rebus.o: ../core/db.h ../core/group.h ../core/thread.h ../core/dircontainer.h +rebus.o: ../core/ugcontainer.h ../core/ticket.h ../core/system.h +rebus.o: ../core/dirs.h ../core/db.h ../core/request.h ../core/mounts.h +rebus.o: ../core/mount.h ../core/users.h ../core/lastcontainer.h +rebus.o: ../core/groups.h ../core/loadavg.h ../core/sessionmanager.h +rebus.o: ../core/sessioncontainer.h ../core/system.h sys.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h misc.h sys.o: localefilter.h ../core/locale.h ../core/confparser.h sys.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h sys.o: indexpatterns.h ../core/locale.h ../core/config.h ../core/request.h sys.o: ../core/requesttypes.h ../core/session.h ../core/item.h sys.o: ../core/error.h ../core/log.h ../core/user.h ../core/plugindata.h -sys.o: ../core/rebus.h ../core/thread.h ../core/compress.h -sys.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h -sys.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/config.h -sys.o: ../core/ticket.h ../core/db.h ../core/group.h ../core/dircontainer.h -sys.o: ../core/ugcontainer.h ../core/system.h ../core/dirs.h ../core/db.h -sys.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h -sys.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h -sys.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h -sys.o: ../core/request.h ../core/version.h +sys.o: ../core/rebus.h ../core/compress.h ../core/acceptencodingparser.h +sys.o: ../core/acceptbaseparser.h ../core/htmlfilter.h +sys.o: ../core/postmultiparser.h ../core/config.h ../core/db.h +sys.o: ../core/group.h ../core/thread.h ../core/dircontainer.h +sys.o: ../core/ugcontainer.h ../core/ticket.h ../core/system.h ../core/dirs.h +sys.o: ../core/db.h ../core/request.h ../core/mounts.h ../core/mount.h +sys.o: ../core/users.h ../core/lastcontainer.h ../core/groups.h +sys.o: ../core/loadavg.h ../core/sessionmanager.h ../core/sessioncontainer.h +sys.o: ../core/system.h ../core/request.h ../core/version.h templates.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h templates.o: misc.h localefilter.h ../core/locale.h ../core/confparser.h templates.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h templates.o: indexpatterns.h ../core/locale.h ../core/config.h templates.o: ../core/request.h ../core/requesttypes.h ../core/session.h templates.o: ../core/item.h ../core/error.h ../core/log.h ../core/user.h -templates.o: ../core/plugindata.h ../core/rebus.h ../core/thread.h -templates.o: ../core/compress.h ../core/acceptencodingparser.h -templates.o: ../core/acceptbaseparser.h ../core/htmlfilter.h -templates.o: ../core/postmultiparser.h ../core/config.h ../core/ticket.h -templates.o: ../core/db.h ../core/group.h ../core/dircontainer.h -templates.o: ../core/ugcontainer.h ../core/system.h ../core/dirs.h -templates.o: ../core/db.h ../core/request.h ../core/mounts.h ../core/mount.h -templates.o: ../core/users.h ../core/lastcontainer.h ../core/groups.h -templates.o: ../core/loadavg.h ../core/sessionmanager.h -templates.o: ../core/sessioncontainer.h ../core/system.h ../core/misc.h -templates.o: ../core/plugin.h ../core/pluginmsg.h ../core/sessionmanager.h +templates.o: ../core/plugindata.h ../core/rebus.h ../core/compress.h +templates.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h +templates.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/config.h +templates.o: ../core/db.h ../core/group.h ../core/thread.h +templates.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/ticket.h +templates.o: ../core/system.h ../core/dirs.h ../core/db.h ../core/request.h +templates.o: ../core/mounts.h ../core/mount.h ../core/users.h +templates.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h +templates.o: ../core/sessionmanager.h ../core/sessioncontainer.h +templates.o: ../core/system.h ../core/misc.h ../core/plugin.h +templates.o: ../core/pluginmsg.h ../core/sessionmanager.h templates.o: ../functions/functions.h ../functions/functionbase.h templates.o: ../core/item.h ../core/notify.h templates.o: ../templatesnotify/templatesnotify.h ../core/mount.h @@ -232,36 +239,51 @@ templates.o: ../functions/ls.h ../functions/mkdir.h ../functions/mv.h templates.o: ../functions/node.h ../functions/priv.h ../functions/reload.h templates.o: ../functions/rm.h ../functions/run.h ../functions/subject.h templates.o: ../functions/funthread.h ../core/thread.h -templates.o: ../functions/funticket.h ../functions/tinymce.h -templates.o: ../functions/uname.h ../functions/upload.h ../functions/who.h -templates.o: ../templates/templates.h +templates.o: ../functions/funticket.h ../core/ticket.h ../functions/tinymce.h +templates.o: ../functions/uname.h ../functions/upload.h ../functions/uptime.h +templates.o: ../functions/who.h ../templates/templates.h thread.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h thread.o: misc.h localefilter.h ../core/locale.h ../core/confparser.h thread.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h thread.o: indexpatterns.h ../core/locale.h ../core/config.h ../core/request.h thread.o: ../core/requesttypes.h ../core/session.h ../core/item.h thread.o: ../core/error.h ../core/log.h ../core/user.h ../core/plugindata.h -thread.o: ../core/rebus.h ../core/thread.h ../core/compress.h -thread.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h -thread.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/config.h -thread.o: ../core/ticket.h ../core/db.h ../core/group.h -thread.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/system.h +thread.o: ../core/rebus.h ../core/compress.h ../core/acceptencodingparser.h +thread.o: ../core/acceptbaseparser.h ../core/htmlfilter.h +thread.o: ../core/postmultiparser.h ../core/config.h ../core/db.h +thread.o: ../core/group.h ../core/thread.h ../core/dircontainer.h +thread.o: ../core/ugcontainer.h ../core/ticket.h ../core/system.h thread.o: ../core/dirs.h ../core/db.h ../core/request.h ../core/mounts.h thread.o: ../core/mount.h ../core/users.h ../core/lastcontainer.h thread.o: ../core/groups.h ../core/loadavg.h ../core/sessionmanager.h -thread.o: ../core/sessioncontainer.h ../core/system.h ../core/request.h -thread.o: ../core/misc.h +thread.o: ../core/sessioncontainer.h ../core/system.h ../core/misc.h +thread.o: ../functions/functions.h ../functions/functionbase.h ../core/item.h +thread.o: ../core/notify.h ../templatesnotify/templatesnotify.h +thread.o: ../core/mount.h ../templates/misc.h ../functions/functionparser.h +thread.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h +thread.o: ../functions/privchanger.h ../functions/chown.h +thread.o: ../functions/ckeditor.h ../functions/cp.h +thread.o: ../functions/createthread.h ../functions/createticket.h +thread.o: ../functions/default.h ../functions/download.h +thread.o: ../functions/editticket.h ../functions/emacs.h ../functions/last.h +thread.o: ../functions/login.h ../functions/logout.h ../functions/ls.h +thread.o: ../functions/mkdir.h ../functions/mv.h ../functions/node.h +thread.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h +thread.o: ../functions/run.h ../functions/subject.h ../functions/funthread.h +thread.o: ../core/thread.h ../functions/funticket.h ../core/ticket.h +thread.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h +thread.o: ../functions/uptime.h ../functions/who.h ticket.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h ticket.o: misc.h localefilter.h ../core/locale.h ../core/confparser.h ticket.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h ticket.o: indexpatterns.h ../core/locale.h ../core/config.h ../core/request.h ticket.o: ../core/requesttypes.h ../core/session.h ../core/item.h ticket.o: ../core/error.h ../core/log.h ../core/user.h ../core/plugindata.h -ticket.o: ../core/rebus.h ../core/thread.h ../core/compress.h -ticket.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h -ticket.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/config.h -ticket.o: ../core/ticket.h ../core/db.h ../core/group.h -ticket.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/system.h +ticket.o: ../core/rebus.h ../core/compress.h ../core/acceptencodingparser.h +ticket.o: ../core/acceptbaseparser.h ../core/htmlfilter.h +ticket.o: ../core/postmultiparser.h ../core/config.h ../core/db.h +ticket.o: ../core/group.h ../core/thread.h ../core/dircontainer.h +ticket.o: ../core/ugcontainer.h ../core/ticket.h ../core/system.h ticket.o: ../core/dirs.h ../core/db.h ../core/request.h ../core/mounts.h ticket.o: ../core/mount.h ../core/users.h ../core/lastcontainer.h ticket.o: ../core/groups.h ../core/loadavg.h ../core/sessionmanager.h @@ -279,19 +301,20 @@ ticket.o: ../functions/login.h ../functions/logout.h ../functions/ls.h ticket.o: ../functions/mkdir.h ../functions/mv.h ../functions/node.h ticket.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h ticket.o: ../functions/run.h ../functions/subject.h ../functions/funthread.h -ticket.o: ../core/thread.h ../functions/funticket.h ../functions/tinymce.h -ticket.o: ../functions/uname.h ../functions/upload.h ../functions/who.h +ticket.o: ../core/thread.h ../functions/funticket.h ../core/ticket.h +ticket.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h +ticket.o: ../functions/uptime.h ../functions/who.h upload.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h upload.o: misc.h localefilter.h ../core/locale.h ../core/confparser.h upload.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h upload.o: indexpatterns.h ../core/locale.h ../core/config.h ../core/request.h upload.o: ../core/requesttypes.h ../core/session.h ../core/item.h upload.o: ../core/error.h ../core/log.h ../core/user.h ../core/plugindata.h -upload.o: ../core/rebus.h ../core/thread.h ../core/compress.h -upload.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h -upload.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/config.h -upload.o: ../core/ticket.h ../core/db.h ../core/group.h -upload.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/system.h +upload.o: ../core/rebus.h ../core/compress.h ../core/acceptencodingparser.h +upload.o: ../core/acceptbaseparser.h ../core/htmlfilter.h +upload.o: ../core/postmultiparser.h ../core/config.h ../core/db.h +upload.o: ../core/group.h ../core/thread.h ../core/dircontainer.h +upload.o: ../core/ugcontainer.h ../core/ticket.h ../core/system.h upload.o: ../core/dirs.h ../core/db.h ../core/request.h ../core/mounts.h upload.o: ../core/mount.h ../core/users.h ../core/lastcontainer.h upload.o: ../core/groups.h ../core/loadavg.h ../core/sessionmanager.h @@ -302,11 +325,11 @@ uptime.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h uptime.o: indexpatterns.h ../core/locale.h ../core/config.h ../core/request.h uptime.o: ../core/requesttypes.h ../core/session.h ../core/item.h uptime.o: ../core/error.h ../core/log.h ../core/user.h ../core/plugindata.h -uptime.o: ../core/rebus.h ../core/thread.h ../core/compress.h -uptime.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h -uptime.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/config.h -uptime.o: ../core/ticket.h ../core/db.h ../core/group.h -uptime.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/system.h +uptime.o: ../core/rebus.h ../core/compress.h ../core/acceptencodingparser.h +uptime.o: ../core/acceptbaseparser.h ../core/htmlfilter.h +uptime.o: ../core/postmultiparser.h ../core/config.h ../core/db.h +uptime.o: ../core/group.h ../core/thread.h ../core/dircontainer.h +uptime.o: ../core/ugcontainer.h ../core/ticket.h ../core/system.h uptime.o: ../core/dirs.h ../core/db.h ../core/request.h ../core/mounts.h uptime.o: ../core/mount.h ../core/users.h ../core/lastcontainer.h uptime.o: ../core/groups.h ../core/loadavg.h ../core/sessionmanager.h @@ -317,47 +340,49 @@ user.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h user.o: indexpatterns.h ../core/locale.h ../core/config.h ../core/request.h user.o: ../core/requesttypes.h ../core/session.h ../core/item.h user.o: ../core/error.h ../core/log.h ../core/user.h ../core/plugindata.h -user.o: ../core/rebus.h ../core/thread.h ../core/compress.h -user.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h -user.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/config.h -user.o: ../core/ticket.h ../core/db.h ../core/group.h ../core/dircontainer.h -user.o: ../core/ugcontainer.h ../core/system.h ../core/dirs.h ../core/db.h -user.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h -user.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h -user.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h -user.o: ../core/request.h ../core/misc.h +user.o: ../core/rebus.h ../core/compress.h ../core/acceptencodingparser.h +user.o: ../core/acceptbaseparser.h ../core/htmlfilter.h +user.o: ../core/postmultiparser.h ../core/config.h ../core/db.h +user.o: ../core/group.h ../core/thread.h ../core/dircontainer.h +user.o: ../core/ugcontainer.h ../core/ticket.h ../core/system.h +user.o: ../core/dirs.h ../core/db.h ../core/request.h ../core/mounts.h +user.o: ../core/mount.h ../core/users.h ../core/lastcontainer.h +user.o: ../core/groups.h ../core/loadavg.h ../core/sessionmanager.h +user.o: ../core/sessioncontainer.h ../core/system.h ../core/request.h +user.o: ../core/misc.h who.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h misc.h who.o: localefilter.h ../core/locale.h ../core/confparser.h who.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h who.o: indexpatterns.h ../core/locale.h ../core/config.h ../core/request.h who.o: ../core/requesttypes.h ../core/session.h ../core/item.h who.o: ../core/error.h ../core/log.h ../core/user.h ../core/plugindata.h -who.o: ../core/rebus.h ../core/thread.h ../core/compress.h -who.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h -who.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/config.h -who.o: ../core/ticket.h ../core/db.h ../core/group.h ../core/dircontainer.h -who.o: ../core/ugcontainer.h ../core/system.h ../core/dirs.h ../core/db.h -who.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h -who.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h -who.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h -who.o: ../core/misc.h +who.o: ../core/rebus.h ../core/compress.h ../core/acceptencodingparser.h +who.o: ../core/acceptbaseparser.h ../core/htmlfilter.h +who.o: ../core/postmultiparser.h ../core/config.h ../core/db.h +who.o: ../core/group.h ../core/thread.h ../core/dircontainer.h +who.o: ../core/ugcontainer.h ../core/ticket.h ../core/system.h ../core/dirs.h +who.o: ../core/db.h ../core/request.h ../core/mounts.h ../core/mount.h +who.o: ../core/users.h ../core/lastcontainer.h ../core/groups.h +who.o: ../core/loadavg.h ../core/sessionmanager.h ../core/sessioncontainer.h +who.o: ../core/system.h ../core/misc.h winix.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h winix.o: misc.h localefilter.h ../core/locale.h ../core/confparser.h winix.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h winix.o: indexpatterns.h ../core/locale.h ../core/config.h ../core/request.h winix.o: ../core/requesttypes.h ../core/session.h ../core/item.h winix.o: ../core/error.h ../core/log.h ../core/user.h ../core/plugindata.h -winix.o: ../core/rebus.h ../core/thread.h ../core/compress.h -winix.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h -winix.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/config.h -winix.o: ../core/ticket.h ../core/db.h ../core/group.h ../core/dircontainer.h -winix.o: ../core/ugcontainer.h ../core/system.h ../core/dirs.h ../core/db.h -winix.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h -winix.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h -winix.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h -winix.o: ../functions/functions.h ../functions/functionbase.h ../core/item.h -winix.o: ../core/notify.h ../templatesnotify/templatesnotify.h -winix.o: ../core/mount.h ../templates/misc.h ../functions/functionparser.h +winix.o: ../core/rebus.h ../core/compress.h ../core/acceptencodingparser.h +winix.o: ../core/acceptbaseparser.h ../core/htmlfilter.h +winix.o: ../core/postmultiparser.h ../core/config.h ../core/db.h +winix.o: ../core/group.h ../core/thread.h ../core/dircontainer.h +winix.o: ../core/ugcontainer.h ../core/ticket.h ../core/system.h +winix.o: ../core/dirs.h ../core/db.h ../core/request.h ../core/mounts.h +winix.o: ../core/mount.h ../core/users.h ../core/lastcontainer.h +winix.o: ../core/groups.h ../core/loadavg.h ../core/sessionmanager.h +winix.o: ../core/sessioncontainer.h ../core/system.h ../functions/functions.h +winix.o: ../functions/functionbase.h ../core/item.h ../core/notify.h +winix.o: ../templatesnotify/templatesnotify.h ../core/mount.h +winix.o: ../templates/misc.h ../functions/functionparser.h winix.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h winix.o: ../functions/privchanger.h ../functions/chown.h winix.o: ../functions/ckeditor.h ../functions/cp.h @@ -368,5 +393,6 @@ winix.o: ../functions/login.h ../functions/logout.h ../functions/ls.h winix.o: ../functions/mkdir.h ../functions/mv.h ../functions/node.h winix.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h winix.o: ../functions/run.h ../functions/subject.h ../functions/funthread.h -winix.o: ../core/thread.h ../functions/funticket.h ../functions/tinymce.h -winix.o: ../functions/uname.h ../functions/upload.h ../functions/who.h +winix.o: ../core/thread.h ../functions/funticket.h ../core/ticket.h +winix.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h +winix.o: ../functions/uptime.h ../functions/who.h diff --git a/templates/dir.cpp b/templates/dir.cpp index 2fdbf72..d3e08d1 100755 --- a/templates/dir.cpp +++ b/templates/dir.cpp @@ -19,9 +19,9 @@ namespace TemplatesFunctions void dir(Info & i) { - for(size_t a=0 ; adir_table.size() ; ++a) + for(size_t a=0 ; adir_tab.size() ; ++a) { - HtmlEscape(i.out, request->dir_table[a]->url); + HtmlEscape(i.out, request->dir_tab[a]->url); i.out << '/'; } } @@ -29,11 +29,11 @@ void dir(Info & i) void dir_without_slash(Info & i) { - for(size_t a=0 ; adir_table.size() ; ++a) + for(size_t a=0 ; adir_tab.size() ; ++a) { - HtmlEscape(i.out, request->dir_table[a]->url); + HtmlEscape(i.out, request->dir_tab[a]->url); - if( a < request->dir_table.size()-1 ) + if( a < request->dir_tab.size()-1 ) i.out << '/'; } } @@ -41,12 +41,12 @@ void dir_without_slash(Info & i) void dir_parent(Info & i) { - if( request->dir_table.empty() ) + if( request->dir_tab.empty() ) return; - for(size_t a=0 ; adir_table.size()-1 ; ++a) + for(size_t a=0 ; adir_tab.size()-1 ; ++a) { - HtmlEscape(i.out, request->dir_table[a]->url); + HtmlEscape(i.out, request->dir_tab[a]->url); i.out << '/'; } } @@ -54,14 +54,14 @@ void dir_parent(Info & i) void dir_parent_without_slash(Info & i) { - if( request->dir_table.empty() ) + if( request->dir_tab.empty() ) return; - for(size_t a=0 ; adir_table.size()-1 ; ++a) + for(size_t a=0 ; adir_tab.size()-1 ; ++a) { - HtmlEscape(i.out, request->dir_table[a]->url); + HtmlEscape(i.out, request->dir_tab[a]->url); - if( request->dir_table.size()>=2 && adir_table.size()-2 ) + if( request->dir_tab.size()>=2 && adir_tab.size()-2 ) i.out << '/'; } } @@ -73,9 +73,9 @@ void dir_can_read_exec(Info & i) { bool result = true; - for(size_t a=0 ; adir_table.size() ; ++a) + for(size_t a=0 ; adir_tab.size() ; ++a) { - if( !system->HasReadExecAccess(*request->dir_table[a]) ) + if( !system->HasReadExecAccess(*request->dir_tab[a]) ) { result = false; break; @@ -88,7 +88,7 @@ bool result = true; void dir_can_write(Info & i) { - i.res = system->HasWriteAccess(*request->dir_table.back()); + i.res = system->HasWriteAccess(*request->dir_tab.back()); } @@ -97,7 +97,7 @@ void dir_can_remove(Info & i) bool result = true; - if( request->dir_table.size() == 1 ) + if( request->dir_tab.size() == 1 ) { // rm for the root dir // only the superuser can do it @@ -106,7 +106,7 @@ bool result = true; } else { - Item * last_but_one_dir = *(--(--request->dir_table.end())); + Item * last_but_one_dir = *(--(--request->dir_tab.end())); if( !system->HasWriteAccess(*last_but_one_dir) ) result = false; @@ -146,16 +146,16 @@ void dir_childs_tab(Info & i) dir_childs_table.clear(); dir_childs_has_parent = false; - if( !request->dir_table.empty() ) + if( !request->dir_tab.empty() ) { - if( request->dir_table.size() >= 2 && i.par == "with_parent") + if( request->dir_tab.size() >= 2 && i.par == "with_parent") { - Item * dir_up = request->dir_table[request->dir_table.size()-2]; + Item * dir_up = request->dir_tab[request->dir_tab.size()-2]; dir_childs_table.push_back(dir_up); dir_childs_has_parent = true; } - system->dirs.GetDirChilds(request->dir_table.back()->id, dir_childs_table); + system->dirs.GetDirChilds(request->dir_tab.back()->id, dir_childs_table); } } @@ -182,7 +182,9 @@ void dir_childs_tab_url(Info & i) void dir_childs_tab_privileges(Info & i) { if( dir_childs_index < dir_childs_table.size() ) - i.out << "0" << std::setbase(8) << dir_childs_table[dir_childs_index]->privileges << std::setbase(10); + i.out << "0" << std::setbase(8) + << dir_childs_table[dir_childs_index]->privileges + << std::setbase(10); } @@ -234,14 +236,14 @@ static size_t dir_index; void dir_tab(Info & i) { dir_index = i.iter; - i.res = dir_index < request->dir_table.size(); + i.res = dir_index < request->dir_tab.size(); } void dir_tab_url(Info & i) { - if( dir_index < request->dir_table.size() ) - HtmlEscape(i.out, request->dir_table[dir_index]->url); + if( dir_index < request->dir_tab.size() ) + HtmlEscape(i.out, request->dir_tab[dir_index]->url); } @@ -249,9 +251,9 @@ void dir_tab_link(Info & i) { i.out << config->base_url; - for(size_t a = 0 ; a <= dir_index && a < request->dir_table.size() ; ++a) + for(size_t a = 0 ; a <= dir_index && a < request->dir_tab.size() ; ++a) { - HtmlEscape(i.out, request->dir_table[a]->url); + HtmlEscape(i.out, request->dir_tab[a]->url); i.out << '/'; } } @@ -271,21 +273,21 @@ void dir_last_default_item_init() dir_last_default_item.Clear(); - if( request->dir_table.empty() ) + if( request->dir_tab.empty() ) return; - long default_item = request->dir_table.back()->default_item; + long default_item = request->dir_tab.back()->default_item; if( default_item == -1 ) return; - std::vector item_table; // !! tymczasowo, nie bedzie tego po zmianie interfejsu dla Db - db->GetItem(item_table, default_item); + std::vector item_tab; // !! tymczasowo, nie bedzie tego po zmianie interfejsu dla Db + db->GetItem(item_tab, default_item); - if( item_table.empty() ) + if( item_tab.empty() ) return; - dir_last_default_item = item_table[0]; + dir_last_default_item = item_tab[0]; } @@ -312,7 +314,7 @@ void dir_last_default_item_url(Info & i) void dir_last_subject(Info & i) { - HtmlEscape(i.out, request->dir_table.back()->subject); + HtmlEscape(i.out, request->dir_tab.back()->subject); } @@ -328,7 +330,7 @@ void dir_last_info(Info & i) void dir_last_user(Info & i) { - User * puser = system->users.GetUser(request->dir_table.back()->user_id); + User * puser = system->users.GetUser(request->dir_tab.back()->user_id); if( puser ) HtmlEscape(i.out, puser->name); @@ -336,8 +338,8 @@ void dir_last_user(Info & i) { i.out << "~"; - if( !request->dir_table.back()->guest_name.empty() ) - HtmlEscape(i.out, request->dir_table.back()->guest_name); + if( !request->dir_tab.back()->guest_name.empty() ) + HtmlEscape(i.out, request->dir_tab.back()->guest_name); else i.out << "guest"; // !! dodac do konfiga } @@ -346,19 +348,19 @@ void dir_last_user(Info & i) void dir_last_url(Info & i) { - HtmlEscape(i.out, request->dir_table.back()->url); + HtmlEscape(i.out, request->dir_tab.back()->url); } void dir_last_url_is(Info & i) { - i.res = request->dir_table.back()->url == i.par; + i.res = request->dir_tab.back()->url == i.par; } void dir_last_date_creation(Info & i) { - tm * ptm = &request->dir_table.back()->date_creation; + tm * ptm = &request->dir_tab.back()->date_creation; i.out << DateToStr(ptm->tm_year + 1900, ptm->tm_mon + 1, ptm->tm_mday, ptm->tm_hour, ptm->tm_min, ptm->tm_sec); } @@ -366,7 +368,7 @@ void dir_last_date_creation(Info & i) void dir_last_date_modification(Info & i) { - tm * ptm = &request->dir_table.back()->date_modification; + tm * ptm = &request->dir_tab.back()->date_modification; i.out << DateToStr(ptm->tm_year + 1900, ptm->tm_mon + 1, ptm->tm_mday, ptm->tm_hour, ptm->tm_min, ptm->tm_sec); } @@ -374,8 +376,8 @@ void dir_last_date_modification(Info & i) void dir_last_dates_equal(Info & i) { - tm * ptm1 = &request->dir_table.back()->date_creation; - tm * ptm2 = &request->dir_table.back()->date_modification; + tm * ptm1 = &request->dir_tab.back()->date_creation; + tm * ptm2 = &request->dir_tab.back()->date_modification; i.res = ptm1->tm_year == ptm2->tm_year && ptm1->tm_mon == ptm2->tm_mon && diff --git a/templates/doc.cpp b/templates/doc.cpp index d483217..719759e 100755 --- a/templates/doc.cpp +++ b/templates/doc.cpp @@ -27,12 +27,12 @@ void doc_title(Info & i) bool was_dir = false; // from 1 means skipping the root directory - for(a = 1 ; adir_table.size() ; ++a) + for(a = 1 ; adir_tab.size() ; ++a) { - HtmlEscape(i.out, request->dir_table[a]->subject); + HtmlEscape(i.out, request->dir_tab[a]->subject); was_dir = true; - if( a < request->dir_table.size()-1 ) + if( a < request->dir_tab.size()-1 ) i.out << config->title_separator; } diff --git a/templates/item.cpp b/templates/item.cpp index 617ef7c..8447948 100755 --- a/templates/item.cpp +++ b/templates/item.cpp @@ -82,27 +82,32 @@ void item_content_noescape(Info & i) } -void item_content_type_is(Info & i) +void item_content_type_is(Item & item, Info & i) { i.res = false; - if( request->item.content_type == Item::ct_text && i.par == "text" ) + if( item.content_type == Item::ct_text && i.par == "text" ) i.res = true; - - if( request->item.content_type == Item::ct_formatted_text && i.par == "formatted text" ) + else + if( item.content_type == Item::ct_formatted_text && i.par == "formatted text" ) i.res = true; - - if( request->item.content_type == Item::ct_html && i.par == "html" ) + else + if( item.content_type == Item::ct_html && i.par == "html" ) i.res = true; - - if( request->item.content_type == Item::ct_bbcode && i.par == "bbcode" ) + else + if( item.content_type == Item::ct_bbcode && i.par == "bbcode" ) i.res = true; - - if( request->item.content_type == Item::ct_raw && i.par == "raw" ) + else + if( item.content_type == Item::ct_raw && i.par == "raw" ) i.res = true; } +void item_content_type_is(Info & i) +{ + item_content_type_is(request->item, i); +} + void item_print_content(std::ostringstream & out, const std::string & content, Item::ContentType content_type) { @@ -210,7 +215,7 @@ void item_can_remove(Info & i) { // !! tutaj trzeba bedzie cos innego zrobic // zwlaszcza jak dojdzie sticky bit - i.res = system->HasWriteAccess(*request->dir_table.back()); + i.res = system->HasWriteAccess(*request->dir_tab.back()); } @@ -331,51 +336,51 @@ static size_t item_index; void item_tab(Info & i) { item_index = i.iter; - i.res = item_index < request->item_table.size(); + i.res = item_index < request->item_tab.size(); } void item_tab_id(Info & i) { - if( item_index < request->item_table.size() ) - i.out << request->item_table[item_index].id; + if( item_index < request->item_tab.size() ) + i.out << request->item_tab[item_index].id; } void item_tab_subject(Info & i) { - if( item_index < request->item_table.size() ) - HtmlEscape(i.out, request->item_table[item_index].subject); + if( item_index < request->item_tab.size() ) + HtmlEscape(i.out, request->item_tab[item_index].subject); } void item_tab_subject_noescape(Info & i) { - if( item_index < request->item_table.size() ) - i.out << request->item_table[item_index].subject; + if( item_index < request->item_tab.size() ) + i.out << request->item_tab[item_index].subject; } void item_tab_content(Info & i) { - if( item_index < request->item_table.size() ) - HtmlEscape(i.out, request->item_table[item_index].content); + if( item_index < request->item_tab.size() ) + HtmlEscape(i.out, request->item_tab[item_index].content); } void item_tab_content_noescape(Info & i) { - if( item_index < request->item_table.size() ) - i.out << request->item_table[item_index].content; + if( item_index < request->item_tab.size() ) + i.out << request->item_tab[item_index].content; } void item_tab_print_content(Info & i) { - if( item_index >= request->item_table.size() ) + if( item_index >= request->item_tab.size() ) return; - std::string & content = request->item_table[item_index].content; - Item::ContentType type = request->item_table[item_index].content_type; + std::string & content = request->item_tab[item_index].content; + Item::ContentType type = request->item_tab[item_index].content_type; item_print_content(i.out, content, type); } @@ -383,19 +388,19 @@ void item_tab_print_content(Info & i) void item_tab_privileges(Info & i) { - if( item_index < request->item_table.size() ) - i.out << "0" << std::setbase(8) << request->item_table[item_index].privileges << std::setbase(10); + if( item_index < request->item_tab.size() ) + i.out << "0" << std::setbase(8) << request->item_tab[item_index].privileges << std::setbase(10); } void item_tab_dir(Info & i) { - if( item_index < request->item_table.size() ) + if( item_index < request->item_tab.size() ) { std::string path; - if( system->dirs.MakePath(request->item_table[item_index].parent_id, path) ) + if( system->dirs.MakePath(request->item_tab[item_index].parent_id, path) ) HtmlEscape(i.out, path); else i.out << "/the path does not exist/"; @@ -405,14 +410,14 @@ void item_tab_dir(Info & i) void item_tab_url(Info & i) { - if( item_index < request->item_table.size() ) - HtmlEscape(i.out, request->item_table[item_index].url); + if( item_index < request->item_tab.size() ) + HtmlEscape(i.out, request->item_tab[item_index].url); } void item_tab_link(Info & i) { - if( item_index < request->item_table.size() ) + if( item_index < request->item_tab.size() ) { HtmlEscape(i.out, config->base_url); item_tab_dir(i); @@ -423,7 +428,7 @@ void item_tab_link(Info & i) void item_tab_link_auth(Info & i) { - if( item_index < request->item_table.size() ) + if( item_index < request->item_tab.size() ) { HtmlEscape(i.out, config->base_url_auth); item_tab_dir(i); @@ -434,9 +439,9 @@ void item_tab_link_auth(Info & i) void item_tab_can_read(Info & i) { - if( item_index < request->item_table.size() ) + if( item_index < request->item_tab.size() ) { - if( system->HasReadAccess(request->item_table[item_index]) ) + if( system->HasReadAccess(request->item_tab[item_index]) ) i.res = true; } } @@ -444,9 +449,9 @@ void item_tab_can_read(Info & i) void item_tab_can_write(Info & i) { - if( item_index < request->item_table.size() ) + if( item_index < request->item_tab.size() ) { - if( system->HasWriteAccess(request->item_table[item_index]) ) + if( system->HasWriteAccess(request->item_tab[item_index]) ) i.res = true; } } @@ -464,10 +469,10 @@ void item_tab_info(Info & i) void item_tab_user(Info & i) { - if( item_index < request->item_table.size() ) + if( item_index < request->item_tab.size() ) { - User * puser = system->users.GetUser(request->item_table[item_index].user_id); - print_user_name(i, puser, request->item_table[item_index].guest_name); + User * puser = system->users.GetUser(request->item_tab[item_index].user_id); + print_user_name(i, puser, request->item_tab[item_index].guest_name); } } @@ -475,10 +480,10 @@ void item_tab_user(Info & i) void item_tab_modification_user(Info & i) { - if( item_index < request->item_table.size() ) + if( item_index < request->item_tab.size() ) { - User * puser = system->users.GetUser(request->item_table[item_index].modification_user_id); - print_user_name(i, puser, request->item_table[item_index].guest_name); + User * puser = system->users.GetUser(request->item_tab[item_index].modification_user_id); + print_user_name(i, puser, request->item_tab[item_index].guest_name); } } @@ -486,9 +491,9 @@ void item_tab_modification_user(Info & i) void item_tab_users_different(Info & i) { - if( item_index < request->item_table.size() ) + if( item_index < request->item_tab.size() ) { - i.res = (request->item_table[item_index].user_id != request->item_table[item_index].modification_user_id); + i.res = (request->item_tab[item_index].user_id != request->item_tab[item_index].modification_user_id); } } @@ -496,9 +501,9 @@ void item_tab_users_different(Info & i) void item_tab_group(Info & i) { - if( item_index < request->item_table.size() ) + if( item_index < request->item_tab.size() ) { - long group_id = request->item_table[item_index].group_id; + long group_id = request->item_tab[item_index].group_id; Group * pgroup = system->groups.GetGroup(group_id); if( pgroup ) @@ -511,9 +516,9 @@ void item_tab_group(Info & i) void item_tab_date_creation(Info & i) { - if( item_index < request->item_table.size() ) + if( item_index < request->item_tab.size() ) { - tm * ptm = &request->item_table[item_index].date_creation; + tm * ptm = &request->item_tab[item_index].date_creation; i.out << DateToStr(ptm->tm_year + 1900, ptm->tm_mon + 1, ptm->tm_mday, ptm->tm_hour, ptm->tm_min, ptm->tm_sec); } @@ -522,9 +527,9 @@ void item_tab_date_creation(Info & i) void item_tab_date_modification(Info & i) { - if( item_index < request->item_table.size() ) + if( item_index < request->item_tab.size() ) { - tm * ptm = &request->item_table[item_index].date_modification; + tm * ptm = &request->item_tab[item_index].date_modification; i.out << DateToStr(ptm->tm_year + 1900, ptm->tm_mon + 1, ptm->tm_mday, ptm->tm_hour, ptm->tm_min, ptm->tm_sec); } @@ -533,9 +538,9 @@ void item_tab_date_modification(Info & i) void item_tab_date_creation_nice(Info & i) { - if( item_index < request->item_table.size() ) + if( item_index < request->item_tab.size() ) { - tm * ptm = &request->item_table[item_index].date_creation; + tm * ptm = &request->item_tab[item_index].date_creation; print_date_nice(i, ptm); } } @@ -544,9 +549,9 @@ void item_tab_date_creation_nice(Info & i) void item_tab_date_modification_nice(Info & i) { - if( item_index < request->item_table.size() ) + if( item_index < request->item_tab.size() ) { - tm * ptm = &request->item_table[item_index].date_modification; + tm * ptm = &request->item_tab[item_index].date_modification; print_date_nice(i, ptm); } } @@ -554,10 +559,10 @@ void item_tab_date_modification_nice(Info & i) void item_tab_dates_equal(Info & i) { - if( item_index < request->item_table.size() ) + if( item_index < request->item_tab.size() ) { - tm * ptm1 = &request->item_table[item_index].date_creation; - tm * ptm2 = &request->item_table[item_index].date_modification; + tm * ptm1 = &request->item_tab[item_index].date_creation; + tm * ptm2 = &request->item_tab[item_index].date_modification; i.res = ptm1->tm_year == ptm2->tm_year && ptm1->tm_mon == ptm2->tm_mon && @@ -571,7 +576,7 @@ void item_tab_dates_equal(Info & i) void item_tab_run(Info & i) { - if( item_index < request->item_table.size() ) + if( item_index < request->item_tab.size() ) { if( !system->HasReadExecAccess(request->item) ) { @@ -579,7 +584,7 @@ void item_tab_run(Info & i) return; } - Ezc::Pattern * p = pattern_cacher.GetPattern(request->item_table[item_index]); + Ezc::Pattern * p = pattern_cacher.GetPattern(request->item_tab[item_index]); Ezc::Generator gen(i.out, *p, ezc_functions); gen.Generate(); } @@ -588,10 +593,10 @@ void item_tab_run(Info & i) void item_tab_can_use_emacs(Info & i) { - if( item_index < request->item_table.size() ) + if( item_index < request->item_tab.size() ) { // !! - //i.res = request->CanUseEmacs(request->item_table[item_index], true); + //i.res = request->CanUseEmacs(request->item_tab[item_index], true); } } diff --git a/templates/localefilter.cpp b/templates/localefilter.cpp index 2c69e2c..4b58fb1 100755 --- a/templates/localefilter.cpp +++ b/templates/localefilter.cpp @@ -102,9 +102,9 @@ void LocaleFilter::FilterText(Ezc::Pattern::Item & item) if( !item.text.empty() ) Parse(item.text); - std::vector::iterator i = item.item_table.begin(); + std::vector::iterator i = item.item_tab.begin(); - for( ; i != item.item_table.end() ; ++i ) + for( ; i != item.item_tab.end() ; ++i ) FilterText(**i); } diff --git a/templates/misc.cpp b/templates/misc.cpp index aba0a85..4ee7391 100755 --- a/templates/misc.cpp +++ b/templates/misc.cpp @@ -39,13 +39,13 @@ int ParseCKeditorFun() { ckeditor_getparser.fun_num = 2; // default if there is a problem with parsing info - if( !request->get_table.empty() ) + if( !request->get_tab.empty() ) { - size_t last = request->get_table.size()-1; + size_t last = request->get_tab.size()-1; - if( !request->get_table[last].empty() ) + if( !request->get_tab[last].empty() ) { - const char * str = request->get_table[last].c_str() + 1; // the first char is '?' + const char * str = request->get_tab[last].c_str() + 1; // the first char is '?' ckeditor_getparser.Parse(str); } } diff --git a/templates/priv.cpp b/templates/priv.cpp index 474db29..6663c7e 100755 --- a/templates/priv.cpp +++ b/templates/priv.cpp @@ -57,7 +57,7 @@ void priv_user_tab_init() if( request->is_item ) priv_user_tab_init(request->item); else - priv_user_tab_init(*request->dir_table.back()); + priv_user_tab_init(*request->dir_tab.back()); } @@ -110,7 +110,7 @@ void priv_user_tab_isdefault(Info & i) } else { - if( uid == request->dir_table.back()->user_id ) + if( uid == request->dir_tab.back()->user_id ) i.res = true; } } @@ -182,7 +182,7 @@ void priv_group_tab_init() if( request->is_item ) priv_group_tab_init(request->item); else - priv_group_tab_init(*request->dir_table.back()); + priv_group_tab_init(*request->dir_tab.back()); } @@ -235,7 +235,7 @@ void priv_group_tab_isdefault(Info & i) } else { - if( gid == request->dir_table.back()->group_id ) + if( gid == request->dir_tab.back()->group_id ) i.res = true; } } @@ -247,7 +247,7 @@ void priv_privileges(Info & i) if( request->is_item ) i.out << std::setbase(8) << request->item.privileges << std::setbase(10); else - i.out << std::setbase(8) << request->dir_table.back()->privileges << std::setbase(10); + i.out << std::setbase(8) << request->dir_tab.back()->privileges << std::setbase(10); } @@ -267,13 +267,13 @@ void priv_privileges_for_dirs(Info & i) void priv_show_form_chown(Info & i) { - i.res = (request->pfunction->fun.url == "priv" || request->pfunction->fun.url == "chown"); + i.res = (request->function->fun.url == "priv" || request->function->fun.url == "chown"); } void priv_show_form_chmod(Info & i) { - i.res = (request->pfunction->fun.url == "priv" || request->pfunction->fun.url == "chmod"); + i.res = (request->function->fun.url == "priv" || request->function->fun.url == "chmod"); } diff --git a/templates/templates.cpp b/templates/templates.cpp index 488329d..93862a4 100755 --- a/templates/templates.cpp +++ b/templates/templates.cpp @@ -43,7 +43,7 @@ Ezc::Pattern * content_for_function() { Ezc::Pattern * p = 0; - if( !request->pfunction ) + if( !request->function ) { log << log1 << "Templates: no function" << logend; return p; @@ -84,7 +84,7 @@ Ezc::Pattern * p = 0; for(i=0 ; ipfunction->fun.url.c_str()) == 0 ) + if( strcmp(pat_name_tab[i].fun_name, request->function->fun.url.c_str()) == 0 ) { // !! locale.GetLang() bedzie brane indywidualnie dla kazdego uzytkownika p = &patterns[locale.GetLang()][pat_name_tab[i].pat]; @@ -360,22 +360,25 @@ void Templates::CreateFunctions() /* thread */ - ezc_functions.Insert("thread_is", thread_is); - ezc_functions.Insert("thread_tab", thread_tab); - ezc_functions.Insert("thread_tab_url", thread_tab_url); - ezc_functions.Insert("thread_tab_subject", thread_tab_subject); - ezc_functions.Insert("thread_tab_author", thread_tab_author); - ezc_functions.Insert("thread_tab_answers", thread_tab_answers); + ezc_functions.Insert("thread_is", thread_is); + ezc_functions.Insert("thread_tab", thread_tab); + ezc_functions.Insert("thread_tab_url", thread_tab_url); + ezc_functions.Insert("thread_tab_subject", thread_tab_subject); + ezc_functions.Insert("thread_tab_author", thread_tab_author); + ezc_functions.Insert("thread_tab_answers", thread_tab_answers); ezc_functions.Insert("thread_tab_last_item_date_modification", thread_tab_last_item_date_modification); ezc_functions.Insert("thread_tab_last_item_date_modification_nice", thread_tab_last_item_date_modification_nice); - ezc_functions.Insert("thread_tab_last_item_user", thread_tab_last_item_user); - ezc_functions.Insert("thread_can_create", thread_can_create); + ezc_functions.Insert("thread_tab_last_item_user", thread_tab_last_item_user); + ezc_functions.Insert("thread_can_create", thread_can_create); /* ticket */ ezc_functions.Insert("ticket_is", ticket_is); + ezc_functions.Insert("ticket_item_content", ticket_item_content); + ezc_functions.Insert("ticket_item_content_type_is", ticket_item_content_type_is); + ezc_functions.Insert("ticket_item_print_content", ticket_item_print_content); ezc_functions.Insert("ticket_can_create", ticket_can_create); ezc_functions.Insert("ticket_can_edit", ticket_can_edit); ezc_functions.Insert("ticket_type", ticket_type); diff --git a/templates/templates.h b/templates/templates.h index 08a3bd4..972df88 100755 --- a/templates/templates.h +++ b/templates/templates.h @@ -129,6 +129,7 @@ namespace TemplatesFunctions void item_subject_noescape(Info & i); void item_content(Info & i); void item_content_noescape(Info & i); + void item_content_type_is(Item & item, Info & i); void item_content_type_is(Info & i); void item_content_is_empty(Info & i); void item_print_content(std::ostringstream & out, const std::string & content, Item::ContentType content_type); @@ -294,6 +295,9 @@ namespace TemplatesFunctions ticket */ void ticket_is(Info & i); // !! change to is_ticket lub na ticket_defined + void ticket_item_content(Info & i); + void ticket_item_content_type_is(Info & i); + void ticket_item_print_content(Info & i); void ticket_can_create(Info & i); void ticket_can_edit(Info & i); void ticket_type(Info & i); diff --git a/templates/thread.cpp b/templates/thread.cpp index c2d771a..519935d 100755 --- a/templates/thread.cpp +++ b/templates/thread.cpp @@ -9,8 +9,9 @@ #include "templates.h" #include "misc.h" -#include "../core/request.h" -#include "../core/misc.h" +#include "core/request.h" +#include "core/misc.h" +#include "functions/functions.h" @@ -19,11 +20,14 @@ namespace TemplatesFunctions void thread_is(Info & i) { - i.res = request->is_thread; + i.res = functions->fun_thread.is_thread; } + + + static size_t thread_tab_index; @@ -32,15 +36,15 @@ void thread_tab(Info & i) { thread_tab_index = i.iter; - i.res = thread_tab_index < request->thread_tab.size(); + i.res = thread_tab_index < functions->fun_thread.thread_tab.size(); } void thread_tab_url(Info & i) { - if( thread_tab_index < request->thread_tab.size() ) + if( thread_tab_index < functions->fun_thread.thread_tab.size() ) { - Item * dir = system->dirs.GetDir( request->thread_tab[thread_tab_index].dir_id ); + Item * dir = system->dirs.GetDir( functions->fun_thread.thread_tab[thread_tab_index].dir_id ); if( dir ) { @@ -56,9 +60,9 @@ void thread_tab_url(Info & i) void thread_tab_subject(Info & i) { - if( thread_tab_index < request->thread_tab.size() ) + if( thread_tab_index < functions->fun_thread.thread_tab.size() ) { - Item * dir = system->dirs.GetDir( request->thread_tab[thread_tab_index].dir_id ); + Item * dir = system->dirs.GetDir( functions->fun_thread.thread_tab[thread_tab_index].dir_id ); if( dir ) { @@ -77,9 +81,9 @@ void thread_tab_subject(Info & i) void thread_tab_answers(Info & i) { - if( thread_tab_index < request->thread_tab.size() ) + if( thread_tab_index < functions->fun_thread.thread_tab.size() ) { - long a = request->thread_tab[thread_tab_index].items; + long a = functions->fun_thread.thread_tab[thread_tab_index].items; // the first is created by the author // we count only the rest @@ -96,9 +100,9 @@ void thread_tab_author(Info & i) bool unknown = true; - if( thread_tab_index < request->thread_tab.size() ) + if( thread_tab_index < functions->fun_thread.thread_tab.size() ) { - Item * dir = system->dirs.GetDir( request->thread_tab[thread_tab_index].dir_id ); + Item * dir = system->dirs.GetDir( functions->fun_thread.thread_tab[thread_tab_index].dir_id ); if( dir ) { @@ -129,27 +133,27 @@ bool unknown = true; void thread_tab_last_item_date_modification(Info & i) { - if( thread_tab_index < request->thread_tab.size() ) - if( request->thread_tab[thread_tab_index].last_item.id != -1 ) - i.out << DateToStr( &request->thread_tab[thread_tab_index].last_item.date_modification ); + if( thread_tab_index < functions->fun_thread.thread_tab.size() ) + if( functions->fun_thread.thread_tab[thread_tab_index].last_item.id != -1 ) + i.out << DateToStr( &functions->fun_thread.thread_tab[thread_tab_index].last_item.date_modification ); } void thread_tab_last_item_date_modification_nice(Info & i) { - if( thread_tab_index < request->thread_tab.size() ) - if( request->thread_tab[thread_tab_index].last_item.id != -1 ) - print_date_nice(i, &request->thread_tab[thread_tab_index].last_item.date_modification); + if( thread_tab_index < functions->fun_thread.thread_tab.size() ) + if( functions->fun_thread.thread_tab[thread_tab_index].last_item.id != -1 ) + print_date_nice(i, &functions->fun_thread.thread_tab[thread_tab_index].last_item.date_modification); } void thread_tab_last_item_user(Info & i) { - if( thread_tab_index < request->thread_tab.size() ) + if( thread_tab_index < functions->fun_thread.thread_tab.size() ) { - if( request->thread_tab[thread_tab_index].last_item.id != -1 ) + if( functions->fun_thread.thread_tab[thread_tab_index].last_item.id != -1 ) { - User * puser = system->users.GetUser( request->thread_tab[thread_tab_index].last_item.user_id ); + User * puser = system->users.GetUser( functions->fun_thread.thread_tab[thread_tab_index].last_item.user_id ); if( puser ) HtmlEscape(i.out, puser->name); @@ -157,8 +161,8 @@ void thread_tab_last_item_user(Info & i) { i.out << "~"; - if( !request->thread_tab[thread_tab_index].last_item.guest_name.empty() ) - HtmlEscape(i.out, request->thread_tab[thread_tab_index].last_item.guest_name); + if( !functions->fun_thread.thread_tab[thread_tab_index].last_item.guest_name.empty() ) + HtmlEscape(i.out, functions->fun_thread.thread_tab[thread_tab_index].last_item.guest_name); else i.out << "guest"; // !! dodac do konfiga } diff --git a/templates/ticket.cpp b/templates/ticket.cpp index ca9620b..13738fd 100755 --- a/templates/ticket.cpp +++ b/templates/ticket.cpp @@ -34,7 +34,26 @@ return percent; void ticket_is(Info & i) { - i.res = request->is_ticket; + i.res = functions->fun_ticket.is_ticket; +} + + + +void ticket_item_content(Info & i) +{ + HtmlEscape(i.out, functions->fun_ticket.item.content); +} + + +void ticket_item_content_type_is(Info & i) +{ + item_content_type_is(functions->fun_ticket.item, i); +} + + +void ticket_item_print_content(Info & i) +{ + item_print_content(i.out, functions->fun_ticket.item.content, functions->fun_ticket.item.content_type); } @@ -56,49 +75,49 @@ void ticket_can_edit(Info & i) void ticket_type(Info & i) { - if( request->ticket.type < system->mounts.pmount->param[Mount::par_ticket_type].arg.size() ) - HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_type].arg[request->ticket.type]); + if( functions->fun_ticket.ticket.type < system->mounts.pmount->param[Mount::par_ticket_type].arg.size() ) + HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_type].arg[functions->fun_ticket.ticket.type]); } void ticket_status(Info & i) { - if( request->ticket.status < system->mounts.pmount->param[Mount::par_ticket_status].arg.size() ) - HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_status].arg[request->ticket.status]); + if( functions->fun_ticket.ticket.status < system->mounts.pmount->param[Mount::par_ticket_status].arg.size() ) + HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_status].arg[functions->fun_ticket.ticket.status]); } void ticket_priority(Info & i) { - if( request->ticket.priority < system->mounts.pmount->param[Mount::par_ticket_priority].arg.size() ) - HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_priority].arg[request->ticket.priority]); + if( functions->fun_ticket.ticket.priority < system->mounts.pmount->param[Mount::par_ticket_priority].arg.size() ) + HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_priority].arg[functions->fun_ticket.ticket.priority]); } void ticket_category(Info & i) { - if( request->ticket.category < system->mounts.pmount->param[Mount::par_ticket_category].arg.size() ) - HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_category].arg[request->ticket.category]); + if( functions->fun_ticket.ticket.category < system->mounts.pmount->param[Mount::par_ticket_category].arg.size() ) + HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_category].arg[functions->fun_ticket.ticket.category]); } void ticket_expected(Info & i) { - if( request->ticket.expected < system->mounts.pmount->param[Mount::par_ticket_expected].arg.size() ) - HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_expected].arg[request->ticket.expected]); + if( functions->fun_ticket.ticket.expected < system->mounts.pmount->param[Mount::par_ticket_expected].arg.size() ) + HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_expected].arg[functions->fun_ticket.ticket.expected]); } void ticket_progress(Info & i) { - i.out << request->ticket.progress; + i.out << functions->fun_ticket.ticket.progress; } void ticket_progress_image_number(Info & i) { - int percent = request->ticket.progress; + int percent = functions->fun_ticket.ticket.progress; i.out << ticket_calc_progress_image_number(percent); } @@ -116,15 +135,15 @@ void ticket_tab(Info & i) { ticket_tab_index = i.iter; - i.res = ticket_tab_index < request->ticket_tab.size(); + i.res = ticket_tab_index < functions->fun_ticket.ticket_tab.size(); } void ticket_tab_url(Info & i) { - if( ticket_tab_index < request->ticket_tab.size() ) + if( ticket_tab_index < functions->fun_ticket.ticket_tab.size() ) { - Item * dir = system->dirs.GetDir( request->ticket_tab[ticket_tab_index].dir_id ); + Item * dir = system->dirs.GetDir( functions->fun_ticket.ticket_tab[ticket_tab_index].dir_id ); if( dir ) { @@ -140,9 +159,9 @@ void ticket_tab_url(Info & i) void ticket_tab_subject(Info & i) { - if( ticket_tab_index < request->ticket_tab.size() ) + if( ticket_tab_index < functions->fun_ticket.ticket_tab.size() ) { - Item * dir = system->dirs.GetDir( request->ticket_tab[ticket_tab_index].dir_id ); + Item * dir = system->dirs.GetDir( functions->fun_ticket.ticket_tab[ticket_tab_index].dir_id ); if( dir ) { @@ -163,9 +182,9 @@ void ticket_tab_subject_empty(Info & i) { i.res = true; - if( ticket_tab_index < request->ticket_tab.size() ) + if( ticket_tab_index < functions->fun_ticket.ticket_tab.size() ) { - Item * dir = system->dirs.GetDir( request->ticket_tab[ticket_tab_index].dir_id ); + Item * dir = system->dirs.GetDir( functions->fun_ticket.ticket_tab[ticket_tab_index].dir_id ); if( dir ) i.res = dir->subject.empty(); @@ -178,9 +197,9 @@ void ticket_tab_author(Info & i) bool unknown = true; - if( ticket_tab_index < request->ticket_tab.size() ) + if( ticket_tab_index < functions->fun_ticket.ticket_tab.size() ) { - Item * dir = system->dirs.GetDir( request->ticket_tab[ticket_tab_index].dir_id ); + Item * dir = system->dirs.GetDir( functions->fun_ticket.ticket_tab[ticket_tab_index].dir_id ); if( dir ) { @@ -212,10 +231,10 @@ bool unknown = true; void ticket_tab_type(Info & i) { - if( ticket_tab_index >= request->ticket_tab.size() ) + if( ticket_tab_index >= functions->fun_ticket.ticket_tab.size() ) return; - Ticket & t = request->ticket_tab[ticket_tab_index]; + Ticket & t = functions->fun_ticket.ticket_tab[ticket_tab_index]; if( t.type < system->mounts.pmount->param[Mount::par_ticket_type].arg.size() ) HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_type].arg[t.type]); @@ -224,10 +243,10 @@ void ticket_tab_type(Info & i) void ticket_tab_status(Info & i) { - if( ticket_tab_index >= request->ticket_tab.size() ) + if( ticket_tab_index >= functions->fun_ticket.ticket_tab.size() ) return; - Ticket & t = request->ticket_tab[ticket_tab_index]; + Ticket & t = functions->fun_ticket.ticket_tab[ticket_tab_index]; if( t.status < system->mounts.pmount->param[Mount::par_ticket_status].arg.size() ) HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_status].arg[t.status]); @@ -236,10 +255,10 @@ void ticket_tab_status(Info & i) void ticket_tab_priority(Info & i) { - if( ticket_tab_index >= request->ticket_tab.size() ) + if( ticket_tab_index >= functions->fun_ticket.ticket_tab.size() ) return; - Ticket & t = request->ticket_tab[ticket_tab_index]; + Ticket & t = functions->fun_ticket.ticket_tab[ticket_tab_index]; if( t.priority < system->mounts.pmount->param[Mount::par_ticket_priority].arg.size() ) HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_priority].arg[t.priority]); @@ -248,10 +267,10 @@ void ticket_tab_priority(Info & i) void ticket_tab_category(Info & i) { - if( ticket_tab_index >= request->ticket_tab.size() ) + if( ticket_tab_index >= functions->fun_ticket.ticket_tab.size() ) return; - Ticket & t = request->ticket_tab[ticket_tab_index]; + Ticket & t = functions->fun_ticket.ticket_tab[ticket_tab_index]; if( t.category < system->mounts.pmount->param[Mount::par_ticket_category].arg.size() ) HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_category].arg[t.category]); @@ -260,10 +279,10 @@ void ticket_tab_category(Info & i) void ticket_tab_expected(Info & i) { - if( ticket_tab_index >= request->ticket_tab.size() ) + if( ticket_tab_index >= functions->fun_ticket.ticket_tab.size() ) return; - Ticket & t = request->ticket_tab[ticket_tab_index]; + Ticket & t = functions->fun_ticket.ticket_tab[ticket_tab_index]; if( t.expected < system->mounts.pmount->param[Mount::par_ticket_expected].arg.size() ) HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_expected].arg[t.expected]); @@ -272,19 +291,19 @@ void ticket_tab_expected(Info & i) void ticket_tab_progress(Info & i) { - if( ticket_tab_index >= request->ticket_tab.size() ) + if( ticket_tab_index >= functions->fun_ticket.ticket_tab.size() ) return; - i.out << request->ticket_tab[ticket_tab_index].progress; + i.out << functions->fun_ticket.ticket_tab[ticket_tab_index].progress; } void ticket_tab_progress_image_number(Info & i) { - if( ticket_tab_index >= request->ticket_tab.size() ) + if( ticket_tab_index >= functions->fun_ticket.ticket_tab.size() ) return; - int percent = request->ticket_tab[ticket_tab_index].progress; + int percent = functions->fun_ticket.ticket_tab[ticket_tab_index].progress; i.out << ticket_calc_progress_image_number(percent); } @@ -311,9 +330,9 @@ void ticket_type_tab_defined(Info & i) void ticket_type_tab_isdefault(Info & i) { - if( request->is_ticket ) + if( functions->fun_ticket.is_ticket ) { - i.res = (ticket_type_tab_ind == request->ticket.type); + i.res = (ticket_type_tab_ind == functions->fun_ticket.ticket.type); } else { @@ -363,9 +382,9 @@ void ticket_status_tab_defined(Info & i) void ticket_status_tab_isdefault(Info & i) { - if( request->is_ticket ) + if( functions->fun_ticket.is_ticket ) { - i.res = (ticket_status_tab_ind == request->ticket.status); + i.res = (ticket_status_tab_ind == functions->fun_ticket.ticket.status); } else { @@ -414,9 +433,9 @@ void ticket_priority_tab_defined(Info & i) void ticket_priority_tab_isdefault(Info & i) { - if( request->is_ticket ) + if( functions->fun_ticket.is_ticket ) { - i.res = (ticket_priority_tab_ind == request->ticket.priority); + i.res = (ticket_priority_tab_ind == functions->fun_ticket.ticket.priority); } else { @@ -465,9 +484,9 @@ void ticket_category_tab_defined(Info & i) void ticket_category_tab_isdefault(Info & i) { - if( request->is_ticket ) + if( functions->fun_ticket.is_ticket ) { - i.res = (ticket_category_tab_ind == request->ticket.category); + i.res = (ticket_category_tab_ind == functions->fun_ticket.ticket.category); } else { @@ -517,9 +536,9 @@ void ticket_expected_tab_defined(Info & i) void ticket_expected_tab_isdefault(Info & i) { - if( request->is_ticket ) + if( functions->fun_ticket.is_ticket ) { - i.res = (ticket_expected_tab_ind == request->ticket.expected); + i.res = (ticket_expected_tab_ind == functions->fun_ticket.ticket.expected); } else { diff --git a/templates/winix.cpp b/templates/winix.cpp index 6e7d895..fc430b4 100755 --- a/templates/winix.cpp +++ b/templates/winix.cpp @@ -40,16 +40,16 @@ void winix_users_logged(Info & i) void winix_function(Info & i) { - i.out << request->pfunction->fun.url; + i.out << request->function->fun.url; } void winix_function_is(Info & i) { - if( !request->pfunction ) + if( !request->function ) return; - i.res = (request->pfunction->fun.url == i.par); + i.res = (request->function->fun.url == i.par); } @@ -173,8 +173,8 @@ char buff[40]; void winix_show_content_in_full_window(Info & i) { - if( request->pfunction ) - i.res = (request->pfunction->fun.url == "ckeditor" || request->pfunction->fun.url == "tinymce"); + if( request->function ) + i.res = (request->function->fun.url == "ckeditor" || request->function->fun.url == "tinymce"); } diff --git a/templatesnotify/Makefile.dep b/templatesnotify/Makefile.dep index 2afe215..4a5f6e8 100755 --- a/templatesnotify/Makefile.dep +++ b/templatesnotify/Makefile.dep @@ -6,14 +6,13 @@ notify.o: ../templates/misc.h ../templates/localefilter.h ../core/locale.h notify.o: ../core/notify.h ../templatesnotify/templatesnotify.h notify.o: ../core/request.h ../core/requesttypes.h ../core/session.h notify.o: ../core/item.h ../core/error.h ../core/log.h ../core/user.h -notify.o: ../core/plugindata.h ../core/rebus.h ../core/thread.h -notify.o: ../core/compress.h ../core/acceptencodingparser.h -notify.o: ../core/acceptbaseparser.h ../core/htmlfilter.h -notify.o: ../core/postmultiparser.h ../core/config.h ../core/ticket.h +notify.o: ../core/plugindata.h ../core/rebus.h ../core/compress.h +notify.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h +notify.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/config.h notify.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../core/db.h -notify.o: ../core/group.h ../core/ugcontainer.h ../core/mounts.h -notify.o: ../core/mount.h ../core/users.h ../core/lastcontainer.h -notify.o: ../core/groups.h ../core/loadavg.h +notify.o: ../core/group.h ../core/thread.h ../core/ugcontainer.h +notify.o: ../core/ticket.h ../core/mounts.h ../core/mount.h ../core/users.h +notify.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h templatesnotify.o: templatesnotify.h ../../ezc/src/ezc.h ../core/mount.h templatesnotify.o: ../core/locale.h ../core/confparser.h ../core/config.h templatesnotify.o: ../templates/misc.h ../templates/localefilter.h
{who_table_index}{user}{who_table_start}{who_table_last_active}
{who_tab_index}{user}{who_tab_start}{who_tab_last_active}
[who_tab_lp][who_tab_user][who_tab_time][who_tab_last_time]