Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1712) +++ branches/2.8.x/CHANGELOG (revision 1713) @@ -13,6 +13,8 @@ +29 Aug-2012 Build 1713 Dietmar Woellbrink (Luisehahne) +! remove html markup from code to a template 29 Aug-2012 Build 1712 Dietmar Woellbrink (Luisehahne) ! update folder admin/addons admin/skel/htt 29 Aug-2012 Build 1711 Dietmar Woellbrink (Luisehahne) Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1712) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1713) @@ -51,5 +51,5 @@ // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) if(!defined('VERSION')) define('VERSION', '2.8.3'); -if(!defined('REVISION')) define('REVISION', '1712'); +if(!defined('REVISION')) define('REVISION', '1713'); if(!defined('SP')) define('SP', ''); Index: branches/2.8.x/wb/modules/SecureFormSwitcher/htt/switchform.htt =================================================================== --- branches/2.8.x/wb/modules/SecureFormSwitcher/htt/switchform.htt (revision 1712) +++ branches/2.8.x/wb/modules/SecureFormSwitcher/htt/switchform.htt (revision 1713) @@ -1,141 +1,114 @@ - - - - - - - - - - - - - - - -
Status: {TXT_HEADING}

{TEXT_INFO}

{FILE_FORMTAB_NOT_GOUND}

- + +
{FTAN} -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 
 
 
 
 
- - -
-
-
- - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - -
- + + + +
+
+ + +
+
+ + +
+
+
+
+ -
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + -
- - -
   
 
- -
-
+
+
- - +
+
+ +
+ + +
+
+
+
+
+
+ +
+
+
+ +
+ + + \ No newline at end of file Index: branches/2.8.x/wb/modules/SecureFormSwitcher/tool.php =================================================================== --- branches/2.8.x/wb/modules/SecureFormSwitcher/tool.php (revision 1712) +++ branches/2.8.x/wb/modules/SecureFormSwitcher/tool.php (revision 1713) @@ -4,7 +4,7 @@ * @category modules * @package SecureFormSwitcher * @author WebsiteBaker Project, D Woellbrink - * @copyright 2009-2011, Website Baker Org. e.V. + * @copyright 2009-2012, WebsiteBaker Org. e.V. * @link http://www.websitebaker2.org/ * @license http://www.gnu.org/licenses/gpl.html * @platform WebsiteBaker 2.8.2 @@ -18,11 +18,14 @@ // Must include code to stop this file being access directly if(defined('WB_PATH') == false) { - die('Access denied

Cannot access this file directly

'); + die('

Cannot access this file directly

