added some exception catching for writing setting files

added help texts for all plugins
fixed 'encryption status' bug in 'volume_details'
improved rendering of 'volume_properties' and 'user_manager'
chmod root directory of mounted volumes to 0777 to avoid later permission problems for samba or WebDAV
This commit is contained in:
lars 2006-12-13 10:01:58 +00:00
parent 4cf7681da5
commit 3e1bfda98e
245 changed files with 1883 additions and 127 deletions

37
README.proxy Normal file
View file

@ -0,0 +1,37 @@
Running the CryptoBox cherrypy webserver behind apache
The following file describes how to configure an apache2 webserver for
forwarding requests to the cherrypy server of the CryptoBox.
1) Required modules
- proxy
- header
Both module should be part of usual default installations of apache2.
Activate these modules. For debian you should run: a2enmod MOD_NAME
2) Configuration directives
The following example should help you to create your own proxy configuration
for apache2.
ProxyRequests Off
<Proxy *>
Order Deny,Allow
Allow from all
</Proxy>
<Location /cryptobox/>
ProxyPass http://localhost:8080/
ProxyPassReverse http://localhost:8080/
RequestHeader set CryptoBox-Location /cryptobox
</Location>
Now you should to a restart of apache2.
3) Testing
Now you should point your webserver to the proxy host and check if
the CryptoBox layout ist working properly.

View file

@ -293,7 +293,7 @@ def run_mount(args):
if fsType == "vfat":
## add the "uid/gid" arguments to the mount call
mount_args = [allowedProgs["mount"],
"-o", "uid=%d,gid=%d" % (trustUID, trustGID),
"-o", "uid=%d,gid=%d,umask=0000" % (trustUID, trustGID),
device,
destination]
else:

View file

@ -70,6 +70,7 @@ class CryptoBoxWebserver:
'''this class starts the cherryp webserver and serves the single sites'''
def __init__(self, opts):
self.opts = opts
## check conffile
if not os.access(opts.conffile, os.R_OK) or not os.path.isfile(opts.conffile):
sys.stderr.write("Error: could not read configuration file (%s)\n" % opts.conffile)
@ -112,7 +113,15 @@ class CryptoBoxWebserver:
def define_exit_handlers(self, cbw):
import atexit
import signal
atexit.register(cbw.cleanup)
## define exit handler for normal termination (via sys.exit)
def exit_handler():
cbw.cleanup()
try:
os.remove(self.opts.pidfile)
except OSError:
pass
atexit.register(exit_handler)
## catch kill signal
def kill_signal_handler(signum, frame):
cbw.cbox.log.info("Kill signal handler called: %d" % signum)
sys.exit(1)

View file

@ -68,7 +68,7 @@ Details = ./cryptobox.log
[WebSettings]
# URL of default stylesheet
Stylesheet = /cryptobox-misc/cryptobox.css
Stylesheet = cryptobox-misc/cryptobox.css
# default language
Languages = en, de, sl, fr

View file

@ -69,7 +69,7 @@ Details = ./cryptobox.log
[WebSettings]
# URL of default stylesheet
Stylesheet = /cryptobox-misc/cryptobox.css
Stylesheet = cryptobox-misc/cryptobox.css
# default language
Languages = en, de, sl, fr

View file

@ -1,17 +1,25 @@
# CryptoBox configuration file
#
# the following directives allow you to use the cryptobox web interface behind apache
# the following directives allow you to use the cryptobox web interface behind apache2
#
# you need to enable the following modules:
# - proxy
# - headers
# (for debian: run "a2enmod MOD_NAME")
#
# IMPORTANT: for now it does not work! Any comments are appreciated ...
#
<Location /cbox>
ProxyPass http://localhost:8080
ProxyPassReverse http://localhost:8080
RequestHeader set CBOX-Location /cbox
ProxyRequests Off
# you may restrict access if necessary
<Proxy *>
Order Deny,Allow
Allow from all
</Proxy>
<Location /cryptobox/>
ProxyPass http://localhost:8080/
ProxyPassReverse http://localhost:8080/
# this requestheader is necessary to allow proper redirection to https
RequestHeader set CryptoBox-Location /cryptobox
</Location>

View file

@ -62,7 +62,7 @@ Details = /var/log/cryptobox-server/cryptobox.log
[WebSettings]
# URL of default stylesheet
Stylesheet = /cryptobox-misc/cryptobox.css
Stylesheet = cryptobox-misc/cryptobox.css
# comma seperated list of available languages for the web interface
# the first language is the default

14
debian/changelog vendored
View file

@ -1,14 +1,12 @@
cryptobox (0.2.56-1) unstable; urgency=low
* foo
* added inline help texts
* fixed 'encryption status' in 'volume_details'
* improved rendering of 'volume_properties' and 'user_manager'
* chmod mount directory to 0777 - this should avoid permission problems
*
-- age <age@hummel> Tue, 12 Dec 2006 18:38:52 +0100
cryptobox (0.2.55-2) unstable; urgency=low
* samba test package
-- age <age@hummel> Tue, 12 Dec 2006 18:37:57 +0100
-- Lars Kruse <devel@sumpfralle.de> Wed, 13 Dec 2006 02:14:35 +0100
cryptobox (0.2.55-1) unstable; urgency=low

