Merge remote-tracking branch 'origin/master' into 0.10.0

2018-07-10 09:47:20 +02:00
parent 9e7715430b 1690cadab9
commit 963c7c4616
5 changed files with 12 additions and 6 deletions
--- a/lib/navigation/00.froxlor.main.php
+++ b/lib/navigation/00.froxlor.main.php
@@ -292,6 +292,12 @@ return array(
 					'label' => $lng['admin']['autoupdate'],
 					'required_resources' => 'change_serversettings',
 					'show_element' => extension_loaded('zip')
+				),
+				array(
+					'url' => 'admin_settings.php?page=wipecleartextmailpws',
+					'label' => $lng['admin']['wipecleartextmailpwd'],
+					'required_resources' => 'change_serversettings',
+					'show_element' => (Settings::Get('system.mailpwcleartext') == true)
 				)
 			)
 		),