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

added: a new directory "etc"

Browse Source 
there'll be some generic config files for winix
added: a new file in etc directory: time_zones_file
       list of time zones (not finished yet -- daylight saving time is needed)
added: option to config: etc_dir
       a directory in which there are some config files
       used mainly when winix starts
       default: empty (means not for using)
added: option to config: time_zones_file
       a file in etc_dir with time zones info
       default: time_zones.conf
       this is a Space structure with all time zones
added: to system: TimeZones struct
       list of time zones read from etc/time_zones.conf



git-svn-id: svn://ttmath.org/publicrep/winix/trunk@849 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa
2012-06-22 23:34:33 +00:00
parent abafb80caf
commit d11cda3577
27 changed files with 1592 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
templates/Makefile.dep
View File

@@ -27,9 +27,9 @@ adduser.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
adduser.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h
adduser.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h
adduser.o: ../core/group.h ../core/loadavg.h ../core/image.h
adduser.o: ../core/threadmanager.h ../core/sessionmanager.h
adduser.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
adduser.o: ../core/request.h
adduser.o: ../core/threadmanager.h ../core/timezones.h
adduser.o: ../core/sessionmanager.h ../core/sessioncontainer.h
adduser.o: ../core/system.h ../core/htmlfilter.h ../core/request.h
changepatterns.o: changepatterns.h patterns.h locale.h
changepatterns.o: ../../pikotools/space/spaceparser.h
changepatterns.o: ../../pikotools/space/space.h localefilter.h
@@ -65,8 +65,9 @@ config.o: ../core/basethread.h ../notify/templatesnotify.h ../core/users.h
config.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h
config.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h
config.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
config.o: ../core/threadmanager.h ../core/sessionmanager.h
config.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
config.o: ../core/threadmanager.h ../core/timezones.h
config.o: ../core/sessionmanager.h ../core/sessioncontainer.h
config.o: ../core/system.h ../core/htmlfilter.h
dir.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
dir.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
dir.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
@@ -91,7 +92,7 @@ dir.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
dir.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h
dir.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h
dir.o: ../core/group.h ../core/loadavg.h ../core/image.h
dir.o: ../core/threadmanager.h ../core/sessionmanager.h
dir.o: ../core/threadmanager.h ../core/timezones.h ../core/sessionmanager.h
dir.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
dir.o: ../core/misc.h ../functions/functions.h ../functions/functionbase.h
dir.o: ../core/request.h ../core/synchro.h ../functions/functionparser.h
@@ -133,7 +134,7 @@ doc.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
doc.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h
doc.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h
doc.o: ../core/group.h ../core/loadavg.h ../core/image.h
doc.o: ../core/threadmanager.h ../core/sessionmanager.h
doc.o: ../core/threadmanager.h ../core/timezones.h ../core/sessionmanager.h
doc.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
doc.o: ../core/request.h ../core/misc.h
env.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
@@ -160,7 +161,7 @@ env.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
env.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h
env.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h
env.o: ../core/group.h ../core/loadavg.h ../core/image.h
env.o: ../core/threadmanager.h ../core/sessionmanager.h
env.o: ../core/threadmanager.h ../core/timezones.h ../core/sessionmanager.h
env.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
env.o: ../core/misc.h ../functions/functions.h ../functions/functionbase.h
env.o: ../core/request.h ../core/synchro.h ../functions/functionparser.h
@@ -205,9 +206,9 @@ filters.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
filters.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h
filters.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h
filters.o: ../core/group.h ../core/loadavg.h ../core/image.h
filters.o: ../core/threadmanager.h ../core/sessionmanager.h
filters.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
filters.o: ../core/misc.h
filters.o: ../core/threadmanager.h ../core/timezones.h
filters.o: ../core/sessionmanager.h ../core/sessioncontainer.h
filters.o: ../core/system.h ../core/htmlfilter.h ../core/misc.h
htmltextstream.o: htmltextstream.h ../core/textstream.h misc.h localefilter.h
htmltextstream.o: locale.h ../../pikotools/space/spaceparser.h
htmltextstream.o: ../../pikotools/space/space.h ../../ezc/src/ezc.h
@@ -253,9 +254,10 @@ insert.o: ../core/basethread.h ../notify/templatesnotify.h ../core/users.h
insert.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h
insert.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h
insert.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
insert.o: ../core/threadmanager.h ../core/sessionmanager.h
insert.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
insert.o: ../core/request.h ../core/misc.h
insert.o: ../core/threadmanager.h ../core/timezones.h
insert.o: ../core/sessionmanager.h ../core/sessioncontainer.h
insert.o: ../core/system.h ../core/htmlfilter.h ../core/request.h
insert.o: ../core/misc.h
item.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
item.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
item.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
@@ -280,7 +282,7 @@ item.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
item.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h
item.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h
item.o: ../core/group.h ../core/loadavg.h ../core/image.h
item.o: ../core/threadmanager.h ../core/sessionmanager.h
item.o: ../core/threadmanager.h ../core/timezones.h ../core/sessionmanager.h
item.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
item.o: ../core/request.h ../core/misc.h ../core/bbcodeparser.h miscspace.h
last.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
@@ -307,7 +309,7 @@ last.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
last.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h
last.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h
last.o: ../core/group.h ../core/loadavg.h ../core/image.h
last.o: ../core/threadmanager.h ../core/sessionmanager.h
last.o: ../core/threadmanager.h ../core/timezones.h ../core/sessionmanager.h
last.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
last.o: ../core/lastcontainer.h ../core/request.h ../core/misc.h
locale.o: locale.h ../../pikotools/space/spaceparser.h
@@ -346,7 +348,7 @@ login.o: ../core/basethread.h ../notify/templatesnotify.h ../core/users.h
login.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h
login.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h
login.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
login.o: ../core/threadmanager.h ../core/sessionmanager.h
login.o: ../core/threadmanager.h ../core/timezones.h ../core/sessionmanager.h
login.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
ls.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
ls.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
@@ -372,7 +374,7 @@ ls.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
ls.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h
ls.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h
ls.o: ../core/group.h ../core/loadavg.h ../core/image.h
ls.o: ../core/threadmanager.h ../core/sessionmanager.h
ls.o: ../core/threadmanager.h ../core/timezones.h ../core/sessionmanager.h
ls.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
ls.o: ../core/request.h
man.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
@@ -399,7 +401,7 @@ man.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
man.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h
man.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h
man.o: ../core/group.h ../core/loadavg.h ../core/image.h
man.o: ../core/threadmanager.h ../core/sessionmanager.h
man.o: ../core/threadmanager.h ../core/timezones.h ../core/sessionmanager.h
man.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
man.o: ../core/request.h ../core/misc.h ../functions/functions.h
man.o: ../functions/functionbase.h ../core/synchro.h
@@ -441,7 +443,7 @@ misc.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
misc.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h
misc.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h
misc.o: ../core/group.h ../core/loadavg.h ../core/image.h
misc.o: ../core/threadmanager.h ../core/sessionmanager.h
misc.o: ../core/threadmanager.h ../core/timezones.h ../core/sessionmanager.h
misc.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
misc.o: ../core/misc.h ../core/request.h
miscspace.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
@@ -472,8 +474,8 @@ miscspace.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h
miscspace.o: ../core/mountparser.h ../core/crypt.h ../core/run.h
miscspace.o: ../core/users.h ../core/groups.h ../core/group.h
miscspace.o: ../core/loadavg.h ../core/image.h ../core/threadmanager.h
miscspace.o: ../core/sessionmanager.h ../core/sessioncontainer.h
miscspace.o: ../core/system.h ../core/htmlfilter.h
miscspace.o: ../core/timezones.h ../core/sessionmanager.h
miscspace.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
mount.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
mount.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
mount.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
@@ -499,7 +501,7 @@ mount.o: ../core/basethread.h ../notify/templatesnotify.h ../core/users.h
mount.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h
mount.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h
mount.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
mount.o: ../core/threadmanager.h ../core/sessionmanager.h
mount.o: ../core/threadmanager.h ../core/timezones.h ../core/sessionmanager.h
mount.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
mount.o: ../core/misc.h ../core/mounts.h
patterncacher.o: patterncacher.h ../core/item.h ../../pikotools/space/space.h
@@ -547,7 +549,7 @@ priv.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
priv.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h
priv.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h
priv.o: ../core/group.h ../core/loadavg.h ../core/image.h
priv.o: ../core/threadmanager.h ../core/sessionmanager.h
priv.o: ../core/threadmanager.h ../core/timezones.h ../core/sessionmanager.h
priv.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
priv.o: ../core/request.h ../core/misc.h ../functions/functions.h
priv.o: ../functions/functionbase.h ../core/synchro.h
@@ -589,7 +591,7 @@ pw.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
pw.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h
pw.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h
pw.o: ../core/group.h ../core/loadavg.h ../core/image.h
pw.o: ../core/threadmanager.h ../core/sessionmanager.h
pw.o: ../core/threadmanager.h ../core/timezones.h ../core/sessionmanager.h
pw.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
pw.o: ../core/request.h ../core/misc.h
rebus.o: ../core/request.h templates.h ../../ezc/src/ezc.h
@@ -618,7 +620,7 @@ rebus.o: ../core/basethread.h ../notify/templatesnotify.h ../core/users.h
rebus.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h
rebus.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h
rebus.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
rebus.o: ../core/threadmanager.h ../core/sessionmanager.h
rebus.o: ../core/threadmanager.h ../core/timezones.h ../core/sessionmanager.h
rebus.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
slog.o: ../core/slog.h ../core/cur.h ../core/logmanipulators.h
slog.o: ../templates/locale.h templates.h ../../ezc/src/ezc.h
@@ -646,7 +648,7 @@ slog.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
slog.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h
slog.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h
slog.o: ../core/group.h ../core/loadavg.h ../core/image.h
slog.o: ../core/threadmanager.h ../core/sessionmanager.h
slog.o: ../core/threadmanager.h ../core/timezones.h ../core/sessionmanager.h
slog.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
stat.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
stat.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
@@ -672,7 +674,7 @@ stat.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
stat.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h
stat.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h
stat.o: ../core/group.h ../core/loadavg.h ../core/image.h
stat.o: ../core/threadmanager.h ../core/sessionmanager.h
stat.o: ../core/threadmanager.h ../core/timezones.h ../core/sessionmanager.h
stat.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
stat.o: ../core/request.h ../core/misc.h
sys.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
@@ -699,7 +701,7 @@ sys.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
sys.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h
sys.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h
sys.o: ../core/group.h ../core/loadavg.h ../core/image.h
sys.o: ../core/threadmanager.h ../core/sessionmanager.h
sys.o: ../core/threadmanager.h ../core/timezones.h ../core/sessionmanager.h
sys.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
sys.o: ../core/request.h ../core/version.h ../core/plugin.h
sys.o: ../core/pluginmsg.h ../core/sessionmanager.h ../functions/functions.h
@@ -745,9 +747,9 @@ template.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
template.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h
template.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h
template.o: ../core/group.h ../core/loadavg.h ../core/image.h
template.o: ../core/threadmanager.h ../core/sessionmanager.h
template.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
template.o: ../core/misc.h
template.o: ../core/threadmanager.h ../core/timezones.h
template.o: ../core/sessionmanager.h ../core/sessioncontainer.h
template.o: ../core/system.h ../core/htmlfilter.h ../core/misc.h
templates.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
templates.o: ../../ezc/src/pattern.h ../../ezc/src/item.h
templates.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
@@ -776,11 +778,11 @@ templates.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h
templates.o: ../core/mountparser.h ../core/crypt.h ../core/run.h
templates.o: ../core/users.h ../core/groups.h ../core/group.h
templates.o: ../core/loadavg.h ../core/image.h ../core/threadmanager.h
templates.o: ../core/sessionmanager.h ../core/sessioncontainer.h
templates.o: ../core/system.h ../core/htmlfilter.h ../core/misc.h
templates.o: ../core/plugin.h ../core/pluginmsg.h ../core/sessionmanager.h
templates.o: ../functions/functions.h ../functions/functionbase.h
templates.o: ../core/request.h ../core/synchro.h
templates.o: ../core/timezones.h ../core/sessionmanager.h
templates.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
templates.o: ../core/misc.h ../core/plugin.h ../core/pluginmsg.h
templates.o: ../core/sessionmanager.h ../functions/functions.h
templates.o: ../functions/functionbase.h ../core/request.h ../core/synchro.h
templates.o: ../functions/functionparser.h ../functions/adduser.h
templates.o: ../functions/cat.h ../functions/chmod.h
templates.o: ../functions/privchanger.h ../functions/chown.h
@@ -823,8 +825,9 @@ upload.o: ../core/basethread.h ../notify/templatesnotify.h ../core/users.h
upload.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h
upload.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h
upload.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
upload.o: ../core/threadmanager.h ../core/sessionmanager.h
upload.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
upload.o: ../core/threadmanager.h ../core/timezones.h
upload.o: ../core/sessionmanager.h ../core/sessioncontainer.h
upload.o: ../core/system.h ../core/htmlfilter.h
uptime.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
uptime.o: ../../ezc/src/pattern.h ../../ezc/src/item.h
uptime.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
@@ -851,8 +854,9 @@ uptime.o: ../core/basethread.h ../notify/templatesnotify.h ../core/users.h
uptime.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h
uptime.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h
uptime.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
uptime.o: ../core/threadmanager.h ../core/sessionmanager.h
uptime.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
uptime.o: ../core/threadmanager.h ../core/timezones.h
uptime.o: ../core/sessionmanager.h ../core/sessioncontainer.h
uptime.o: ../core/system.h ../core/htmlfilter.h
user.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
user.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
user.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
@@ -877,7 +881,7 @@ user.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
user.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h
user.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h
user.o: ../core/group.h ../core/loadavg.h ../core/image.h
user.o: ../core/threadmanager.h ../core/sessionmanager.h
user.o: ../core/threadmanager.h ../core/timezones.h ../core/sessionmanager.h
user.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
user.o: ../core/request.h ../core/misc.h
who.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
@@ -904,7 +908,7 @@ who.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
who.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h
who.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h
who.o: ../core/group.h ../core/loadavg.h ../core/image.h
who.o: ../core/threadmanager.h ../core/sessionmanager.h
who.o: ../core/threadmanager.h ../core/timezones.h ../core/sessionmanager.h
who.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
who.o: ../core/request.h ../core/misc.h
winix.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
@@ -932,7 +936,7 @@ winix.o: ../core/basethread.h ../notify/templatesnotify.h ../core/users.h
winix.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h
winix.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h
winix.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
winix.o: ../core/threadmanager.h ../core/sessionmanager.h
winix.o: ../core/threadmanager.h ../core/timezones.h ../core/sessionmanager.h
winix.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
winix.o: ../core/request.h ../core/plugin.h ../core/pluginmsg.h
winix.o: ../core/sessionmanager.h ../functions/functions.h