View file

@ -4,6 +4,8 @@
<?cs call:handle_messages() ?>
<?cs call:show_help(Lang.Plugins.date.Help.ChangeDate) ?>
<?cs call:print_form_header("set_date", "date") ?>
<p><label for="date"><?cs var:html_escape(Lang.Plugins.date.Text.Date) ?>: </label><br/>

View file

@ -99,3 +99,7 @@ msgstr ""
#: WarningMessage.InvalidDate.Text
msgid "An invalid value for date or time was supplied. Please try again."
msgstr ""
#: Help.ChangeDate
msgid "Change the time and date for the CryptoBox server."
msgstr ""

View file

@ -100,3 +100,7 @@ msgstr ""
#: WarningMessage.InvalidDate.Text
msgid "An invalid value for date or time was supplied. Please try again."
msgstr ""
#: Help.ChangeDate
msgid "Change the time and date for the CryptoBox server."
msgstr ""

View file

@ -100,3 +100,7 @@ msgstr ""
#: WarningMessage.InvalidDate.Text
msgid "An invalid value for date or time was supplied. Please try again."
msgstr ""
#: Help.ChangeDate
msgid "Change the time and date for the CryptoBox server."
msgstr ""

View file

@ -99,3 +99,7 @@ msgstr "Ungültiger Eingabewert"
#: WarningMessage.InvalidDate.Text
msgid "An invalid value for date or time was supplied. Please try again."
msgstr "Es wurde ein ungültiger Wert für das Datum oder die Uhrzeit eingegeben. Bitte versuche es erneut."
#: Help.ChangeDate
msgid "Change the time and date for the CryptoBox server."
msgstr ""

View file

@ -88,3 +88,7 @@ msgstr "Invalid value"
#: WarningMessage.InvalidDate.Text
msgid "An invalid value for date or time was supplied. Please try again."
msgstr "An invalid value for date or time was supplied. Please try again."
#: Help.ChangeDate
msgid "Change the time and date for the CryptoBox server."
msgstr "Change the time and date for the CryptoBox server."

View file

@ -100,3 +100,7 @@ msgstr ""
#: WarningMessage.InvalidDate.Text
msgid "An invalid value for date or time was supplied. Please try again."
msgstr ""
#: Help.ChangeDate
msgid "Change the time and date for the CryptoBox server."
msgstr ""

View file

@ -100,3 +100,7 @@ msgstr ""
#: WarningMessage.InvalidDate.Text
msgid "An invalid value for date or time was supplied. Please try again."
msgstr ""
#: Help.ChangeDate
msgid "Change the time and date for the CryptoBox server."
msgstr ""

View file

@ -100,3 +100,7 @@ msgstr ""
#: WarningMessage.InvalidDate.Text
msgid "An invalid value for date or time was supplied. Please try again."
msgstr ""
#: Help.ChangeDate
msgid "Change the time and date for the CryptoBox server."
msgstr ""

View file

@ -100,3 +100,7 @@ msgstr ""
#: WarningMessage.InvalidDate.Text
msgid "An invalid value for date or time was supplied. Please try again."
msgstr ""
#: Help.ChangeDate
msgid "Change the time and date for the CryptoBox server."
msgstr ""

View file

@ -100,3 +100,7 @@ msgstr ""
#: WarningMessage.InvalidDate.Text
msgid "An invalid value for date or time was supplied. Please try again."
msgstr ""
#: Help.ChangeDate
msgid "Change the time and date for the CryptoBox server."
msgstr ""

View file

@ -100,3 +100,7 @@ msgstr ""
#: WarningMessage.InvalidDate.Text
msgid "An invalid value for date or time was supplied. Please try again."
msgstr ""
#: Help.ChangeDate
msgid "Change the time and date for the CryptoBox server."
msgstr ""

View file

@ -100,3 +100,7 @@ msgstr ""
#: WarningMessage.InvalidDate.Text
msgid "An invalid value for date or time was supplied. Please try again."
msgstr ""
#: Help.ChangeDate
msgid "Change the time and date for the CryptoBox server."
msgstr ""

View file

@ -100,3 +100,7 @@ msgstr ""
#: WarningMessage.InvalidDate.Text
msgid "An invalid value for date or time was supplied. Please try again."
msgstr ""
#: Help.ChangeDate
msgid "Change the time and date for the CryptoBox server."
msgstr ""

View file

@ -100,3 +100,7 @@ msgstr ""
#: WarningMessage.InvalidDate.Text
msgid "An invalid value for date or time was supplied. Please try again."
msgstr ""
#: Help.ChangeDate
msgid "Change the time and date for the CryptoBox server."
msgstr ""

View file

@ -100,3 +100,7 @@ msgstr ""
#: WarningMessage.InvalidDate.Text
msgid "An invalid value for date or time was supplied. Please try again."
msgstr ""
#: Help.ChangeDate
msgid "Change the time and date for the CryptoBox server."
msgstr ""

