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

add closing dialogs, redirecting and removing content functionality to the winix framework

Browse Source 
add such new methods to FunctionBase:
- bool can_push_url_to_browser_history();
- void add_standard_models();
- void close_modal_dialogs();

- void prepare_doc_url(const wchar_t * local_url, pt::WTextStream & url);
- void prepare_doc_url(const wchar_t * local_url, std::wstring & url);
- std::wstring prepare_doc_url(const wchar_t * local_url = nullptr);
- std::wstring prepare_doc_url(const std::wstring & local_url);

- void redirect_to(const wchar_t * url, bool append_domain = true);
- void redirect_to(const std::wstring & url, bool append_domain = true);
- void redirect_to(const pt::WTextStream & url, bool append_domain = true);

- void redirect_to(const wchar_t * url, const wchar_t * frame_url, const wchar_t * dom_target);
- void redirect_to(const std::wstring & url, const std::wstring & frame_url, const std::wstring & dom_target);
- void redirect_to(pt::WTextStream & url, pt::WTextStream & frame_url, pt::WTextStream & dom_target);
- void redirect_to(pt::WTextStream & url, pt::WTextStream & frame_url, const wchar_t * dom_target);
- void redirect_to(const wchar_t * url, const wchar_t * frame_url, pt::WTextStream & dom_target);

- void retarged(const wchar_t * frame, const wchar_t * dom_target, const wchar_t * push_url = nullptr, const wchar_t * swap_algorithm = nullptr);
- void retarged(const std::wstring & frame, const std::wstring & dom_target, const std::wstring & push_url, const wchar_t * swap_algorithm = nullptr);
- void retarged(const wchar_t * frame, pt::WTextStream & dom_target, const wchar_t * push_url = nullptr, const wchar_t * swap_algorithm = nullptr);

- void remove_content(pt::WTextStream & dom_target, bool close_dialogs = false);
- void remove_content(const wchar_t * dom_target, bool has_postfix, long dom_target_postfix, bool close_dialogs = false);
- void remove_content(const wchar_t * dom_target, long dom_target_postfix, bool close_dialogs = false);
- void remove_content(const wchar_t * dom_target, bool close_dialogs = false);

- void update_content(const wchar_t * frame, pt::WTextStream & dom_target, bool close_dialogs = false);
- void update_content(const wchar_t * frame, const wchar_t * dom_target, bool has_postfix, long dom_target_postfix, bool close_dialogs = false);
- void update_content(const wchar_t * frame, const wchar_t * dom_target, long dom_target_postfix, bool close_dialogs = false);
- void update_content(const wchar_t * frame, const wchar_t * dom_target, bool close_dialogs = false);

while here:
- refactor PascalCase to snake_case in FunctionBase
- add start_request() and finish_request() methods to FunctionBase
- add has_*_access() methods to FunctionBase
- fix: FunctionBase::clear() method was not called if a request was assigned to a job
- add a WinixEzcHelper model
- allow to serialize a header if the header value is neither a string nor an integer
- refactor PascalCase to snake_case in functions: Emacs, Mkdir, Upload
This commit is contained in:
Tomasz Sowa
2024-06-27 10:57:08 +02:00
parent 6aa100f12c
commit c30b7db041
129 changed files with 4064 additions and 3199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
winixd/plugins/ticket/Makefile.dep
View File

