Browse files

Letzte Aenderungen fuer die Version 1.2.0

git-svn-id: file:///var/svn/trunk@50 45fdb5c4-e40b-0410-b369-9aab4fe9a275
  • Loading branch information...
1 parent c988d93 commit 92000699551fa11c3c58c2533cc33e4637c53c60 @flol committed Oct 12, 2004
View
4 syscp/install/updatesql.php
@@ -58,7 +58,7 @@
}
/**
- * Second case: We are updating from a version = 1.0.10
+ * Second case: We are updating from version = 1.0.10
*/
if($settings['panel']['version'] == '1.0.10')
{
@@ -73,6 +73,8 @@
include('./updatesql_1.2.inc.php');
}
+ updateCounters ();
+
header('Location: ../index.php');
?>
View
5 syscp/install/updatesql_1.0-1.2.inc.php
@@ -114,8 +114,9 @@
$db->query("INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (27, 'panel', 'webftp_url', '');");
$db->query("INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (28, 'panel', 'standardlanguage', 'german');");
- $db->query("UPDATE `".TABLE_PANEL_SETTINGS."` SET `value`='1.2-beta1' WHERE `settinggroup`='panel' AND `varname`='version'");
- $settings['panel']['version'] = '1.2-beta1';
+ $db->query("UPDATE `".TABLE_PANEL_SETTINGS."` SET `varname`='ipaddress' WHERE `settinggroup`='system' AND `varname`='ipadress'");
+ $db->query("UPDATE `".TABLE_PANEL_SETTINGS."` SET `value`='1.2.0' WHERE `settinggroup`='panel' AND `varname`='version'");
+ $settings['panel']['version'] = '1.2.0';
}
?>
View
7 syscp/install/updatesql_1.2.inc.php
@@ -17,11 +17,10 @@
* @version $Id$
*/
- if($settings['panel']['version'] == '1.2-beta1')
+ if($settings['panel']['version'] == '1.2-beta1' || $settings['panel']['version'] == '1.2-rc1')
{
- $db->query("UPDATE `".TABLE_PANEL_SETTINGS."` SET `varname`='ipaddress' WHERE `settinggroup`='system' AND `varname`='ipadress'");
- $db->query("UPDATE `".TABLE_PANEL_SETTINGS."` SET `value`='1.2-rc1' WHERE `settinggroup`='panel' AND `varname`='version'");
- $settings['panel']['version'] = '1.2-rc1';
+ $db->query("UPDATE `".TABLE_PANEL_SETTINGS."` SET `value`='1.2.0' WHERE `settinggroup`='panel' AND `varname`='version'");
+ $settings['panel']['version'] = '1.2.0';
}
?>
View
2 syscp/lib/tables.inc.php
@@ -32,6 +32,6 @@
define('TABLE_PANEL_TASKS','panel_tasks');
define('TABLE_PANEL_TRAFFIC','panel_traffic');
-$version = '1.2-rc1';
+$version = '1.2.0';
?>
View
2 syscp/lng/english.lng.php
@@ -191,7 +191,7 @@
$lng['admin']['syscpdetails'] = 'SysCP Details';
$lng['admin']['installedversion'] = 'Installed Version';
$lng['admin']['latestversion'] = 'Latest Version';
-$lng['admin']['lookfornewversion']['clickhere'] = 'sarch via webservice';
+$lng['admin']['lookfornewversion']['clickhere'] = 'search via webservice';
$lng['admin']['lookfornewversion']['error'] = 'Error while reading';
$lng['admin']['customer'] = 'Customer';
$lng['admin']['customers'] = 'Customers';
View
2 syscp/lng/german.lng.php
@@ -151,7 +151,7 @@
$lng['error']['domains_cantdeletemaindomain'] = 'Sie können keine Domain, die als eMail-Domain verwendet wird löschen. ';
$lng['error']['firstdeleteallsubdomains'] = 'Sie müssen erst alle Subdomains löschen, bevor Sie eine Wildcarddomain anlegen können.';
$lng['error']['ftp_cantdeletemainaccount'] = 'Sie können Ihren Hauptaccount nicht löschen.';
-$lng['error']['login'] = 'Der angegebene Benuternamen/Passwort ist falsch.';
+$lng['error']['login'] = 'Der angegebene Benutzernamen/Passwort ist falsch.';
$lng['error']['login_blocked'] = 'Dieser Account wurde aufgrund zuvieler Fehlversuche vorrübergehend geschlossen. <br />Bitte versuchen Sie es in '.$settings['login']['deactivatetime'].' Sekunden erneut.';
$lng['error']['notallreqfieldsorerrors'] = 'Sie haben nicht alle Felder oder ein Feld mit fehlerhaften Angaben ausgef&uuml;llt.';
$lng['error']['oldpasswordnotcorrect'] = 'Das alte Passwort ist nicht korrekt.';

0 comments on commit 9200069

Please sign in to comment.