Skip to content

Commit a6efc78

Browse files
tbrehmtbrehm
committed
Updated several scripts and language files.
Added a helper script for updates from SVN.
1 parent 9abbe8f commit a6efc78

File tree

9 files changed

+113
-65
lines changed

9 files changed

+113
-65
lines changed

‎helper_scripts/update_from_svn.sh‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/bin/bash
2+
3+
cd /tmp
4+
svn export svn://svn.ispconfig.org/ispconfig3/trunk/
5+
cd trunk/install
6+
php -q update.php
7+
cd /tmp
8+
rm -rf /tmp/trunk

‎interface/lib/classes/auth.inc.php‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,14 @@
3030

3131
class auth {
3232

33+
public function is_admin() {
34+
if($_SESSION['s']['user']['typ'] == 'admin') {
35+
return true;
36+
} else {
37+
return false;
38+
}
39+
}
40+
3341
public function has_clients($userid) {
3442
global $app, $conf;
3543

‎interface/web/admin/lib/lang/de.lng‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
<?php
2-
3-
$wb[1001] = "Username oder Passwort ist leer.";
4-
$wb[1002] = "Username oder Passwort ist falsch.";
5-
6-
?>
2+
$wb['1001'] = 'Username oder Passwort ist leer.';
3+
$wb['1002'] = 'Username oder Passwort ist falsch.';
4+
?>

‎interface/web/admin/lib/lang/de_dbsync.lng‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
<?php
2-
$wb["jobname_txt"] = 'Name';
3-
$wb["jobname_err"] = 'Es wurde kein Name f�r diese Aufgabe angegeben.';
4-
$wb["sync_interval_minutes_txt"] = 'Intervall (Min.)';
5-
$wb["db_type_txt"] = 'DB Typ';
6-
$wb["db_host_txt"] = 'DB Host';
7-
$wb["db_name_txt"] = 'DB Name';
8-
$wb["db_username_txt"] = 'DB User';
9-
$wb["db_password_txt"] = 'DB Passwort';
10-
$wb["db_tables_txt"] = 'Tabellen';
11-
$wb["empty_datalog_txt"] = 'Datalog nach Synchronistaion l�schen.';
12-
$wb["sync_datalog_external_txt"] = 'Externes Datalog f�llen.';
13-
$wb["active_txt"] = 'active';
14-
?>
1+
<?php
2+
$wb['jobname_txt'] = 'Name';
3+
$wb['jobname_err'] = 'Es wurde kein Name für diese Aufgabe angegeben.';
4+
$wb['sync_interval_minutes_txt'] = 'Intervall (Min.)';
5+
$wb['db_type_txt'] = 'DB Typ';
6+
$wb['db_host_txt'] = 'DB Host';
7+
$wb['db_name_txt'] = 'DB Name';
8+
$wb['db_username_txt'] = 'DB User';
9+
$wb['db_password_txt'] = 'DB Passwort';
10+
$wb['db_tables_txt'] = 'Tabellen';
11+
$wb['empty_datalog_txt'] = 'Datalog nach Synchronistaion löschen.';
12+
$wb['sync_datalog_external_txt'] = 'Externes Datalog füllen.';
13+
$wb['active_txt'] = 'active';
14+
?>

‎interface/web/admin/lib/lang/de_filesync.lng‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?php
2-
$wb["jobname_txt"] = 'Name';
3-
$wb["jobname_err"] = 'Es wurde kein Name f�r diese Aufgabe angegeben.';
4-
$wb["sync_interval_minutes_txt"] = 'Intervall (Min.)';
5-
$wb["ftp_host_txt"] = 'FTP Host';
6-
$wb["ftp_path_txt"] = 'FTP Pfad';
7-
$wb["ftp_username_txt"] = 'FTP User';
8-
$wb["ftp_password_txt"] = 'FTP Passwort';
9-
$wb["local_path_txt"] = 'Lokaler Pfad';
10-
$wb["wput_options_txt"] = 'Wput Optionen';
11-
$wb["active_txt"] = 'Aktiv';
12-
?>
2+
$wb['jobname_txt'] = 'Name';
3+
$wb['jobname_err'] = 'Es wurde kein Name für diese Aufgabe angegeben.';
4+
$wb['sync_interval_minutes_txt'] = 'Intervall (Min.)';
5+
$wb['ftp_host_txt'] = 'FTP Host';
6+
$wb['ftp_path_txt'] = 'FTP Pfad';
7+
$wb['ftp_username_txt'] = 'FTP User';
8+
$wb['ftp_password_txt'] = 'FTP Passwort';
9+
$wb['local_path_txt'] = 'Lokaler Pfad';
10+
$wb['wput_options_txt'] = 'Wput Optionen';
11+
$wb['active_txt'] = 'Aktiv';
12+
?>

‎interface/web/admin/lib/lang/de_users.lng‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
<?php
2-
$wb["username_txt"] = 'Username';
3-
$wb["username_err"] = 'username_err';
4-
$wb["passwort_txt"] = 'Passwort';
5-
$wb["modules_txt"] = 'Module';
6-
$wb["startmodule_txt"] = 'Startmodul';
7-
$wb["app_theme_txt"] = 'Design';
8-
$wb["typ_txt"] = 'Typ';
9-
$wb["active_txt"] = 'Aktiv';
10-
$wb["language_txt"] = 'Sprache';
11-
$wb["name_txt"] = 'Name';
12-
$wb["vorname_txt"] = 'Vorname';
13-
$wb["unternehmen_txt"] = 'Unternehmen';
14-
$wb["strasse_txt"] = 'Strasse';
15-
$wb["ort_txt"] = 'Ort';
16-
$wb["plz_txt"] = 'Plz';
17-
$wb["land_txt"] = 'Land';
18-
$wb["email_txt"] = 'Email';
19-
$wb["url_txt"] = 'Url';
20-
$wb["telefon_txt"] = 'Telefon';
21-
$wb["fax_txt"] = 'Fax';
22-
$wb["groups_txt"] = 'Gruppen';
23-
$wb["default_group_txt"] = 'Standard Gruppe';
24-
?>
2+
$wb['username_txt'] = 'Username';
3+
$wb['username_err'] = 'Der Username enthält ungültige Zeichen.';
4+
$wb['passwort_txt'] = 'Passwort';
5+
$wb['modules_txt'] = 'Module';
6+
$wb['startmodule_txt'] = 'Startmodul';
7+
$wb['app_theme_txt'] = 'Design';
8+
$wb['typ_txt'] = 'Typ';
9+
$wb['active_txt'] = 'Aktiv';
10+
$wb['language_txt'] = 'Sprache';
11+
$wb['name_txt'] = 'Name';
12+
$wb['vorname_txt'] = 'Vorname';
13+
$wb['unternehmen_txt'] = 'Unternehmen';
14+
$wb['strasse_txt'] = 'Strasse';
15+
$wb['ort_txt'] = 'Ort';
16+
$wb['plz_txt'] = 'Plz';
17+
$wb['land_txt'] = 'Land';
18+
$wb['email_txt'] = 'Email';
19+
$wb['url_txt'] = 'Url';
20+
$wb['telefon_txt'] = 'Telefon';
21+
$wb['fax_txt'] = 'Fax';
22+
$wb['groups_txt'] = 'Gruppen';
23+
$wb['default_group_txt'] = 'Standard Gruppe';
24+
?>

‎interface/web/admin/lib/module.conf.php‎

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
'items' => $items);
2424

2525

26-
// aufr�umen
26+
// cleanup
2727
unset($items);
2828

2929
$items[] = array( 'title' => 'Add group',
@@ -40,7 +40,7 @@
4040
'items' => $items);
4141

4242

43-
// aufr�umen
43+
// cleanup
4444
unset($items);
4545
/*
4646
$items[] = array( 'title' => 'Add server',
@@ -65,7 +65,7 @@
6565
'items' => $items);
6666

6767

68-
// aufr�umen
68+
// cleanup
6969
unset($items);
7070

7171
$items[] = array( 'title' => 'Add user',
@@ -86,6 +86,32 @@
8686
'items' => $items);
8787

8888

89+
// cleanup
90+
unset($items);
91+
92+
93+
94+
$items[] = array( 'title' => 'Languages',
95+
'target' => 'content',
96+
'link' => 'admin/language_list.php');
97+
98+
$items[] = array( 'title' => 'New Language',
99+
'target' => 'content',
100+
'link' => 'admin/language_add.php');
101+
102+
$items[] = array( 'title' => 'Export',
103+
'target' => 'content',
104+
'link' => 'admin/language_export.php');
105+
106+
$items[] = array( 'title' => 'Import',
107+
'target' => 'content',
108+
'link' => 'admin/language_import.php');
109+
110+
$module['nav'][] = array( 'title' => 'Language Editor',
111+
'open' => 1,
112+
'items' => $items);
113+
114+
89115
// aufr�umen
90116
unset($items);
91117

‎interface/web/help/lib/lang/en_support_message.lng‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<?php
2-
$wb['recipient_id_txt'] = 'recipient_id';
3-
$wb['sender_id_txt'] = 'sender_id';
4-
$wb['subject_txt'] = 'subject';
5-
$wb['message_txt'] = 'message';
6-
$wb['tstamp_txt'] = 'tstamp';
7-
$wb['btn_save_txt'] = 'Save';
8-
$wb['btn_cancel_txt'] = 'Cancel';
9-
?>
1+
<?php
2+
$wb['recipient_id_txt'] = 'Recipient ID';
3+
$wb['sender_id_txt'] = 'Sender ID';
4+
$wb['subject_txt'] = 'Subject';
5+
$wb['message_txt'] = 'Message';
6+
$wb['tstamp_txt'] = 'Timestamp';
7+
$wb['btn_save_txt'] = 'Save';
8+
$wb['btn_cancel_txt'] = 'Cancel';
9+
?>

‎interface/web/themes/default/style.css‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,14 @@ textarea,input.text,select,option{
282282
border: 1px solid #CC0000;
283283
text-decoration: none;
284284

285+
}
286+
.msg {
287+
font-family: Verdana, Arial, Helvetica, sans-serif;
288+
font-size: 11px;
289+
color: #000000;
290+
border: 1px solid #00CC00;
291+
text-decoration: none;
292+
285293
}
286294
INPUT {
287295
border: 1px solid #BFCBD9;

0 commit comments

Comments
 (0)