@@ -99,6 +99,31 @@
./createticket.o: ../../../../winix/winixd/core/mounts.h
./createticket.o: ../../../../winix/winixd/core/mountparser.h
./createticket.o: ../../../../winix/winixd/core/jobtask.h
./createticket.o: ../../../../winix/winixd/core/winixrequest.h
./createticket.o: ../../../../winix/winixd/core/winixsystem.h
./createticket.o: ../../../../winix/winixd/core/system.h
./createticket.o: ../../../../winix/winixd/core/job.h
./createticket.o: ../../../../winix/winixd/core/basethread.h
./createticket.o: ../../../../winix/winixd/core/cur.h
./createticket.o: ../../../../winix/winixd/core/request.h
./createticket.o: ../../../../winix/winixd/core/session.h
./createticket.o: ../../../../winix/winixd/models/user.h
./createticket.o: ../../../../winix/winixd/core/rebus.h
./createticket.o: ../../../../winix/winixd/core/ipban.h
./createticket.o: ../../../../winix/winixd/core/loadavg.h
./createticket.o: ../../../../winix/winixd/requestjobs/requestjobbase.h
./createticket.o: ../../../../winix/winixd/core/dirs.h
./createticket.o: ../../../../winix/winixd/core/dircontainer.h
./createticket.o: ../../../../winix/winixd/core/crypt.h
./createticket.o: ../../../../winix/winixd/core/run.h
./createticket.o: ../../../../winix/winixd/core/users.h
./createticket.o: ../../../../winix/winixd/core/ugcontainer.h
./createticket.o: ../../../../winix/winixd/core/lastcontainer.h
./createticket.o: ../../../../winix/winixd/core/groups.h
./createticket.o: ../../../../winix/winixd/models/group.h
./createticket.o: ../../../../winix/winixd/core/image.h
./createticket.o: ../../../../winix/winixd/core/threadmanager.h
./createticket.o: ../../../../winix/winixd/models/winixmodelconnector.h
./createticket.o: ../../../../winix/winixd/notify/notify.h
./createticket.o: ../../../../winix/winixd/notify/notifypool.h
./createticket.o: ../../../../winix/winixd/templates/locale.h
@@ -108,31 +133,6 @@
./createticket.o: ../../../../winix/winixd/core/basethread.h
./createticket.o: ../../../../winix/winixd/notify/templatesnotify.h
./createticket.o: ../../../../winix/winixd/core/users.h
./createticket.o: ../../../../winix/winixd/models/user.h
./createticket.o: ../../../../winix/winixd/core/ugcontainer.h
./createticket.o: ../../../../winix/winixd/core/lastcontainer.h
./createticket.o: ../../../../winix/winixd/core/cur.h
./createticket.o: ../../../../winix/winixd/core/request.h
./createticket.o: ../../../../winix/winixd/core/session.h
./createticket.o: ../../../../winix/winixd/core/rebus.h
./createticket.o: ../../../../winix/winixd/core/ipban.h
./createticket.o: ../../../../winix/winixd/core/winixrequest.h
./createticket.o: ../../../../winix/winixd/core/winixsystem.h
./createticket.o: ../../../../winix/winixd/core/system.h
./createticket.o: ../../../../winix/winixd/core/job.h
./createticket.o: ../../../../winix/winixd/core/basethread.h
./createticket.o: ../../../../winix/winixd/core/loadavg.h
./createticket.o: ../../../../winix/winixd/requestjobs/requestjobbase.h
./createticket.o: ../../../../winix/winixd/core/dirs.h
./createticket.o: ../../../../winix/winixd/core/dircontainer.h
./createticket.o: ../../../../winix/winixd/core/crypt.h
./createticket.o: ../../../../winix/winixd/core/run.h
./createticket.o: ../../../../winix/winixd/core/users.h
./createticket.o: ../../../../winix/winixd/core/groups.h
./createticket.o: ../../../../winix/winixd/models/group.h
./createticket.o: ../../../../winix/winixd/core/image.h
./createticket.o: ../../../../winix/winixd/core/threadmanager.h
./createticket.o: ../../../../winix/winixd/models/winixmodelconnector.h
./createticket.o: ../../../../winix/winixd/core/timezones.h
./createticket.o: ../../../../winix/winixd/core/timezone.h
./createticket.o: ../../../../winix/winixd/core/cur.h
@@ -141,6 +141,7 @@
./createticket.o: ../../../../winix/winixd/core/ipbancontainer.h
./createticket.o: ../../../../winix/winixd/core/sessionidmanager.h
./createticket.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h
./createticket.o: ../../../../winix/winixd/models/helpers/winixezchelper.h
./createticket.o: ticketinfo.h ../../../../winix/winixd/functions/functions.h
./createticket.o: ../../../../winix/winixd/functions/functionbase.h
./createticket.o: ../../../../winix/winixd/functions/functionparser.h
@@ -260,6 +261,7 @@
./editticket.o: ../../../../winix/winixd/core/system.h
./editticket.o: ../../../../winix/winixd/core/job.h
./editticket.o: ../../../../winix/winixd/core/basethread.h
./editticket.o: ../../../../winix/winixd/core/winixmodeldeprecated.h
./editticket.o: ../../../../winix/winixd/core/jobtask.h
./editticket.o: ../../../../winix/winixd/core/cur.h
./editticket.o: ../../../../winix/winixd/core/request.h
@@ -295,7 +297,6 @@
./editticket.o: ../../../../winix/winixd/models/item.h
./editticket.o: ../../../../winix/winixd/models/itemcontent.h
./editticket.o: ../../../../winix/winixd/templates/htmltextstream.h
./editticket.o: ../../../../winix/winixd/core/winixmodeldeprecated.h
./editticket.o: ../../../../winix/winixd/requestjobs/requestjobbase.h
./editticket.o: ../../../../winix/winixd/core/request.h
./editticket.o: ../../../../winix/winixd/core/requesttypes.h
@@ -309,9 +310,10 @@
./editticket.o: ../../../../winix/winixd/core/crypt.h
./editticket.o: ../../../../winix/winixd/core/run.h
./editticket.o: ../../../../winix/winixd/core/users.h
./editticket.o: ../../../../winix/winixd/core/ugcontainer.h
./editticket.o: ../../../../winix/winixd/core/lastcontainer.h
./editticket.o: ../../../../winix/winixd/core/groups.h
./editticket.o: ../../../../winix/winixd/models/group.h
./editticket.o: ../../../../winix/winixd/core/ugcontainer.h
./editticket.o: ../../../../winix/winixd/core/image.h
./editticket.o: ../../../../winix/winixd/core/threadmanager.h
./editticket.o: ../../../../winix/winixd/models/winixmodelconnector.h
@@ -324,7 +326,6 @@
./editticket.o: ../../../../winix/winixd/core/basethread.h
./editticket.o: ../../../../winix/winixd/notify/templatesnotify.h
./editticket.o: ../../../../winix/winixd/core/users.h
./editticket.o: ../../../../winix/winixd/core/lastcontainer.h
./editticket.o: ../../../../winix/winixd/core/timezones.h
./editticket.o: ../../../../winix/winixd/core/timezone.h
./editticket.o: ../../../../winix/winixd/functions/functions.h
@@ -389,6 +390,7 @@
./editticket.o: ../../../../winix/winixd/core/sessionidmanager.h
./editticket.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h
./editticket.o: ../../../../winix/winixd/functions/functionbase.h
./editticket.o: ../../../../winix/winixd/models/helpers/winixezchelper.h
./editticket.o: sessiondata.h ../../../../winix/winixd/core/plugindata.h
./editticket.o: ../../../../winix/winixd/functions/rm.h
./funticket.o: funticket.h tdb.h ticket.h ticketparam.h
@@ -455,6 +457,7 @@
./funticket.o: ../../../../winix/winixd/core/system.h
./funticket.o: ../../../../winix/winixd/core/job.h
./funticket.o: ../../../../winix/winixd/core/basethread.h
./funticket.o: ../../../../winix/winixd/core/winixmodeldeprecated.h
./funticket.o: ../../../../winix/winixd/core/jobtask.h
./funticket.o: ../../../../winix/winixd/core/cur.h
./funticket.o: ../../../../winix/winixd/core/request.h
@@ -490,7 +493,6 @@
./funticket.o: ../../../../winix/winixd/models/item.h
./funticket.o: ../../../../winix/winixd/models/itemcontent.h
./funticket.o: ../../../../winix/winixd/templates/htmltextstream.h
./funticket.o: ../../../../winix/winixd/core/winixmodeldeprecated.h
./funticket.o: ../../../../winix/winixd/requestjobs/requestjobbase.h
./funticket.o: ../../../../winix/winixd/core/request.h
./funticket.o: ../../../../winix/winixd/core/requesttypes.h
@@ -504,9 +506,10 @@
./funticket.o: ../../../../winix/winixd/core/crypt.h
./funticket.o: ../../../../winix/winixd/core/run.h
./funticket.o: ../../../../winix/winixd/core/users.h
./funticket.o: ../../../../winix/winixd/core/ugcontainer.h
./funticket.o: ../../../../winix/winixd/core/lastcontainer.h
./funticket.o: ../../../../winix/winixd/core/groups.h
./funticket.o: ../../../../winix/winixd/models/group.h
./funticket.o: ../../../../winix/winixd/core/ugcontainer.h
./funticket.o: ../../../../winix/winixd/core/image.h
./funticket.o: ../../../../winix/winixd/core/threadmanager.h
./funticket.o: ../../../../winix/winixd/models/winixmodelconnector.h
@@ -519,7 +522,6 @@
./funticket.o: ../../../../winix/winixd/core/basethread.h
./funticket.o: ../../../../winix/winixd/notify/templatesnotify.h
./funticket.o: ../../../../winix/winixd/core/users.h
./funticket.o: ../../../../winix/winixd/core/lastcontainer.h
./funticket.o: ../../../../winix/winixd/core/timezones.h
./funticket.o: ../../../../winix/winixd/core/timezone.h
./funticket.o: ../../../../winix/winixd/functions/functions.h
@@ -584,6 +586,7 @@
./funticket.o: ../../../../winix/winixd/core/sessionidmanager.h
./funticket.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h
./funticket.o: ../../../../winix/winixd/functions/functionbase.h
./funticket.o: ../../../../winix/winixd/models/helpers/winixezchelper.h
./funticket.o: ../../../../winix/winixd/plugins/thread/pluginmsg.h
./init.o: tdb.h ticket.h ticketparam.h ../../../../morm/src/model.h
./init.o: ../../../../pikotools/src/textstream/textstream.h
@@ -643,6 +646,7 @@
./init.o: ../../../../winix/winixd/core/system.h
./init.o: ../../../../winix/winixd/core/job.h
./init.o: ../../../../winix/winixd/core/basethread.h
./init.o: ../../../../winix/winixd/core/winixmodeldeprecated.h
./init.o: ../../../../winix/winixd/core/jobtask.h
./init.o: ../../../../winix/winixd/core/cur.h
./init.o: ../../../../winix/winixd/core/request.h
@@ -676,7 +680,6 @@
./init.o: ../../../../winix/winixd/models/item.h
./init.o: ../../../../winix/winixd/models/itemcontent.h
./init.o: ../../../../winix/winixd/templates/htmltextstream.h
./init.o: ../../../../winix/winixd/core/winixmodeldeprecated.h
./init.o: ../../../../winix/winixd/requestjobs/requestjobbase.h
./init.o: ../../../../winix/winixd/core/request.h
./init.o: ../../../../winix/winixd/core/requesttypes.h
@@ -690,9 +693,10 @@
./init.o: ../../../../winix/winixd/core/crypt.h
./init.o: ../../../../winix/winixd/core/run.h
./init.o: ../../../../winix/winixd/core/users.h
./init.o: ../../../../winix/winixd/core/ugcontainer.h
./init.o: ../../../../winix/winixd/core/lastcontainer.h
./init.o: ../../../../winix/winixd/core/groups.h
./init.o: ../../../../winix/winixd/models/group.h
./init.o: ../../../../winix/winixd/core/ugcontainer.h
./init.o: ../../../../winix/winixd/core/image.h
./init.o: ../../../../winix/winixd/core/threadmanager.h
./init.o: ../../../../winix/winixd/models/winixmodelconnector.h
@@ -705,7 +709,6 @@
./init.o: ../../../../winix/winixd/core/basethread.h
./init.o: ../../../../winix/winixd/notify/templatesnotify.h
./init.o: ../../../../winix/winixd/core/users.h
./init.o: ../../../../winix/winixd/core/lastcontainer.h
./init.o: ../../../../winix/winixd/core/timezones.h
./init.o: ../../../../winix/winixd/core/timezone.h
./init.o: ../../../../winix/winixd/functions/functions.h
@@ -769,8 +772,9 @@
./init.o: ../../../../winix/winixd/core/ipbancontainer.h
./init.o: ../../../../winix/winixd/core/sessionidmanager.h
./init.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h
./init.o: ../../../../winix/winixd/functions/functionbase.h editticket.h
./init.o: createticket.h showtickets.h sessiondata.h
./init.o: ../../../../winix/winixd/functions/functionbase.h
./init.o: ../../../../winix/winixd/models/helpers/winixezchelper.h
./init.o: editticket.h createticket.h showtickets.h sessiondata.h
./init.o: ../../../../winix/winixd/core/plugindata.h
./init.o: ../../../../winix/winixd/functions/rm.h
./init.o: ../../../../winix/winixd/plugins/thread/showthreads.h
@@ -878,6 +882,7 @@
./showtickets.o: ../../../../winix/winixd/core/system.h
./showtickets.o: ../../../../winix/winixd/core/job.h
./showtickets.o: ../../../../winix/winixd/core/basethread.h
./showtickets.o: ../../../../winix/winixd/core/winixmodeldeprecated.h
./showtickets.o: ../../../../winix/winixd/core/jobtask.h
./showtickets.o: ../../../../winix/winixd/core/cur.h
./showtickets.o: ../../../../winix/winixd/core/request.h
@@ -913,7 +918,6 @@
./showtickets.o: ../../../../winix/winixd/models/item.h
./showtickets.o: ../../../../winix/winixd/models/itemcontent.h
./showtickets.o: ../../../../winix/winixd/templates/htmltextstream.h
./showtickets.o: ../../../../winix/winixd/core/winixmodeldeprecated.h
./showtickets.o: ../../../../winix/winixd/requestjobs/requestjobbase.h
./showtickets.o: ../../../../winix/winixd/core/request.h
./showtickets.o: ../../../../winix/winixd/core/requesttypes.h
@@ -927,9 +931,10 @@
./showtickets.o: ../../../../winix/winixd/core/crypt.h
./showtickets.o: ../../../../winix/winixd/core/run.h
./showtickets.o: ../../../../winix/winixd/core/users.h
./showtickets.o: ../../../../winix/winixd/core/ugcontainer.h
./showtickets.o: ../../../../winix/winixd/core/lastcontainer.h
./showtickets.o: ../../../../winix/winixd/core/groups.h
./showtickets.o: ../../../../winix/winixd/models/group.h
./showtickets.o: ../../../../winix/winixd/core/ugcontainer.h
./showtickets.o: ../../../../winix/winixd/core/image.h
./showtickets.o: ../../../../winix/winixd/core/threadmanager.h
./showtickets.o: ../../../../winix/winixd/models/winixmodelconnector.h
@@ -942,7 +947,6 @@
./showtickets.o: ../../../../winix/winixd/core/basethread.h
./showtickets.o: ../../../../winix/winixd/notify/templatesnotify.h
./showtickets.o: ../../../../winix/winixd/core/users.h
./showtickets.o: ../../../../winix/winixd/core/lastcontainer.h
./showtickets.o: ../../../../winix/winixd/core/timezones.h
./showtickets.o: ../../../../winix/winixd/core/timezone.h
./showtickets.o: ../../../../winix/winixd/functions/functions.h
@@ -1007,6 +1011,7 @@
./showtickets.o: ../../../../winix/winixd/core/sessionidmanager.h
./showtickets.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h
./showtickets.o: ../../../../winix/winixd/functions/functionbase.h
./showtickets.o: ../../../../winix/winixd/models/helpers/winixezchelper.h
./showtickets.o: ../../../../winix/winixd/plugins/thread/pluginmsg.h
./tdb.o: tdb.h ticket.h ticketparam.h ../../../../morm/src/model.h
./tdb.o: ../../../../pikotools/src/textstream/textstream.h
@@ -1106,6 +1111,8 @@
./templates.o: ticketparam.h ../../../../winix/winixd/core/system.h
./templates.o: ../../../../winix/winixd/core/job.h
./templates.o: ../../../../winix/winixd/core/basethread.h
./templates.o: ../../../../winix/winixd/core/synchro.h
./templates.o: ../../../../winix/winixd/core/winixmodeldeprecated.h
./templates.o: ../../../../winix/winixd/core/jobtask.h
./templates.o: ../../../../winix/winixd/core/cur.h
./templates.o: ../../../../winix/winixd/core/request.h
@@ -1137,7 +1144,6 @@
./templates.o: ../../../../winix/winixd/core/log.h
./templates.o: ../../../../winix/winixd/core/filelog.h
./templates.o: ../../../../winix/winixd/core/lock.h
./templates.o: ../../../../winix/winixd/core/synchro.h
./templates.o: ../../../../pikotools/src/convert/patternreplacer.h
./templates.o: ../../../../pikotools/src/convert/strtoint.h
./templates.o: ../../../../pikotools/src/convert/text.h
@@ -1156,7 +1162,6 @@
./templates.o: ../../../../winix/winixd/models/item.h
./templates.o: ../../../../winix/winixd/models/itemcontent.h
./templates.o: ../../../../winix/winixd/templates/htmltextstream.h
./templates.o: ../../../../winix/winixd/core/winixmodeldeprecated.h
./templates.o: ../../../../winix/winixd/requestjobs/requestjobbase.h
./templates.o: ../../../../winix/winixd/core/winixmodeldeprecated.h
./templates.o: ../../../../winix/winixd/core/request.h
@@ -1171,9 +1176,10 @@
./templates.o: ../../../../winix/winixd/core/crypt.h
./templates.o: ../../../../winix/winixd/core/run.h
./templates.o: ../../../../winix/winixd/core/users.h
./templates.o: ../../../../winix/winixd/core/ugcontainer.h
./templates.o: ../../../../winix/winixd/core/lastcontainer.h
./templates.o: ../../../../winix/winixd/core/groups.h
./templates.o: ../../../../winix/winixd/models/group.h
./templates.o: ../../../../winix/winixd/core/ugcontainer.h
./templates.o: ../../../../winix/winixd/core/image.h
./templates.o: ../../../../winix/winixd/core/threadmanager.h
./templates.o: ../../../../winix/winixd/models/winixmodelconnector.h
@@ -1186,7 +1192,6 @@
./templates.o: ../../../../winix/winixd/core/basethread.h
./templates.o: ../../../../winix/winixd/notify/templatesnotify.h
./templates.o: ../../../../winix/winixd/core/users.h
./templates.o: ../../../../winix/winixd/core/lastcontainer.h
./templates.o: ../../../../winix/winixd/core/timezones.h
./templates.o: ../../../../winix/winixd/core/timezone.h
./templates.o: ../../../../winix/winixd/functions/functions.h
@@ -1252,6 +1257,7 @@
./templates.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h tdb.h
./templates.o: ../../../../winix/winixd/core/error.h editticket.h
./templates.o: ../../../../winix/winixd/functions/functionbase.h
./templates.o: ../../../../winix/winixd/models/helpers/winixezchelper.h
./templates.o: createticket.h ../../../../winix/winixd/core/misc.h
./templates.o: ../../../../winix/winixd/core/winix_const.h
./templates.o: ../../../../pikotools/src/convert/convert.h
@@ -1306,6 +1312,8 @@
./ticketinfo.o: ../../../../winix/winixd/core/system.h
./ticketinfo.o: ../../../../winix/winixd/core/job.h
./ticketinfo.o: ../../../../winix/winixd/core/basethread.h
./ticketinfo.o: ../../../../winix/winixd/core/synchro.h
./ticketinfo.o: ../../../../winix/winixd/core/winixmodeldeprecated.h
./ticketinfo.o: ../../../../winix/winixd/core/jobtask.h
./ticketinfo.o: ../../../../winix/winixd/core/cur.h
./ticketinfo.o: ../../../../winix/winixd/core/request.h
@@ -1337,7 +1345,6 @@
./ticketinfo.o: ../../../../winix/winixd/core/log.h
./ticketinfo.o: ../../../../winix/winixd/core/filelog.h
./ticketinfo.o: ../../../../winix/winixd/core/lock.h
./ticketinfo.o: ../../../../winix/winixd/core/synchro.h
./ticketinfo.o: ../../../../pikotools/src/convert/patternreplacer.h
./ticketinfo.o: ../../../../pikotools/src/convert/strtoint.h
./ticketinfo.o: ../../../../pikotools/src/convert/text.h
@@ -1364,7 +1371,6 @@
./ticketinfo.o: ../../../../winix/winixd/models/item.h
./ticketinfo.o: ../../../../winix/winixd/models/itemcontent.h
./ticketinfo.o: ../../../../winix/winixd/templates/htmltextstream.h
./ticketinfo.o: ../../../../winix/winixd/core/winixmodeldeprecated.h
./ticketinfo.o: ../../../../winix/winixd/requestjobs/requestjobbase.h
./ticketinfo.o: ../../../../winix/winixd/core/winixmodeldeprecated.h
./ticketinfo.o: ../../../../winix/winixd/core/request.h
@@ -1379,9 +1385,10 @@
./ticketinfo.o: ../../../../winix/winixd/core/crypt.h
./ticketinfo.o: ../../../../winix/winixd/core/run.h
./ticketinfo.o: ../../../../winix/winixd/core/users.h
./ticketinfo.o: ../../../../winix/winixd/core/ugcontainer.h
./ticketinfo.o: ../../../../winix/winixd/core/lastcontainer.h
./ticketinfo.o: ../../../../winix/winixd/core/groups.h
./ticketinfo.o: ../../../../winix/winixd/models/group.h
./ticketinfo.o: ../../../../winix/winixd/core/ugcontainer.h
./ticketinfo.o: ../../../../winix/winixd/core/image.h
./ticketinfo.o: ../../../../winix/winixd/core/threadmanager.h
./ticketinfo.o: ../../../../winix/winixd/models/winixmodelconnector.h
@@ -1394,7 +1401,6 @@
./ticketinfo.o: ../../../../winix/winixd/core/basethread.h
./ticketinfo.o: ../../../../winix/winixd/notify/templatesnotify.h
./ticketinfo.o: ../../../../winix/winixd/core/users.h
./ticketinfo.o: ../../../../winix/winixd/core/lastcontainer.h
./ticketinfo.o: ../../../../winix/winixd/core/timezones.h
./ticketinfo.o: ../../../../winix/winixd/core/timezone.h
./ticketinfo.o: ../../../../winix/winixd/functions/functions.h

