maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

fix html-tag in preconfig, fix missing global in database-class, change description of password-reset-setting accordingly to new activation-link-procedure

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2013-12-02 20:39:15 +01:00
parent 30f7d0a070
commit 84f973ce26
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
install/updates/preconfig/0.9/preconfig_0.9.inc.php
View File

@@ -594,7 +594,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version)
if (versionInUpdate($current_version, '0.9.31-dev5')) { if (versionInUpdate($current_version, '0.9.31-dev5')) {
$has_preconfig = true; $has_preconfig = true;
$description = 'You can enbable/disable error-reporting for admins and customers!<br />br />'; $description = 'You can enbable/disable error-reporting for admins and customers!<br /><br />';
$question = '<strong>Do you want to enable error-reporting for admins? (default: yes):</strong>&nbsp;'; $question = '<strong>Do you want to enable error-reporting for admins? (default: yes):</strong>&nbsp;';
$question.= makeyesno('update_error_report_admin', '1', '0', '1').'<br />'; $question.= makeyesno('update_error_report_admin', '1', '0', '1').'<br />';
$question.= '<strong>Do you want to enable error-reporting for customers? (default: no):</strong>&nbsp;'; $question.= '<strong>Do you want to enable error-reporting for customers? (default: no):</strong>&nbsp;';

2
lib/classes/database/class.Database.php
View File

@@ -294,7 +294,7 @@ class Database {
* @param bool $showerror if set to false, the error will be logged but we go on * @param bool $showerror if set to false, the error will be logged but we go on
*/ */
private static function _showerror($error, $showerror = true) { private static function _showerror($error, $showerror = true) {
global $userinfo, $theme, $linker; global $userinfo, $settings, $theme, $linker;
/** /**
* log to a file, so we can actually ask people for the error * log to a file, so we can actually ask people for the error

4
lng/english.lng.php
View File

@@ -883,9 +883,9 @@ $lng['domains']['topleveldomain'] = 'Top-Level-Domain';
// ADDED IN 1.2.19-svn22 // ADDED IN 1.2.19-svn22
$lng['serversettings']['allow_password_reset']['description'] = 'Customers can reset their password and a new password will be sent to their e-mail address'; $lng['serversettings']['allow_password_reset']['description'] = 'Customers can reset their password and an activation link will be sent to their e-mail address';
$lng['serversettings']['allow_password_reset_admin']['title'] = 'Allow password reset by admins'; $lng['serversettings']['allow_password_reset_admin']['title'] = 'Allow password reset by admins';
$lng['serversettings']['allow_password_reset_admin']['description'] = 'Admins/reseller can reset their password and a new password will be sent to their e-mail address'; $lng['serversettings']['allow_password_reset_admin']['description'] = 'Admins/reseller can reset their password and an activation link will be sent to their e-mail address';
// ADDED IN 1.2.19-svn25 // ADDED IN 1.2.19-svn25

4
lng/german.lng.php
View File

@@ -882,9 +882,9 @@ $lng['domains']['topleveldomain'] = 'Top-Level-Domain';
// ADDED IN 1.2.19-svn22 // ADDED IN 1.2.19-svn22
$lng['serversettings']['allow_password_reset']['description'] = 'Kunden können ihr Passwort zurücksetzen und bekommen ein Neues per E-Mail zugesandt'; $lng['serversettings']['allow_password_reset']['description'] = 'Kunden können ihr Passwort zurücksetzen und bekommen einen Aktivierungs-Link per E-Mail zugesandt';
$lng['serversettings']['allow_password_reset_admin']['title'] = 'Erlaube das Zurücksetzen von Admin-/Reseller-Passwörtern.'; $lng['serversettings']['allow_password_reset_admin']['title'] = 'Erlaube das Zurücksetzen von Admin-/Reseller-Passwörtern.';
$lng['serversettings']['allow_password_reset_admin']['description'] = 'Admins/Reseller können ihr Passwort zurücksetzen und bekommen ein Neues per E-Mail zugesandt'; $lng['serversettings']['allow_password_reset_admin']['description'] = 'Admins/Reseller können ihr Passwort zurücksetzen und bekommen einen Aktivierungs-Link per E-Mail zugesandt';
// ADDED IN 1.2.19-svn25 // ADDED IN 1.2.19-svn25
// Mailquota // Mailquota