View file

@ -99,3 +99,7 @@ msgstr "Neveljavna vrednost"
#: WarningMessage.InvalidDate.Text
msgid "An invalid value for date or time was supplied. Please try again."
msgstr "Nepravilen vnos datuma ali časa. Prosimo poskusite ponovno."
#: Help.ChangeDate
msgid "Change the time and date for the CryptoBox server."
msgstr ""

View file

@ -100,3 +100,7 @@ msgstr ""
#: WarningMessage.InvalidDate.Text
msgid "An invalid value for date or time was supplied. Please try again."
msgstr ""
#: Help.ChangeDate
msgid "Change the time and date for the CryptoBox server."
msgstr ""

View file

@ -22,6 +22,8 @@ Text.Months {
12 = December
}
Help.ChangeDate = Change the time and date for the CryptoBox server.
SuccessMessage {
DateChanged {
Title = Date changed

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

View file

@ -91,3 +91,7 @@ msgstr ""
#: AdviceMessage.NoLogFileConfigured.Text
msgid "The CryptoBox is not configured to log events to a file. Thus it is not possible to review log events."
msgstr ""
#: Help.EventLog
msgid "Here you can see the event log of the CryptoBox. Every message belongs to one of the following groups: information/warning/error as represented by the symbol in the leftmost column. You may choose to see all or only some selected messages. If you encounter any problems with the CryptoBox then you should send the most recent warnings and messages besides a detailed description to info@cryptobox.org."
msgstr ""

View file

@ -92,3 +92,7 @@ msgstr ""
#: AdviceMessage.NoLogFileConfigured.Text
msgid "The CryptoBox is not configured to log events to a file. Thus it is not possible to review log events."
msgstr ""
#: Help.EventLog
msgid "Here you can see the event log of the CryptoBox. Every message belongs to one of the following groups: information/warning/error as represented by the symbol in the leftmost column. You may choose to see all or only some selected messages. If you encounter any problems with the CryptoBox then you should send the most recent warnings and messages besides a detailed description to info@cryptobox.org."
msgstr ""

View file

@ -92,3 +92,7 @@ msgstr ""
#: AdviceMessage.NoLogFileConfigured.Text
msgid "The CryptoBox is not configured to log events to a file. Thus it is not possible to review log events."
msgstr ""
#: Help.EventLog
msgid "Here you can see the event log of the CryptoBox. Every message belongs to one of the following groups: information/warning/error as represented by the symbol in the leftmost column. You may choose to see all or only some selected messages. If you encounter any problems with the CryptoBox then you should send the most recent warnings and messages besides a detailed description to info@cryptobox.org."
msgstr ""

View file

@ -92,3 +92,7 @@ msgstr ""
#: AdviceMessage.NoLogFileConfigured.Text
msgid "The CryptoBox is not configured to log events to a file. Thus it is not possible to review log events."
msgstr ""
#: Help.EventLog
msgid "Here you can see the event log of the CryptoBox. Every message belongs to one of the following groups: information/warning/error as represented by the symbol in the leftmost column. You may choose to see all or only some selected messages. If you encounter any problems with the CryptoBox then you should send the most recent warnings and messages besides a detailed description to info@cryptobox.org."
msgstr ""

View file

@ -84,3 +84,19 @@ msgid ""
msgstr ""
"The CryptoBox is not configured to log events to a file. Thus it is not "
"possible to review log events."
#: Help.EventLog
msgid ""
"Here you can see the event log of the CryptoBox. Every message belongs to "
"one of the following groups: information/warning/error as represented by the "
"symbol in the leftmost column. You may choose to see all or only some "
"selected messages. If you encounter any problems with the CryptoBox then you "
"should send the most recent warnings and messages besides a detailed "
"description to info@cryptobox.org."
msgstr ""
"Here you can see the event log of the CryptoBox. Every message belongs to "
"one of the following groups: information/warning/error as represented by the "
"symbol in the leftmost column. You may choose to see all or only some "
"selected messages. If you encounter any problems with the CryptoBox then you "
"should send the most recent warnings and messages besides a detailed "
"description to info@cryptobox.org."

View file

@ -92,3 +92,7 @@ msgstr ""
#: AdviceMessage.NoLogFileConfigured.Text
msgid "The CryptoBox is not configured to log events to a file. Thus it is not possible to review log events."
msgstr ""
#: Help.EventLog
msgid "Here you can see the event log of the CryptoBox. Every message belongs to one of the following groups: information/warning/error as represented by the symbol in the leftmost column. You may choose to see all or only some selected messages. If you encounter any problems with the CryptoBox then you should send the most recent warnings and messages besides a detailed description to info@cryptobox.org."
msgstr ""

View file

@ -92,3 +92,7 @@ msgstr ""
#: AdviceMessage.NoLogFileConfigured.Text
msgid "The CryptoBox is not configured to log events to a file. Thus it is not possible to review log events."
msgstr ""
#: Help.EventLog
msgid "Here you can see the event log of the CryptoBox. Every message belongs to one of the following groups: information/warning/error as represented by the symbol in the leftmost column. You may choose to see all or only some selected messages. If you encounter any problems with the CryptoBox then you should send the most recent warnings and messages besides a detailed description to info@cryptobox.org."
msgstr ""

View file

@ -92,3 +92,7 @@ msgstr ""
#: AdviceMessage.NoLogFileConfigured.Text
msgid "The CryptoBox is not configured to log events to a file. Thus it is not possible to review log events."
msgstr ""
#: Help.EventLog
msgid "Here you can see the event log of the CryptoBox. Every message belongs to one of the following groups: information/warning/error as represented by the symbol in the leftmost column. You may choose to see all or only some selected messages. If you encounter any problems with the CryptoBox then you should send the most recent warnings and messages besides a detailed description to info@cryptobox.org."
msgstr ""

View file

@ -92,3 +92,7 @@ msgstr ""
#: AdviceMessage.NoLogFileConfigured.Text
msgid "The CryptoBox is not configured to log events to a file. Thus it is not possible to review log events."
msgstr ""
#: Help.EventLog
msgid "Here you can see the event log of the CryptoBox. Every message belongs to one of the following groups: information/warning/error as represented by the symbol in the leftmost column. You may choose to see all or only some selected messages. If you encounter any problems with the CryptoBox then you should send the most recent warnings and messages besides a detailed description to info@cryptobox.org."
msgstr ""

View file

@ -92,3 +92,7 @@ msgstr ""
#: AdviceMessage.NoLogFileConfigured.Text
msgid "The CryptoBox is not configured to log events to a file. Thus it is not possible to review log events."
msgstr ""
#: Help.EventLog
msgid "Here you can see the event log of the CryptoBox. Every message belongs to one of the following groups: information/warning/error as represented by the symbol in the leftmost column. You may choose to see all or only some selected messages. If you encounter any problems with the CryptoBox then you should send the most recent warnings and messages besides a detailed description to info@cryptobox.org."
msgstr ""

View file

@ -92,3 +92,7 @@ msgstr ""
#: AdviceMessage.NoLogFileConfigured.Text
msgid "The CryptoBox is not configured to log events to a file. Thus it is not possible to review log events."
msgstr ""
#: Help.EventLog
msgid "Here you can see the event log of the CryptoBox. Every message belongs to one of the following groups: information/warning/error as represented by the symbol in the leftmost column. You may choose to see all or only some selected messages. If you encounter any problems with the CryptoBox then you should send the most recent warnings and messages besides a detailed description to info@cryptobox.org."
msgstr ""

View file

@ -92,3 +92,7 @@ msgstr ""
#: AdviceMessage.NoLogFileConfigured.Text
msgid "The CryptoBox is not configured to log events to a file. Thus it is not possible to review log events."
msgstr ""
#: Help.EventLog
msgid "Here you can see the event log of the CryptoBox. Every message belongs to one of the following groups: information/warning/error as represented by the symbol in the leftmost column. You may choose to see all or only some selected messages. If you encounter any problems with the CryptoBox then you should send the most recent warnings and messages besides a detailed description to info@cryptobox.org."
msgstr ""

View file

@ -92,3 +92,7 @@ msgstr ""
#: AdviceMessage.NoLogFileConfigured.Text
msgid "The CryptoBox is not configured to log events to a file. Thus it is not possible to review log events."
msgstr ""
#: Help.EventLog
msgid "Here you can see the event log of the CryptoBox. Every message belongs to one of the following groups: information/warning/error as represented by the symbol in the leftmost column. You may choose to see all or only some selected messages. If you encounter any problems with the CryptoBox then you should send the most recent warnings and messages besides a detailed description to info@cryptobox.org."
msgstr ""

View file

@ -92,3 +92,7 @@ msgstr ""
#: AdviceMessage.NoLogFileConfigured.Text
msgid "The CryptoBox is not configured to log events to a file. Thus it is not possible to review log events."
msgstr ""
#: Help.EventLog
msgid "Here you can see the event log of the CryptoBox. Every message belongs to one of the following groups: information/warning/error as represented by the symbol in the leftmost column. You may choose to see all or only some selected messages. If you encounter any problems with the CryptoBox then you should send the most recent warnings and messages besides a detailed description to info@cryptobox.org."
msgstr ""

View file

@ -92,3 +92,7 @@ msgstr ""
#: AdviceMessage.NoLogFileConfigured.Text
msgid "The CryptoBox is not configured to log events to a file. Thus it is not possible to review log events."
msgstr ""
#: Help.EventLog
msgid "Here you can see the event log of the CryptoBox. Every message belongs to one of the following groups: information/warning/error as represented by the symbol in the leftmost column. You may choose to see all or only some selected messages. If you encounter any problems with the CryptoBox then you should send the most recent warnings and messages besides a detailed description to info@cryptobox.org."
msgstr ""

View file

@ -92,3 +92,7 @@ msgstr ""
#: AdviceMessage.NoLogFileConfigured.Text
msgid "The CryptoBox is not configured to log events to a file. Thus it is not possible to review log events."
msgstr ""
#: Help.EventLog
msgid "Here you can see the event log of the CryptoBox. Every message belongs to one of the following groups: information/warning/error as represented by the symbol in the leftmost column. You may choose to see all or only some selected messages. If you encounter any problems with the CryptoBox then you should send the most recent warnings and messages besides a detailed description to info@cryptobox.org."
msgstr ""

View file

@ -92,3 +92,7 @@ msgstr ""
#: AdviceMessage.NoLogFileConfigured.Text
msgid "The CryptoBox is not configured to log events to a file. Thus it is not possible to review log events."
msgstr ""
#: Help.EventLog
msgid "Here you can see the event log of the CryptoBox. Every message belongs to one of the following groups: information/warning/error as represented by the symbol in the leftmost column. You may choose to see all or only some selected messages. If you encounter any problems with the CryptoBox then you should send the most recent warnings and messages besides a detailed description to info@cryptobox.org."
msgstr ""

View file

@ -17,6 +17,8 @@ Text {
}
}
Help.EventLog = Here you can see the event log of the CryptoBox. Every message belongs to one of the following groups: information/warning/error as represented by the symbol in the leftmost column. You may choose to see all or only some selected messages. If you encounter any problems with the CryptoBox then you should send the most recent warnings and messages besides a detailed description to info@cryptobox.org.
AdviceMessage {
EmptyLog.Text = There are no messages available.

View file

@ -6,6 +6,10 @@
<h1><?cs var:html_escape(Lang.Plugins.logs.Title.Log) ?></h1>
<?cs call:handle_messages() ?>
<?cs call:show_help(Lang.Plugins.logs.Help.EventLog) ?>
<table border="0" align="center"><tr>
<td><?cs call:print_form_header("log-all", "logs") ?>
<button type="submit" value="refresh"><?cs
@ -23,8 +27,6 @@
</form></td>
</tr></table>
<?cs call:handle_messages() ?>
<div id="log">
<?cs if:Data.Plugins.logs.Destination != "file" ?>

View file

@ -8,9 +8,11 @@
<?cs call:handle_messages() ?>
<?cs call:show_help(Lang.Plugins.network.Help.Network) ?>
<?cs call:print_form_header("set_ip", "network") ?>
<p><label for="ip"><?cs var:html_escape(Lang.Plugins.network.Text.IP) ?>: </label>
<p><label for="ip"><?cs var:html_escape(Lang.Plugins.network.Text.IP) ?>: </label><br/>
<input class="ipnum" type="text" tabindex="1" name="ip1" size="3" id="ip"
value="<?cs var:Data.Plugins.network.ip.oc1
?>" />.<input class="ipnum" type="text" tabindex="2" name="ip2" size="3"
@ -20,9 +22,8 @@
?>" />.<input class="ipnum" type="text" tabindex="4" name="ip4" size="3"
value="<?cs var:Data.Plugins.network.ip.oc4 ?>" /></p>
<input type="hidden" tabindex="5" name="store" value="yes" />
<button type="submit"><?cs var:html_escape(Lang.Plugins.network.Button.Network) ?></button>
<p><input type="hidden" tabindex="5" name="store" value="yes" />
<button type="submit"><?cs var:html_escape(Lang.Plugins.network.Button.Network) ?></button></p>
</form>

View file

@ -43,3 +43,7 @@ msgstr ""
#: SuccessMessage.IPChanged.Text
msgid "The network address has been changed. In a few seconds you will get redirected to the new address."
msgstr ""
#: Help.Network
msgid "Change the network address of the CryptoBox server. Be aware that you may lose your connection to the server under some circumstances."
msgstr ""

View file

@ -44,3 +44,7 @@ msgstr ""
#: SuccessMessage.IPChanged.Text
msgid "The network address has been changed. In a few seconds you will get redirected to the new address."
msgstr ""
#: Help.Network
msgid "Change the network address of the CryptoBox server. Be aware that you may lose your connection to the server under some circumstances."
msgstr ""

View file

@ -44,3 +44,7 @@ msgstr ""
#: SuccessMessage.IPChanged.Text
msgid "The network address has been changed. In a few seconds you will get redirected to the new address."
msgstr ""
#: Help.Network
msgid "Change the network address of the CryptoBox server. Be aware that you may lose your connection to the server under some circumstances."
msgstr ""

View file

@ -44,3 +44,7 @@ msgstr ""
#: SuccessMessage.IPChanged.Text
msgid "The network address has been changed. In a few seconds you will get redirected to the new address."
msgstr ""
#: Help.Network
msgid "Change the network address of the CryptoBox server. Be aware that you may lose your connection to the server under some circumstances."
msgstr ""

View file

@ -37,5 +37,13 @@ msgstr ""
"The network address has been changed. In a few seconds you will get "
"redirected to the new address."
#: Help.Network
msgid ""
"Change the network address of the CryptoBox server. Be aware that you may "
"lose your connection to the server under some circumstances."
msgstr ""
"Change the network address of the CryptoBox server. Be aware that you may "
"lose your connection to the server under some circumstances."
#~ msgid "The network address (IP) was invalid and therefore not changed."
#~ msgstr "The network address (IP) was invalid and therefore not changed."

View file

@ -44,3 +44,7 @@ msgstr ""
#: SuccessMessage.IPChanged.Text
msgid "The network address has been changed. In a few seconds you will get redirected to the new address."
msgstr ""
#: Help.Network
msgid "Change the network address of the CryptoBox server. Be aware that you may lose your connection to the server under some circumstances."
msgstr ""

View file

@ -44,3 +44,7 @@ msgstr ""
#: SuccessMessage.IPChanged.Text
msgid "The network address has been changed. In a few seconds you will get redirected to the new address."
msgstr ""
#: Help.Network
msgid "Change the network address of the CryptoBox server. Be aware that you may lose your connection to the server under some circumstances."
msgstr ""

View file

@ -44,3 +44,7 @@ msgstr ""
#: SuccessMessage.IPChanged.Text
msgid "The network address has been changed. In a few seconds you will get redirected to the new address."
msgstr ""
#: Help.Network
msgid "Change the network address of the CryptoBox server. Be aware that you may lose your connection to the server under some circumstances."
msgstr ""

View file

@ -44,3 +44,7 @@ msgstr ""
#: SuccessMessage.IPChanged.Text
msgid "The network address has been changed. In a few seconds you will get redirected to the new address."
msgstr ""
#: Help.Network
msgid "Change the network address of the CryptoBox server. Be aware that you may lose your connection to the server under some circumstances."
msgstr ""

View file

@ -44,3 +44,7 @@ msgstr ""
#: SuccessMessage.IPChanged.Text
msgid "The network address has been changed. In a few seconds you will get redirected to the new address."
msgstr ""
#: Help.Network
msgid "Change the network address of the CryptoBox server. Be aware that you may lose your connection to the server under some circumstances."
msgstr ""

View file

@ -44,3 +44,7 @@ msgstr ""
#: SuccessMessage.IPChanged.Text
msgid "The network address has been changed. In a few seconds you will get redirected to the new address."
msgstr ""
#: Help.Network
msgid "Change the network address of the CryptoBox server. Be aware that you may lose your connection to the server under some circumstances."
msgstr ""

View file

@ -44,3 +44,7 @@ msgstr ""
#: SuccessMessage.IPChanged.Text
msgid "The network address has been changed. In a few seconds you will get redirected to the new address."
msgstr ""
#: Help.Network
msgid "Change the network address of the CryptoBox server. Be aware that you may lose your connection to the server under some circumstances."
msgstr ""

View file

@ -44,3 +44,7 @@ msgstr ""
#: SuccessMessage.IPChanged.Text
msgid "The network address has been changed. In a few seconds you will get redirected to the new address."
msgstr ""
#: Help.Network
msgid "Change the network address of the CryptoBox server. Be aware that you may lose your connection to the server under some circumstances."
msgstr ""

View file

@ -44,3 +44,7 @@ msgstr ""
#: SuccessMessage.IPChanged.Text
msgid "The network address has been changed. In a few seconds you will get redirected to the new address."
msgstr ""
#: Help.Network
msgid "Change the network address of the CryptoBox server. Be aware that you may lose your connection to the server under some circumstances."
msgstr ""

View file

@ -44,3 +44,7 @@ msgstr ""
#: SuccessMessage.IPChanged.Text
msgid "The network address has been changed. In a few seconds you will get redirected to the new address."
msgstr ""
#: Help.Network
msgid "Change the network address of the CryptoBox server. Be aware that you may lose your connection to the server under some circumstances."
msgstr ""

View file

@ -44,3 +44,7 @@ msgstr ""
#: SuccessMessage.IPChanged.Text
msgid "The network address has been changed. In a few seconds you will get redirected to the new address."
msgstr ""
#: Help.Network
msgid "Change the network address of the CryptoBox server. Be aware that you may lose your connection to the server under some circumstances."
msgstr ""

View file

@ -44,3 +44,7 @@ msgstr ""
#: SuccessMessage.IPChanged.Text
msgid "The network address has been changed. In a few seconds you will get redirected to the new address."
msgstr ""
#: Help.Network
msgid "Change the network address of the CryptoBox server. Be aware that you may lose your connection to the server under some circumstances."
msgstr ""

View file

@ -7,6 +7,7 @@ Button.Network = Update network settings
Text.IP = Network address
Help.Network = Change the network address of the CryptoBox server. Be aware that you may lose your connection to the server under some circumstances.
WarningMessage {
InvalidIP {

View file

@ -9,3 +9,6 @@
<input type="hidden" name="create_config_partition" value="1" />
<?cs /if ?>
<?cs # the confirm question was asked only once ?>
<input type="hidden" name="confirm" value="1" />

View file

@ -199,3 +199,15 @@ msgstr ""
#: WarningMessage.PartitionTooSmall.Text
msgid "The minimum size of a volume is 10 megabytes."
msgstr ""
#: Text.Confirm
msgid "Yes, I know what I am doing!"
msgstr ""
#: WarningMessage.FormatNotConfirmed.Title
msgid "Confirmation missing"
msgstr ""
#: WarningMessage.FormatNotConfirmed.Text
msgid "You did not confirm this action by activating the checkbox."
msgstr ""

View file

@ -200,3 +200,15 @@ msgstr ""
#: WarningMessage.PartitionTooSmall.Text
msgid "The minimum size of a volume is 10 megabytes."
msgstr ""
#: Text.Confirm
msgid "Yes, I know what I am doing!"
msgstr ""
#: WarningMessage.FormatNotConfirmed.Title
msgid "Confirmation missing"
msgstr ""
#: WarningMessage.FormatNotConfirmed.Text
msgid "You did not confirm this action by activating the checkbox."
msgstr ""

View file

@ -200,3 +200,15 @@ msgstr ""
#: WarningMessage.PartitionTooSmall.Text
msgid "The minimum size of a volume is 10 megabytes."
msgstr ""
#: Text.Confirm
msgid "Yes, I know what I am doing!"
msgstr ""
#: WarningMessage.FormatNotConfirmed.Title
msgid "Confirmation missing"
msgstr ""
#: WarningMessage.FormatNotConfirmed.Text
msgid "You did not confirm this action by activating the checkbox."
msgstr ""

View file

@ -200,3 +200,15 @@ msgstr ""
#: WarningMessage.PartitionTooSmall.Text
msgid "The minimum size of a volume is 10 megabytes."
msgstr ""
#: Text.Confirm
msgid "Yes, I know what I am doing!"
msgstr ""
#: WarningMessage.FormatNotConfirmed.Title
msgid "Confirmation missing"
msgstr ""
#: WarningMessage.FormatNotConfirmed.Text
msgid "You did not confirm this action by activating the checkbox."
msgstr ""

View file

@ -220,6 +220,18 @@ msgstr "The volume size you entered exceeded the available size of the disk."
msgid "The minimum size of a volume is 10 megabytes."
msgstr "The minimum size of a volume is 10 megabytes."
#: Text.Confirm
msgid "Yes, I know what I am doing!"
msgstr "Yes, I know what I am doing!"
#: WarningMessage.FormatNotConfirmed.Title
msgid "Confirmation missing"
msgstr "Confirmation missing"
#: WarningMessage.FormatNotConfirmed.Text
msgid "You did not confirm this action by activating the checkbox."
msgstr "You did not confirm this action by activating the checkbox."
#~ msgid "Manage volumes"
#~ msgstr "Manage volumes"

View file

@ -200,3 +200,15 @@ msgstr ""
#: WarningMessage.PartitionTooSmall.Text
msgid "The minimum size of a volume is 10 megabytes."
msgstr ""
#: Text.Confirm
msgid "Yes, I know what I am doing!"
msgstr ""
#: WarningMessage.FormatNotConfirmed.Title
msgid "Confirmation missing"
msgstr ""
#: WarningMessage.FormatNotConfirmed.Text
msgid "You did not confirm this action by activating the checkbox."
msgstr ""

View file

@ -200,3 +200,15 @@ msgstr ""
#: WarningMessage.PartitionTooSmall.Text
msgid "The minimum size of a volume is 10 megabytes."
msgstr ""
#: Text.Confirm
msgid "Yes, I know what I am doing!"
msgstr ""
#: WarningMessage.FormatNotConfirmed.Title
msgid "Confirmation missing"
msgstr ""
#: WarningMessage.FormatNotConfirmed.Text
msgid "You did not confirm this action by activating the checkbox."
msgstr ""

View file

@ -200,3 +200,15 @@ msgstr ""
#: WarningMessage.PartitionTooSmall.Text
msgid "The minimum size of a volume is 10 megabytes."
msgstr ""
#: Text.Confirm
msgid "Yes, I know what I am doing!"
msgstr ""
#: WarningMessage.FormatNotConfirmed.Title
msgid "Confirmation missing"
msgstr ""
#: WarningMessage.FormatNotConfirmed.Text
msgid "You did not confirm this action by activating the checkbox."
msgstr ""

View file

@ -200,3 +200,15 @@ msgstr ""
#: WarningMessage.PartitionTooSmall.Text
msgid "The minimum size of a volume is 10 megabytes."
msgstr ""
#: Text.Confirm
msgid "Yes, I know what I am doing!"
msgstr ""
#: WarningMessage.FormatNotConfirmed.Title
msgid "Confirmation missing"
msgstr ""
#: WarningMessage.FormatNotConfirmed.Text
msgid "You did not confirm this action by activating the checkbox."
msgstr ""

View file

@ -200,3 +200,15 @@ msgstr ""
#: WarningMessage.PartitionTooSmall.Text
msgid "The minimum size of a volume is 10 megabytes."
msgstr ""
#: Text.Confirm
msgid "Yes, I know what I am doing!"
msgstr ""
#: WarningMessage.FormatNotConfirmed.Title
msgid "Confirmation missing"
msgstr ""
#: WarningMessage.FormatNotConfirmed.Text
msgid "You did not confirm this action by activating the checkbox."
msgstr ""

View file

@ -200,3 +200,15 @@ msgstr ""
#: WarningMessage.PartitionTooSmall.Text
msgid "The minimum size of a volume is 10 megabytes."
msgstr ""
#: Text.Confirm
msgid "Yes, I know what I am doing!"
msgstr ""
#: WarningMessage.FormatNotConfirmed.Title
msgid "Confirmation missing"
msgstr ""
#: WarningMessage.FormatNotConfirmed.Text
msgid "You did not confirm this action by activating the checkbox."
msgstr ""

View file

@ -200,3 +200,15 @@ msgstr ""
#: WarningMessage.PartitionTooSmall.Text
msgid "The minimum size of a volume is 10 megabytes."
msgstr ""
#: Text.Confirm
msgid "Yes, I know what I am doing!"
msgstr ""
#: WarningMessage.FormatNotConfirmed.Title
msgid "Confirmation missing"
msgstr ""
#: WarningMessage.FormatNotConfirmed.Text
msgid "You did not confirm this action by activating the checkbox."
msgstr ""

View file

@ -200,3 +200,15 @@ msgstr ""
#: WarningMessage.PartitionTooSmall.Text
msgid "The minimum size of a volume is 10 megabytes."
msgstr ""
#: Text.Confirm
msgid "Yes, I know what I am doing!"
msgstr ""
#: WarningMessage.FormatNotConfirmed.Title
msgid "Confirmation missing"
msgstr ""
#: WarningMessage.FormatNotConfirmed.Text
msgid "You did not confirm this action by activating the checkbox."
msgstr ""

View file

@ -200,3 +200,15 @@ msgstr ""
#: WarningMessage.PartitionTooSmall.Text
msgid "The minimum size of a volume is 10 megabytes."
msgstr ""
#: Text.Confirm
msgid "Yes, I know what I am doing!"
msgstr ""
#: WarningMessage.FormatNotConfirmed.Title
msgid "Confirmation missing"
msgstr ""
#: WarningMessage.FormatNotConfirmed.Text
msgid "You did not confirm this action by activating the checkbox."
msgstr ""

View file

@ -200,3 +200,15 @@ msgstr ""
#: WarningMessage.PartitionTooSmall.Text
msgid "The minimum size of a volume is 10 megabytes."
msgstr ""
#: Text.Confirm
msgid "Yes, I know what I am doing!"
msgstr ""
#: WarningMessage.FormatNotConfirmed.Title
msgid "Confirmation missing"
msgstr ""
#: WarningMessage.FormatNotConfirmed.Text
msgid "You did not confirm this action by activating the checkbox."
msgstr ""

View file

@ -200,3 +200,15 @@ msgstr ""
#: WarningMessage.PartitionTooSmall.Text
msgid "The minimum size of a volume is 10 megabytes."
msgstr ""
#: Text.Confirm
msgid "Yes, I know what I am doing!"
msgstr ""
#: WarningMessage.FormatNotConfirmed.Title
msgid "Confirmation missing"
msgstr ""
#: WarningMessage.FormatNotConfirmed.Text
msgid "You did not confirm this action by activating the checkbox."
msgstr ""

View file

@ -200,3 +200,15 @@ msgstr ""
#: WarningMessage.PartitionTooSmall.Text
msgid "The minimum size of a volume is 10 megabytes."
msgstr ""
#: Text.Confirm
msgid "Yes, I know what I am doing!"
msgstr ""
#: WarningMessage.FormatNotConfirmed.Title
msgid "Confirmation missing"
msgstr ""
#: WarningMessage.FormatNotConfirmed.Text
msgid "You did not confirm this action by activating the checkbox."
msgstr ""

View file

@ -13,6 +13,7 @@ Button {
}
Text {
Confirm = Yes, I know what I am doing!
FS {
Type = Filesystem type
Fat = FAT (Windows)
@ -58,6 +59,11 @@ SuccessMessage {
}
WarningMessage {
FormatNotConfirmed {
Title = Confirmation missing
Text = You did not confirm this action by activating the checkbox.
}
NoDisksAvailable {
Title = No disks found
Text = No suitable disks found - please check your configuration and hardware setup.

View file

@ -75,6 +75,11 @@ class partition(cryptobox.plugins.base.CryptoBoxPlugin):
## no (or invalid) device was supplied
if not self.device:
step = "select_device"
## no confirm setting?
if not args.has_key("confirm") or (args["confirm"] != "1"):
if self.device:
self.hdf["Data.Warning"] = "Plugins.partition.FormatNotConfirmed"
return self.__action_select_device()
if step == "add_partition":
return self.__action_add_partition(args)
elif step == "del_partition":
@ -227,8 +232,12 @@ class partition(cryptobox.plugins.base.CryptoBoxPlugin):
#self.cbox.reReadContainerList()
## write config data
self.cbox.prefs.mount_partition()
self.cbox.prefs.write()
self.cbox.log.info("settings stored on config partition")
try:
self.cbox.prefs.write()
self.cbox.log.info("settings stored on config partition")