4
winixd/plugins/ticket/createticket.cpp
View File

@@ -67,7 +67,7 @@ void CreateTicket::SetTicketInfo(TicketInfo * pinfo)
bool CreateTicket::HasAccess()
bool CreateTicket::has_access()
{
if( cur->request->is_item || !system->HasWriteAccess(*cur->request->dir_tab.back()) )
return false;
@@ -176,7 +176,7 @@ return new_space;
}
void CreateTicket::MakePost()
void CreateTicket::make_post()
{
ticket_info->Clear();
ticket_info->FindCurrentConf();

4
winixd/plugins/ticket/createticket.h
View File

@@ -56,8 +56,8 @@ public:
void SetTDb(TDb * ptdb);
void SetTicketInfo(TicketInfo * pinfo);
bool HasAccess();
void MakePost();
bool has_access();
void make_post();
void MakeGet();
private:

4
winixd/plugins/ticket/editticket.cpp
View File

@@ -66,7 +66,7 @@ void EditTicket::SetTicketInfo(TicketInfo * pinfo)
bool EditTicket::HasAccess()
bool EditTicket::has_access()
{
// not logged users cannot edit tickets
// !! we are waiting for the sticky bit
@@ -222,7 +222,7 @@ return false;
void EditTicket::MakePost()
void EditTicket::make_post()
{
ticket_info->Clear();
ticket_info->FindCurrentConf();

4
winixd/plugins/ticket/editticket.h
View File

@@ -57,8 +57,8 @@ public:
void SetTDb(TDb * ptdb);
void SetTicketInfo(TicketInfo * pinfo);
bool HasAccess();
void MakePost();
bool has_access();
void make_post();
void MakeGet();
private:

2
winixd/plugins/ticket/funticket.cpp
View File

@@ -63,7 +63,7 @@ void FunTicket::SetTicketInfo(TicketInfo * pinfo)
}
bool FunTicket::HasAccess()
bool FunTicket::has_access()
{
return cur->request->is_item && system->HasReadAccess(cur->request->item);
}

2
winixd/plugins/ticket/funticket.h
View File

@@ -55,7 +55,7 @@ public:
void SetTDb(TDb * ptdb);
void SetTicketInfo(TicketInfo * pinfo);
bool HasAccess();
bool has_access();
void MakeGet();
private:

2
winixd/plugins/ticket/showtickets.cpp
View File

@@ -68,7 +68,7 @@ void ShowTickets::SetTicketInfo(TicketInfo * pinfo)
bool ShowTickets::HasAccess()
bool ShowTickets::has_access()
{
return !cur->request->is_item;
}

2
winixd/plugins/ticket/showtickets.h
View File

@@ -57,7 +57,7 @@ public:
void SetTDb(TDb * ptdb);
void SetTicketInfo(TicketInfo * pinfo);
bool HasAccess();
bool has_access();
void MakeGet();
void ShowTicketsFromDir(long dir_id);

4
winixd/plugins/ticket/templates.cpp
View File

@@ -295,13 +295,13 @@ void ticket_print_value(Info & i, TicketValue & value)
void ticket_can_create(Info & i)
{
i.res = fun_create_ticket.HasAccess();
i.res = fun_create_ticket.has_access();
}
void ticket_can_edit(Info & i)
{
i.res = fun_edit_ticket.HasAccess();
i.res = fun_edit_ticket.has_access();
}

2
winixd/plugins/ticket/ticketinfo.cpp
View File

@@ -407,7 +407,7 @@ void TicketInfo::ReadTicketValue(pt::Space & config_param,
file.url = value.filename;
functions->PrepareUrl(file);
functions->SetUser(file);
functions->fun_upload.UploadFile(file, value.tmp_filename);
functions->fun_upload.upload_file(file, value.tmp_filename);
if( cur->request->status == WINIX_ERR_OK )
{