12
templates/misc.cpp
View File

@@ -61,6 +61,18 @@ int was_enter = 0; // how many enteres there were before
void print_hour_min(Info & i, time_t time)
{
char buffer[100];
int hours = time / 60 / 60;
int mins = (time / 60 - hours * 60);
sprintf(buffer, "%02d:%02d", hours, mins);
i.out << buffer;
}
void print_date_nice(Info & i, const PT::Date & date)
{

2
templates/misc.h
View File

@@ -37,7 +37,7 @@ HtmlTextStream::RawText<RawType> R(const RawType & par)
void HtmlEscapeFormTxt(HtmlTextStream & out, const std::wstring & in);
void print_hour_min(Info & i, time_t time);
void print_date_nice(Info & i, const PT::Date & date);
void print_user_name(Info & i, const User * puser, const std::wstring & guest_name);

10
templates/templates.cpp
View File

@@ -568,6 +568,16 @@ void Templates::CreateFunctions()
ezc_functions.Insert("winix_subdomain_is", winix_subdomain_is);
ezc_functions.Insert("str", str);
ezc_functions.Insert("strnc", strnc);
ezc_functions.Insert("winix_tz_tab", winix_tz_tab);
ezc_functions.Insert("winix_tz_tab_id", winix_tz_tab_id);
ezc_functions.Insert("winix_tz_tab_name", winix_tz_tab_name);
ezc_functions.Insert("winix_tz_tab_offset_sec", winix_tz_tab_offset_sec);
ezc_functions.Insert("winix_tz_tab_offset_hour_min", winix_tz_tab_offset_hour_min);
ezc_functions.Insert("winix_tz_tab_has_dst", winix_tz_tab_has_dst);
ezc_functions.Insert("winix_tz_tab_dst_offset_sec", winix_tz_tab_dst_offset_sec);
ezc_functions.Insert("winix_tz_tab_dst_offset_hour_min", winix_tz_tab_dst_offset_hour_min);
ezc_functions.Insert("winix_tz_tab_dst_start", winix_tz_tab_dst_start);
ezc_functions.Insert("winix_tz_tab_dst_end", winix_tz_tab_dst_end);
/*

10
templates/templates.h
View File

@@ -486,6 +486,16 @@ namespace TemplatesFunctions
void winix_subdomain_is(Info & i);
void str(Info & i);
void strnc(Info & i);
void winix_tz_tab(Info & i);
void winix_tz_tab_id(Info & i);
void winix_tz_tab_name(Info & i);
void winix_tz_tab_offset_sec(Info & i);
void winix_tz_tab_offset_hour_min(Info & i);
void winix_tz_tab_has_dst(Info & i);
void winix_tz_tab_dst_offset_sec(Info & i);
void winix_tz_tab_dst_offset_hour_min(Info & i);
void winix_tz_tab_dst_start(Info & i);
void winix_tz_tab_dst_end(Info & i);
/*

111
templates/winix.cpp
View File

@@ -324,9 +324,120 @@ void strnc(Info & i)
static size_t tz_index;
void winix_tz_tab(Info & i)
{
tz_index = i.iter;
i.res = tz_index < system->time_zones.Size();
}
void winix_tz_tab_id(Info & i)
{
if( tz_index < system->time_zones.Size() )
i.out << system->time_zones[tz_index].time_zone.tz_id;
}
void winix_tz_tab_name(Info & i)
{
if( tz_index < system->time_zones.Size() )
{
std::wstring & key = system->time_zones[tz_index].name_key;
i.out << locale.Get(key); // !! IMPROVE ME which locale?
}
}
void winix_tz_tab_offset_sec(Info & i)
{
if( tz_index < system->time_zones.Size() )
i.out << system->time_zones[tz_index].time_zone.tz_offset;
}
void winix_tz_tab_offset_hour_min(Info & i)
{
if( tz_index < system->time_zones.Size() )
{
time_t offset = system->time_zones[tz_index].time_zone.tz_offset;
if( offset < 0 )
{
i.out << '-';
offset = -offset;
}
else
{
i.out << '+';
}
print_hour_min(i, offset);
}
}
void winix_tz_tab_has_dst(Info & i)
{
if( tz_index < system->time_zones.Size() )
i.res = system->time_zones[tz_index].time_zone.tz_has_dst;
}
void winix_tz_tab_dst_offset_sec(Info & i)
{
if( tz_index < system->time_zones.Size() )
i.out << system->time_zones[tz_index].time_zone.tz_dst_offset;
}
void winix_tz_tab_dst_offset_hour_min(Info & i)
{
if( tz_index < system->time_zones.Size() )
{
time_t offset = system->time_zones[tz_index].time_zone.tz_dst_offset;
if( offset < 0 )
{
i.out << '-';
offset = -offset;
}
else
{
i.out << '+';
}
print_hour_min(i, offset);
}
}
void winix_tz_tab_dst_start(Info & i)
{
if( tz_index < system->time_zones.Size() )
{
PT::Date & date = system->time_zones[tz_index].time_zone.tz_dst_start;
date.SerializeMonthDay(i.out);
i.out << ' ';
date.SerializeHourMin(i.out);
}
}
void winix_tz_tab_dst_end(Info & i)
{
if( tz_index < system->time_zones.Size() )
{
PT::Date & date = system->time_zones[tz_index].time_zone.tz_dst_end;
date.SerializeMonthDay(i.out);
i.out << ' ';
date.SerializeHourMin(i.out);
}
}
} // namespace