'); } // load module language file $mod_path = (dirname(__FILE__)); +$mod_rel = str_replace('\\','/',str_replace(WB_PATH,'',$mod_path)); +$sModulesUrl = WB_URL.$mod_rel; +//echo realpath($mod_rel); require_once( $mod_path.'/language_load.php' ); // callback function for settings name function converttoupper($val, $key, $vars) { @@ -33,6 +36,7 @@ // create backlinks $js_back = ADMIN_URL.'/admintools/tool.php?tool=SecureFormSwitcher'; $backlink = ADMIN_URL.'/admintools/index.php'; + $FileNotFound = ' '; // defaults settings $default_cfg = array( @@ -69,6 +73,8 @@ $action = 'show'; $action = isset($_POST['save_settings']) ? 'save_settings' : $action; $action = isset($_POST['save_settings_default']) ? 'save_settings_default' : $action; +$action = isset($_POST['save_settings']) ? 'save_settings' : $action; +//$action = isset($_POST['cancel']) ? 'cancel' : $action; switch ($action) : case 'save_settings': @@ -90,7 +96,6 @@ break; endswitch; - switch ($action) : case 'save_settings': case 'save_settings_default': @@ -125,21 +130,21 @@ $oSecureTpl->debug = false; // false, true $oSecureTpl->set_block('page', 'main_block', 'main'); -$checked = ($setting['secure_form_module']!=''); - +$checked = ($setting['secure_form_module']!=''); +$target = ($checked) ? '.'.$setting['secure_form_module'] : ''; +$target = WB_PATH.'/framework/SecureForm'.$target.'.php'; $ftanMode = ($checked ? $SFS_TEXT['SECURE_FORM'] : $SFS_TEXT['SECURE_FORMMTAB']); -$target = ($checked) ? '.'.$setting['secure_form_module'] : ''; -$target = WB_PATH.'/framework/SecureForm'.$target.'.php'; $SingleTabStatus = intval($checked==false); $MultitabStatus = intval($checked==true); $NotFoundClass = ''; +$HiddenClass = 'none'; +$FileNotFound = ''; if(!file_exists($MultitabTarget)) { $SingleTabStatus = true; $MultitabStatus = false; - $FileNotFound = $SFS_TEXT['FILE_FORMTAB_NOT_GOUND']; - $NotFoundClass = 'class="warning"'; -} else { + $FileNotFound = $SFS_TEXT['FILE_FORMTAB_NOT_FOUND']; + $HiddenClass = 'warning'; } // convert settings name to upper @@ -148,9 +153,13 @@ $oSecureTpl->set_var($replace); $oSecureTpl->set_var(array( 'FTAN' => $admin->getFTAN(), + 'ADMIN_URL' => ADMIN_URL, + 'WB_URL' => WB_URL, + 'URL_VIEW' => WB_URL, + 'THEME_URL' => THEME_URL, 'SERVER_REQUEST_URI' => $_SERVER['REQUEST_URI'], 'TEXT_CANCEL' => $TEXT['CANCEL'], - 'BACKLINK' => (isset($_POST['cancel'])) ? $backlink : '#', + 'BACKLINK' => $backlink, 'TEXT_INFO' => $SFS_TEXT['INFO'], 'TEXT_SUBMIT' => $SFS_TEXT['SUBMIT'], 'TEXT_MSUBMIT' => $SFS_TEXT['RESET_SETTINGS'], @@ -158,20 +167,22 @@ 'SELECTED' => ( ($SingleTabStatus) ? ' checked="checked"' : ''), 'SELECTED_TAB' => ( ($MultitabStatus) ? ' checked="checked"' : ''), 'SUBMIT_TYPE' => ($checked ? 'multitab' : 'singletab'), + 'MODULES_URL' => $sModulesUrl, 'MSELECTED' => '', 'MSELECTED_TAB' => '', + 'DISPLAY_MISSING_MTAB' => $HiddenClass, +// 'DISPLAY_RIGHT_SUBMIT' => ( ($MultitabStatus) ? '' : 'none'), 'FTAN_COLOR' => ($checked ? 'grey' : 'norm'), 'TXT_SUBMIT_FORM' => $SFS_TEXT['SUBMIT_FORM'], 'TXT_SUBMIT_FORMTAB' => $SFS_TEXT['SUBMIT_FORMTAB'], 'FILE_FORMTAB_WARNING' => $NotFoundClass, - 'FILE_FORMTAB_NOT_GOUND' => $FileNotFound, + 'FILE_FORMTAB_NOT_FOUND' => $FileNotFound, ) ); $oSecureTpl->set_var(array( 'USEIP_SELECTED' => '', - 'TXT_SECFORM_USEIP' => $SFS_TEXT['WB_SECFORM_USEIP'], - 'TXT_SECFORM_USEIP_TOOLTIP' => $SFS_TEXT['WB_SECFORM_USEIP_TOOLTIP'], // Tooltip + 'TXT_SECFORM_USEIP' => $CAPTION['WB_SECFORM_USEIP'], 'TEXT_DEFAULT_SETTINGS' => $HEADING['DEFAULT_SETTINGS'], 'USEIP_DEFAULT' => $default_cfg['fingerprint_with_ip_octets'], 'USEFP_CHECKED_TRUE' => (($setting['wb_secform_usefp']=='true') ? ' checked="checked"' : ''), @@ -180,6 +191,13 @@ ) ); +foreach($HELP as $key=>$value) +{ + $sHelp[$key] = $value; + $oSecureTpl->set_var('p_'.strtolower($key), p($sHelp[$key],$CAPTION[$key] )); +// echo ' {p_'.strtolower($key).'}
'; +} + $oSecureTpl->set_block('main_block', 'useip_mtab_loop', 'mtab_loop'); for($x=0; $x < 5; $x++) { // iu value == default set first option with standardtext @@ -204,20 +222,17 @@ $oSecureTpl->set_block('main_block', 'mtab_block', 'mtab'); if($checked) { $oSecureTpl->set_var(array( - 'TEXT_ENABLED' => $SFS_TEXT['ON_OFF'], - 'TXT_SECFORM_TOKENNAME' => $SFS_TEXT['WB_SECFORM_TOKENNAME'], - 'TXT_SECFORM_TOKENNAME_TOOLTIP' => $SFS_TEXT['WB_SECFORM_TOKENNAME_TOOLTIP'], - 'TXT_SECFORM_TIMEOUT' => $SFS_TEXT['WB_SECFORM_TIMEOUT'], - 'TXT_SECFORM_TIMEOUT_TOOLTIP' => $SFS_TEXT['WB_SECFORM_TIMEOUT_TOOLTIP'], - 'TXT_SECFORM_SECRETTIME' => $SFS_TEXT['WB_SECFORM_SECRETTIME'], - 'TXT_SECFORM_SECRETTIME_TOOLTIP' => $SFS_TEXT['WB_SECFORM_SECRETTIME_TOOLTIP'], - 'TXT_SECFORM_SECRET' => $SFS_TEXT['WB_SECFORM_SECRET'], - 'TXT_SECFORM_SECRET_TOOLTIP' => $SFS_TEXT['WB_SECFORM_SECRET_TOOLTIP'], - 'TXT_SECFORM_USEFP' => $SFS_TEXT['WB_SECFORM_USEFP'], + 'TEXT_ENABLED' => $SFS_TEXT['ON'], + 'TEXT_DISABLED' => $SFS_TEXT['OFF'], + 'TXT_SECFORM_TOKENNAME' => $CAPTION['WB_SECFORM_TOKENNAME'], + 'TXT_SECFORM_TIMEOUT' => $CAPTION['WB_SECFORM_TIMEOUT'], + 'TXT_SECFORM_SECRETTIME' => $CAPTION['WB_SECFORM_SECRETTIME'], + 'TXT_SECFORM_SECRET' => $CAPTION['WB_SECFORM_SECRET'], + 'TXT_SECFORM_USEFP' => $CAPTION['WB_SECFORM_USEFP'], 'SECFORM_USEFP' => 'true', - 'TXT_SECFORM_USEFP_TOOLTIP' => $SFS_TEXT['WB_SECFORM_USEFP_TOOLTIP'], ) ); + $oSecureTpl->parse('mtab','mtab_block', true); $oSecureTpl->parse('show_mtab','show_mtab_block', true); } else { @@ -231,3 +246,38 @@ unset($oSecureTpl); print $output; + +/** + * p() + * + * @param string $text + * @param string $caption + * @return + */ +function p($sTooltip,$sCaption) +{ + global $admin; + $retVal = 'onmouseover="return overlib('; + $retVal .= '\''.$sTooltip.'\','; + $retVal .= 'CAPTION,\''.$sCaption.'\','; + $retVal .= 'FGCOLOR,\'#ffffff\','; + $retVal .= 'BGCOLOR,\'#557c9e\','; + $retVal .= 'BORDER,1,'; + $retVal .= 'WIDTH,'; + $retVal .= 'HEIGHT,'; + $retVal .= 'STICKY,'; + $retVal .= 'CAPTIONSIZE,\'13px\','; + $retVal .= 'CLOSETEXT,\'X\','; + $retVal .= 'CLOSESIZE,\'16px\','; + $retVal .= 'CLOSECOLOR,\'#ffffff\','; + $retVal .= 'TEXTSIZE,\'12px\','; + $retVal .= 'VAUTO,'; + $retVal .= 'HAUTO,'; + $retVal .= 'MOUSEOFF,'; + $retVal .= 'WRAP,'; + $retVal .= 'CELLPAD,5'; + $retVal .= ')" onmouseout="return nd();"'; +// $retVal .= ''; + + return $retVal; +} Index: branches/2.8.x/wb/modules/SecureFormSwitcher/languages/EN.php =================================================================== --- branches/2.8.x/wb/modules/SecureFormSwitcher/languages/EN.php (revision 1712) +++ branches/2.8.x/wb/modules/SecureFormSwitcher/languages/EN.php (revision 1713) @@ -3,9 +3,8 @@ * * @category modules * @package SecureFormSwitcher - * @author WebsiteBaker Project - * @copyright 2004-2009, Ryan Djurovich - * @copyright 2009-2011, Website Baker Org. e.V. + * @author Ryan Djurovich, WebsiteBaker Project + * @copyright 2009-2012, WebsiteBaker Org. e.V. * @link http://www.websitebaker2.org/ * @license http://www.gnu.org/licenses/gpl.html * @platform WebsiteBaker 2.8.2 @@ -14,7 +13,7 @@ * @filesource $HeadURL$ * @lastmodified $Date$ * -*/ + */ //Module description $module_description = 'This module switch between the SingleTab SecureForm and MultiTab SecureForm.'; @@ -24,7 +23,7 @@ $SFS_TEXT['TXT_FTAN_SWITCH'] = 'Change to '; $SFS_TEXT['SECURE_FORM'] = 'SingleTab SecureForm'; $SFS_TEXT['SECURE_FORMMTAB'] = 'Multitab SecureForm'; -$SFS_TEXT['FILE_FORMTAB_NOT_GOUND'] = 'Multitab not possible!
Needed file \'/framework/SecureForm.mtab.php\' not found!
+$SFS_TEXT['FILE_FORMTAB_NOT_FOUND'] = 'Multitab not possible!
Needed file \'/framework/SecureForm.mtab.php\' not found!
You have to upload the file manually via FTP'; $SFS_TEXT['SUBMIT_FORM'] = 'Single Tab (recommended)'; $SFS_TEXT['SUBMIT_FORMTAB'] = 'Multi Tab'; @@ -31,25 +30,23 @@ $SFS_TEXT['SUBMIT'] = 'Accept'; $SFS_TEXT['INFO'] = 'Please select if you want to use the default security settings or the settings for working with several WebsiteBaker instances in parallel browser tabs.'; $SFS_TEXT['RESET_SETTINGS'] = 'Default setting'; -$SFS_TEXT['ON_OFF'] = 'On/OFF'; +$SFS_TEXT['ON'] = 'ON'; +$SFS_TEXT['OFF'] = 'OFF'; +$CAPTION['WB_SECFORM_USEIP'] = 'IP-Blocks (1-4, 0=no check)'; +$CAPTION['WB_SECFORM_TOKENNAME'] = 'Tokenname'; +$CAPTION['WB_SECFORM_SECRET'] = 'Secret (whatever you like)'; +$CAPTION['WB_SECFORM_SECRETTIME'] = 'Secrettime'; +$CAPTION['WB_SECFORM_TIMEOUT'] = 'Timeout'; +$CAPTION['WB_SECFORM_USEFP'] = 'Fingerprinting'; + // Variablen fuer AdminTool Optionen -$SFS_TEXT['WB_SECFORM_USEIP'] = 'IP-Blocks (1-4, 0=no check)'; -$SFS_TEXT['WB_SECFORM_USEIP_TOOLTIP'] = 'Help -These number of segments of an IP address can be used for the fingerprint. "4" means the whole IP address (this makes sense e.g. for servers with a stable IP address). "2" is a good compromise, because at home there\'s often the 24-hour reset and therefore only the first two segments keep constant. -'; -$SFS_TEXT['WB_SECFORM_TOKENNAME'] = 'Tokenname'; -$SFS_TEXT['WB_SECFORM_TOKENNAME_TOOLTIP'] = 'HelpThe name of the token. Coll. a token is often called TAN.'; -$SFS_TEXT['WB_SECFORM_SECRET'] = 'Secret (whatever you like)'; -$SFS_TEXT['WB_SECFORM_SECRET_TOOLTIP'] = 'HelpA random key, that is being used for creating a TAN. Recommend are at least 20 digits.'; -$SFS_TEXT['WB_SECFORM_SECRETTIME'] = 'Secrettime'; -$SFS_TEXT['WB_SECFORM_SECRETTIME_TOOLTIP'] = 'HelpTime (in seconds), until the secret-key will be renewed.'; -$SFS_TEXT['WB_SECFORM_TIMEOUT'] = 'Timeout'; -$SFS_TEXT['WB_SECFORM_TIMEOUT_TOOLTIP'] = 'HelpTime (in seconds), until the form-token is void.'; -$SFS_TEXT['WB_SECFORM_USEFP'] = 'Fingerprinting'; -$SFS_TEXT['WB_SECFORM_USEFP_TOOLTIP'] = 'HelpRequire OS and browser for every TAN-validation additionally to the IP-address.'; +$HELP['WB_SECFORM_USEIP'] = 'These number of segments of an IP address can be used for the fingerprint. '; +$HELP['WB_SECFORM_USEIP'] = '4 means the whole IP address (this makes sense e.g. for servers with a stable IP address). '; +$HELP['WB_SECFORM_USEIP'] = '2 is a good compromise, because at home there\'s often the 24-hour reset and therefore only the first two segments keep constant. '; +$HELP['WB_SECFORM_USEIP'] = ''; +$HELP['WB_SECFORM_TOKENNAME'] = 'The name of the token. Coll. a token is often called TAN.'; +$HELP['WB_SECFORM_SECRET'] = 'A random key, that is being used for creating a TAN. Recommend are at least 20 digits.'; +$HELP['WB_SECFORM_SECRETTIME'] = 'Time (in seconds), until the secret-key will be renewed.'; +$HELP['WB_SECFORM_TIMEOUT'] = 'Time (in seconds), until the form-token is void.'; +$HELP['WB_SECFORM_USEFP'] = 'Require OS and browser for every TAN-validation additionally to the IP-address.'; Index: branches/2.8.x/wb/modules/SecureFormSwitcher/languages/DE.php =================================================================== --- branches/2.8.x/wb/modules/SecureFormSwitcher/languages/DE.php (revision 1712) +++ branches/2.8.x/wb/modules/SecureFormSwitcher/languages/DE.php (revision 1713) @@ -3,9 +3,8 @@ * * @category modules * @package SecureFormSwitcher - * @author WebsiteBaker Project - * @copyright 2004-2009, Ryan Djurovich - * @copyright 2009-2011, Website Baker Org. e.V. + * @author Ryan Djurovich, WebsiteBaker Project + * @copyright 2009-2012, WebsiteBaker Org. e.V. * @link http://www.websitebaker2.org/ * @license http://www.gnu.org/licenses/gpl.html * @platform WebsiteBaker 2.8.2 @@ -14,7 +13,7 @@ * @filesource $HeadURL$ * @lastmodified $Date$ * -*/ + */ //Module description $module_description = 'Dieses Modul wechselt zwischen SingleTab SecureForm und MultiTab SecureForm.'; @@ -24,7 +23,7 @@ $SFS_TEXT['TXT_FTAN_SWITCH'] = 'Wechsel zu '; $SFS_TEXT['SECURE_FORM'] = 'SingleTab SecureForm'; $SFS_TEXT['SECURE_FORMMTAB'] = 'Multitab SecureForm'; -$SFS_TEXT['FILE_FORMTAB_NOT_GOUND'] = 'Multitab nicht ausführbar!
Benötigte Datei \'/framework/SecureForm.mtab.php\' nicht gefunden!
+$SFS_TEXT['FILE_FORMTAB_NOT_FOUND'] = 'Multitab nicht ausführbar!
Benötigte Datei \'/framework/SecureForm.mtab.php\' nicht gefunden!
Sie müssen die Datei manuell über FTP hochspielen'; $SFS_TEXT['SUBMIT_FORM'] = 'SingleTab (empfohlen)'; $SFS_TEXT['SUBMIT_FORMTAB'] = 'Multi Tab'; @@ -31,25 +30,24 @@ $SFS_TEXT['SUBMIT'] = 'Übernehmen'; $SFS_TEXT['INFO'] = 'Hier können Sie auswählen, ob die Standard-Sicherheitseinstellung oder die Sicherheitseinstellung zur Verwendung von mehreren WebsiteBaker-Instanzen in parallelen Browser-Tabs aktiviert werden soll.'; $SFS_TEXT['RESET_SETTINGS'] = 'Standardeinstellung'; -$SFS_TEXT['ON_OFF'] = 'Ein/Aus'; +$SFS_TEXT['ON'] = 'Ein'; +$SFS_TEXT['OFF'] = 'Aus'; +$CAPTION['WB_SECFORM_USEIP'] = 'IP-Blocks (1-4, 0=kein Check)'; +$CAPTION['WB_SECFORM_TOKENNAME'] = 'Tokenname'; +$CAPTION['WB_SECFORM_SECRET'] = 'Secret (Beliebige Zeichen)'; +$CAPTION['WB_SECFORM_TIMEOUT'] = 'Timeout'; +$CAPTION['WB_SECFORM_SECRETTIME'] = 'Secrettime'; +$CAPTION['WB_SECFORM_USEFP'] = 'Fingerprinting'; + // Variablen fuer AdminTool Optionen -$SFS_TEXT['WB_SECFORM_USEIP'] = 'IP-Blocks (1-4, 0=kein Check)'; -$SFS_TEXT['WB_SECFORM_USEIP_TOOLTIP'] = 'Hilfe -Diese Anzahl der Segmente einer IP-Adresse werden für den Fingerprint genutzt. "4" heißt die gesamte IP-Adresse (dies macht nur bei festen IPs wie z.B. Servern Sinn). "2" ist ein guter Kompromiss, da im Heimbereich durch 24-Stunden Resets nur die ersten beiden Segmente konstant bleiben. -'; -$SFS_TEXT['WB_SECFORM_TOKENNAME'] = 'Tokenname'; -$SFS_TEXT['WB_SECFORM_TOKENNAME_TOOLTIP'] = 'HilfeDer Name des Tokens. Umgangssprachlich wird Token auch TAN genannt.'; -$SFS_TEXT['WB_SECFORM_SECRET'] = 'Secret (Beliebige Zeichen)'; -$SFS_TEXT['WB_SECFORM_SECRET_TOOLTIP'] = 'HilfeEin zufälliger Schlüssel, der für die Token-Erstellung verwendet wird. Empfohlen sind mind. 20 Zeichen.'; -$SFS_TEXT['WB_SECFORM_SECRETTIME'] = 'Secrettime'; -$SFS_TEXT['WB_SECFORM_SECRETTIME_TOOLTIP'] = 'HilfeZeit (in Sekunden), bis der Secret-Schlüssel sich erneuert.'; -$SFS_TEXT['WB_SECFORM_TIMEOUT'] = 'Timeout'; -$SFS_TEXT['WB_SECFORM_TIMEOUT_TOOLTIP'] = 'HilfeZeit (in Sekunden), bis ein Formular-Token nicht mehr gilt.'; -$SFS_TEXT['WB_SECFORM_USEFP'] = 'Fingerprinting'; -$SFS_TEXT['WB_SECFORM_USEFP_TOOLTIP'] = 'HilfeZusätzlich zur IP-Adresse wird Betriebssystem und Browser zu jeder TAN-Validierung hinzugezogen.'; +$HELP['WB_SECFORM_USEIP'] = 'Diese Anzahl der Segmente einer IP-Adresse werden für den Fingerprint genutzt. '; +$HELP['WB_SECFORM_USEIP'] .= '4 heißt die gesamte IP-Adresse (dies macht nur bei festen IPs wie z.B. Servern Sinn). '; +$HELP['WB_SECFORM_USEIP'] .= '2 ist ein guter Kompromiss, da im Heimbereich durch 24-Stunden Resets nur die ersten beiden Segmente konstant bleiben.'; +$HELP['WB_SECFORM_USEIP'] .= ''; + +$HELP['WB_SECFORM_TOKENNAME'] = 'Der Name des Tokens. Umgangssprachlich wird Token auch TAN genannt.'; +$HELP['WB_SECFORM_SECRET'] = 'Ein zufälliger Schlüssel, der für die Token-Erstellung verwendet wird. Empfohlen sind mind. 20 Zeichen.'; +$HELP['WB_SECFORM_SECRETTIME'] = 'Zeit (in Sekunden), bis der Secret-Schlüssel sich erneuert.'; +$HELP['WB_SECFORM_TIMEOUT'] = 'Zeit (in Sekunden), bis ein Formular-Token nicht mehr gilt.'; +$HELP['WB_SECFORM_USEFP'] = 'Zusätzlich zur IP-Adresse wird Betriebssystem und Browser zu jeder TAN-Validierung hinzugezogen.'; Index: branches/2.8.x/wb/modules/SecureFormSwitcher/icons/help_16.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/2.8.x/wb/modules/SecureFormSwitcher/icons/help_16.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: branches/2.8.x/wb/modules/SecureFormSwitcher/backend.css =================================================================== --- branches/2.8.x/wb/modules/SecureFormSwitcher/backend.css (revision 1712) +++ branches/2.8.x/wb/modules/SecureFormSwitcher/backend.css (revision 1713) @@ -1,66 +1,25 @@ @charset "UTF-8"; -td.content form.secure_switch .left-content { width :49%; float :left; } -td.content form.secure_switch .right-content { width :49%; float :right; } - -form.secure_switch { border :0px #484 solid; margin :1em 0; width :100%; } - -table.switch-ftan-info, -table.switch-ftan-form { width :100%; background-color :transparent; } -table.switch-ftan-info tbody, -table.switch-ftan-form tbody { margin :10px 0; } -table.switch-ftan-form tbody td label { font-weight :bold; font-size :1.0em; color :#000000; } -table.switch-ftan-info thead tr th { margin :20px 0; font-weight :bold; font-size :1.4em; background-color :transparent; color :#000000; text-align :left; } - -table.switch-ftan-info thead tr th span.norm { color : #003300; } -table.switch-ftan-info thead tr th span.grey { color : #666666; } - -table.switch-ftan-form tbody td { height :30px; vertical-align :middle; } -table.switch-ftan-form tbody td input[type="submit"] { font-size :1.0em; width : 40%; } -table.switch-ftan-form tbody td input[type="text"] { font-size :1.0em; width : 100%; } -table.switch-ftan-form tbody td select { font-size :1.0em; width : 101.5%; } - -.ok, .error { font-weight:bold; } -.ok { color:green; } -.error { color:red; } -.check { color:#555; } - -.module-info { padding :10px; margin :0px auto; background :transparent; color :#000000; font-size :1.0em; } -.module-info p { margin :0.2em auto; font-size :100%; } +.form-wrapper { position :relative; overflow :hidden; padding :5px; } +form.secure_switch { border :0px #484 solid; margin :10px 0; width :100%; overflow :hidden; } +form.secure_switch .left_submit, +form.secure_switch .left-content { width :35%; float :left; } +form.secure_switch .right_submit, +form.secure_switch .right-content { width :58%; float :right; } + form.secure_switch fieldset { border : 0px solid #666666; } + form.secure_switch fieldset legend { font-weight :normal; font-size :150%; border :none; } + form.secure_switch fieldset legend b { font-weight :normal; font-size :110%; border :none; } + form.secure_switch fieldset label { font-weight :bold; font-size :1.0em; color :#333333; } + form.secure_switch fieldset span label { padding-left : 6px; } +.left-content, .right-content { margin-bottom :-32767px; padding-bottom :32767px; } + form.secure_switch fieldset label { background-position :3px center; background-repeat :no-repeat; padding :4px 0 0 20px; } +form.secure_switch div.mbox { border :0px #484 solid; padding :1px 0; position :relative; margin :0 auto; display :block; overflow :auto; } +form.secure_switch div.mbox div { border :0px #484 solid; display :block; padding :1px 0; overflow :auto; } +i { font-weight :normal; } +.grey { color :#666666; } +.norm { color : #003366; } +/* .warning { border-radius :10px; -khtml-border-radius :10px; -webkit-border-radius :10px; -moz-border-radius :10px; background :#fee; border :0.2em #844 solid; color :#990000; margin :0.2em auto; padding :0.63em; width :60%; text-align :center; } .warning strong { font-size :1.2em; } .warning span { font-size :1.2em; line-height :1.5em; color :#333333; } - -/* Tooltip CSS */ -.tooltip { - border-bottom: 1px dotted #000000; - color: #000000; - outline: none; - cursor: help; - text-decoration: none; - position: relative; -} -.tooltip span { margin-left: -999em; position: absolute; } -.tooltip:hover em { - font-family: Candara, Tahoma, Geneva, sans-serif; - font-size: 1.2em; - font-weight: bold; - display: block; - padding: 0.2em 0 0.6em 0; -} -.tooltip:hover span { - border-radius: 5px 5px; - box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.1); - font-family: Calibri, Tahoma, Geneva, sans-serif; - position: absolute; - left: -15em; - top: 2em; - z-index: 99; - margin-left: 1em; - padding: 10px 10px 10px 50px; - width: 250px; -} -.help { - border: 1px solid #2bb0d7; - background: #9fdaee url(htt/help.png) no-repeat left; -} \ No newline at end of file +*/