Browse code

eliminate .php extensions for URLs

git-svn-id: https://svn.schokokeks.org/repos/tools/webinterface/trunk@1128 87cf0b9e-d624-0410-a070-f6ee81989793

bernd authored on08/08/2008 19:32:32
Showing58 changed files
... ...
@@ -25,7 +25,7 @@ foreach($domains AS $dom)
25 25
   $records = get_domain_records($dom->id);
26 26
 
27 27
   $autorec = ($dom->autodns == 1 ? 'Ja' : 'Nein');
28
-  $output .= '<tr><td>'.internal_link("dns_domain.php", $dom->fqdn, "dom={$dom->id}").'</td><td>'.count($records).'</td><td>'.$autorec.'</td></tr>';
28
+  $output .= '<tr><td>'.internal_link('dns_domain', $dom->fqdn, "dom={$dom->id}").'</td><td>'.count($records).'</td><td>'.$autorec.'</td></tr>';
29 29
 
30 30
 /*  if ($records) 
31 31
   {
... ...
@@ -37,7 +37,7 @@ foreach($domains AS $dom)
37 37
       $data = ( $rec['ip'] ? $rec['ip'] : $rec['data'] );
38 38
       if ($rec['dyndns'])
39 39
         $data = '<em>DynDNS #'.$rec['dyndns'].'</em>';
40
-      $output .= "<tr><td>".internal_link("dns_edit.php", $rec['fqdn'], "id={$rec['id']}")."</td><td>".strtoupper($rec['type'])."</td><td>$data</td><td>{$rec['ttl']} Sek.</td><td>".internal_link("save.php", '<img src="'.$prefix.'images/delete.png" width="16" height="16" alt="löschen" title="Account löschen" />', "id={$rec['id']}&type=dns&action=delete")."</td></tr>\n";
40
+      $output .= "<tr><td>".internal_link('dns_edit', $rec['fqdn'], "id={$rec['id']}")."</td><td>".strtoupper($rec['type'])."</td><td>$data</td><td>{$rec['ttl']} Sek.</td><td>".internal_link('save', '<img src="'.$prefix.'images/delete.png" width="16" height="16" alt="löschen" title="Account löschen" />', "id={$rec['id']}&type=dns&action=delete")."</td></tr>\n";
41 41
     }
42 42
     #$output .= '</table><br />';
43 43
 
... ...
@@ -45,6 +45,6 @@ foreach($domains AS $dom)
45 45
 }
46 46
 
47 47
 $output .= '</table><br />';
48
-$output .= '<p>'.internal_link('dns_edit.php', 'Neuen DNS-Record anlegen').'</p>';
48
+$output .= '<p>'.internal_link('dns_edit', 'Neuen DNS-Record anlegen').'</p>';
49 49
 
50 50
 ?>
... ...
@@ -31,10 +31,10 @@ foreach ($dyndns AS $entry) {
31 31
       $method = 'HTTP';
32 32
     else
33 33
       $method = '<em>keine</em>';
34
-  $output .= "<tr><td>".internal_link("dyndns_edit.php", $handle, "id={$entry['id']}")."</td><td>{$method}</td><td>{$entry['address']}</td><td>{$entry['lastchange']}</td><td>".internal_link("save.php", '<img src="'.$prefix.'images/delete.png" width="16" height="16" alt="löschen" title="Account löschen" />', "id={$entry['id']}&type=dyndns&action=delete")."</td></tr>\n";
34
+  $output .= "<tr><td>".internal_link('dyndns_edit', $handle, "id={$entry['id']}")."</td><td>{$method}</td><td>{$entry['address']}</td><td>{$entry['lastchange']}</td><td>".internal_link('save', '<img src="'.$prefix.'images/delete.png" width="16" height="16" alt="löschen" title="Account löschen" />', "id={$entry['id']}&type=dyndns&action=delete")."</td></tr>\n";
35 35
 }
36 36
 $output .= '</table><br />
37 37
 
38
-<p>'.internal_link('dyndns_edit.php', 'Neuen DynDNS-Account anlegen').'</p>';
38
+<p>'.internal_link('dyndns_edit', 'Neuen DynDNS-Account anlegen').'</p>';
39 39
 
40 40
 ?>
... ...
@@ -70,7 +70,7 @@ $form = '<p><label for="handle">Bezeichnung:</label>&#160;<input type="text" nam
70 70
 ';
71 71
 
72 72
 
73
-$output .= html_form('dyndns_edit', 'save.php', 'type=dyndns&action=edit&id='.$_REQUEST['id'], $form);
73
+$output .= html_form('dyndns_edit', 'save', 'type=dyndns&action=edit&id='.$_REQUEST['id'], $form);
74 74
 
75 75
 $records = get_dyndns_records($_REQUEST['id']);
76 76
 
... ...
@@ -27,7 +27,7 @@ function get_dyndns_account($id)
27 27
   $uid = (int) $_SESSION['userinfo']['uid'];
28 28
   $result = db_query("SELECT * FROM dns.dyndns WHERE id={$id} AND uid={$uid}");
29 29
   if (mysql_num_rows($result) != 1) {
30
-    logger("modules/dns/include/dnsinclude.php", "dyndns", "account »{$id}« invalid for uid »{$uid}«.");
30
+    logger("modules/dns/include/dnsinclude", "dyndns", "account »{$id}« invalid for uid »{$uid}«.");
31 31
     system_failure("Account ungültig");
32 32
   }
33 33
   $item = mysql_fetch_assoc($result);
... ...
@@ -47,7 +47,7 @@ function create_dyndns_account($handle, $password_http, $sshkey)
47 47
     $pwhash = "'{SHA}".base64_encode(sha1($password_http, true))."'";
48 48
 
49 49
   db_query("INSERT INTO dns.dyndns (uid, handle, password, sshkey) VALUES ({$uid}, {$handle}, {$pwhash}, {$sshkey})");
50
-  logger("modules/dns/include/dnsinclude.php", "dyndns", "inserted account");
50
+  logger("modules/dns/include/dnsinclude", "dyndns", "inserted account");
51 51
 }
52 52
 
53 53
 
... ...
@@ -62,7 +62,7 @@ function edit_dyndns_account($id, $handle, $password_http, $sshkey)
62 62
     $pwhash = "'{SHA}".base64_encode(sha1($password_http, true))."'";
63 63
 
64 64
   db_query("UPDATE dns.dyndns SET handle={$handle}, password={$pwhash}, sshkey={$sshkey} WHERE id={$id} LIMIT 1");
65
-  logger("modules/dns/include/dnsinclude.php", "dyndns", "edited account »{$id}«");
65
+  logger("modules/dns/include/dnsinclude", "dyndns", "edited account »{$id}«");
66 66
 }
67 67
 
68 68
 
... ...
@@ -71,7 +71,7 @@ function delete_dyndns_account($id)
71 71
   $id = (int) $id;
72 72
 
73 73
   db_query("DELETE FROM dns.dyndns WHERE id={$id} LIMIT 1");
74
-  logger("modules/dns/include/dnsinclude.php", "dyndns", "deleted account »{$id}«");
74
+  logger("modules/dns/include/dnsinclude", "dyndns", "deleted account »{$id}«");
75 75
 }
76 76
 
77 77
 
... ...
@@ -5,8 +5,8 @@ $role = $_SESSION['role'];
5 5
 
6 6
 if ($role & ROLE_CUSTOMER)
7 7
 {
8
-  $menu["dns_dns"] = array("label" => "DNS-Einträge", "file" => "dns.php", "weight" => 1, "submenu" => "domains_domains");
9
-  $menu["dns_dyndns"] = array("label" => "DynDNS", "file" => "dyndns.php", "weight" => 2, "submenu" => "domains_domains");
8
+  $menu["dns_dns"] = array("label" => "DNS-Einträge", "file" => "dns", "weight" => 1, "submenu" => "domains_domains");
9
+  $menu["dns_dyndns"] = array("label" => "DynDNS", "file" => "dyndns", "weight" => 2, "submenu" => "domains_domains");
10 10
 }
11 11
 
12 12
 ?>
... ...
@@ -27,12 +27,12 @@ if ($_GET['type'] == 'dyndns') {
27 27
     {
28 28
       delete_dyndns_account($id);
29 29
       if (! $debugmode)
30
-        header("Location: dyndns.php");
30
+        header("Location: dyndns");
31 31
     }
32 32
     elseif ($sure === false)
33 33
     {
34 34
       if (! $debugmode)
35
-        header("Location: dyndns.php");
35
+        header("Location: dyndns");
36 36
     }
37 37
   }
38 38
   if ($_GET['action'] == 'edit') {
... ...
@@ -45,7 +45,7 @@ if ($_GET['type'] == 'dyndns') {
45 45
     }
46 46
   
47 47
     if (! ($debugmode || we_have_an_error()))
48
-      header('Location: dyndns.php');
48
+      header('Location: dyndns');
49 49
   }
50 50
 }
51 51
 
... ...
@@ -5,7 +5,7 @@ $role = $_SESSION['role'];
5 5
 
6 6
 if (($role & ROLE_CUSTOMER) || ($role & ROLE_SYSTEMUSER))
7 7
 {
8
-  $menu["domains_domains"] = array("label" => "Domains", "file" => "domains.php", "weight" => 1);
8
+  $menu["domains_domains"] = array("label" => "Domains", "file" => "domains", "weight" => 1);
9 9
 }
10 10
 
11 11
 ?>
... ...
@@ -48,7 +48,7 @@ if ($_POST['password1'] != '')
48 48
       change_mailaccount(get_mailaccount_id($accname), array('password' => $_POST['password1']));
49 49
     }
50 50
     if (! $debugmode)
51
-      header('Location: chpass.php');
51
+      header('Location: chpass');
52 52
     else
53 53
       output('');
54 54
   }
... ...
@@ -58,7 +58,7 @@ if ($_POST['password1'] != '')
58 58
 
59 59
 output('<h3>Passwort ändern</h3>
60 60
 <p>Hier können Sie Ihr Passwort ändern.</p>
61
-'.html_form('email_chpass', 'chpass.php', '', '<table>
61
+'.html_form('email_chpass', 'chpass', '', '<table>
62 62
   <tr>
63 63
     <td>bisheriges Passwort:</td>  <td><input type="password" name="old_password" value="" /></td>
64 64
   </tr>
... ...
@@ -16,7 +16,7 @@ if (! $_POST['type'] || ! $_POST['id'])
16 16
 change_domain($_POST['id'], $_POST['type']);
17 17
 
18 18
 if (!$debugmode) {
19
-  header('Location: domains.php');
19
+  header('Location: domains');
20 20
   die();
21 21
 }
22 22
 
... ...
@@ -30,11 +30,11 @@ beachtet. Subdomains können grundsätzlich nur durch Administratoren eingericht
30 30
 
31 31
 foreach ($domains AS $id => $dom) {
32 32
   $type = maildomain_type($dom['type']);
33
-  $edit = html_form('vmail_domainchange', 'domainchange.php', '', html_select('type', array('virtual' => 'Webinterface-Verwaltung', 'auto' => '.courier-Dateien', 'none' => 'keine E-Mails empfangen'), $dom['type']).' <input type="hidden" name="id" value="'.$id.'" /><input type="submit" value="ändern" />');
33
+  $edit = html_form('vmail_domainchange', 'domainchange', '', html_select('type', array('virtual' => 'Webinterface-Verwaltung', 'auto' => '.courier-Dateien', 'none' => 'keine E-Mails empfangen'), $dom['type']).' <input type="hidden" name="id" value="'.$id.'" /><input type="submit" value="ändern" />');
34 34
   if ($dom['type'] == 'manual')
35 35
     $edit = 'Kann nur von Admins geändert werden';
36 36
   if (domain_has_vmail_accounts($id))
37
-    $edit = 'Keine Änderung möglich, so lange noch <a href="vmail.php">E-Mail-Konten</a> für diese Domain eingerichtet sind.';
37
+    $edit = 'Keine Änderung möglich, so lange noch '.internal_link("vmail", "E-Mail-Konten").' für diese Domain eingerichtet sind.';
38 38
   output("<tr><td>{$dom['name']}</td><td>{$type}</td><td>{$edit}</td></tr>\n");
39 39
   if (array_key_exists($id, $subdomains)) {
40 40
     foreach ($subdomains[$id] AS $subdom) {
... ...
@@ -119,9 +119,9 @@ else
119 119
 $form .= '</div>';
120 120
 
121 121
 $form .= '<p style="margin-left: 2em;">[ <a href="#" onclick="moreForward();">mehr Empfänger</a> ]</p>
122
-  <p><input type="submit" value="Speichern" />&#160;&#160;&#160;&#160;'.internal_link('accounts.php', 'Abbrechen').'</p>';
122
+  <p><input type="submit" value="Speichern" />&#160;&#160;&#160;&#160;'.internal_link('accounts', 'Abbrechen').'</p>';
123 123
 
124
-output(html_form('vmail_edit_mailbox', 'save.php', 'action=edit'.($id != 0 ? '&id='.$id : ''), $form));
124
+output(html_form('vmail_edit_mailbox', 'save', 'action=edit'.($id != 0 ? '&id='.$id : ''), $form));
125 125
 
126 126
 
127 127
 ?>
... ...
@@ -36,7 +36,7 @@ if (isset($_GET['action']) && $_GET['action'] == 'save')
36 36
     {
37 37
       change_mailaccount($_GET['id'], $acc);
38 38
       if (! $debugmode)
39
-        header('Location: imap.php');
39
+        header('Location: imap');
40 40
       die();
41 41
     }
42 42
   }
... ...
@@ -61,7 +61,7 @@ if (isset($_GET['action']) && $_GET['action'] == 'save')
61 61
     {
62 62
       create_mailaccount($acc);
63 63
       if (! $debugmode)
64
-        header('Location: imap.php');
64
+        header('Location: imap');
65 65
       die(); 
66 66
     }
67 67
   }
... ...
@@ -75,10 +75,10 @@ elseif (isset($_GET['action']) && $_GET['action'] == 'create')
75 75
   foreach ($domains as $dom)
76 76
     $options .= '<option value="'.$dom->fqdn.'">'.$dom->fqdn.'</option>';
77 77
 
78
-  output('<h3>E-Mail-Account anlegen</h3>
78
+  output('<h3>IMAP-Account anlegen</h3>
79 79
 <p>Hier können Sie ein neues POP3/IMAP-Konto anlegen.</p>
80
-<p style="border: 2px solid red; background-color: white; padding:1em;"><strong>ACHTUNG:</strong> ein POP3-/IMAP-Account ist <strong>keine E-Mail-Adresse</strong>. Wenn Sie sich nicht sicher sind, lesen Sie bitte die Anleitung <a href="https://wiki.schokokeks.org/E-Mail/Konfiguration">in unserem Wiki</a>. Sie können Ihre E-Mail-Konten auch über eine einfachere Möglichkeit verwalten, dann ist eine Einrichtung über diese Weboberfläche möglich. Die Umstellung erfolgt <a href="../email/domains.php">unter Domains</a>.</p>
81
-  '.html_form('email_imap_create', 'imap.php', 'action=save', '
80
+<p style="border: 2px solid red; background-color: white; padding:1em;"><strong>ACHTUNG:</strong> ein POP3-/IMAP-Account ist <strong>keine E-Mail-Adresse</strong>. Wenn Sie sich nicht sicher sind, lesen Sie bitte die Anleitung <a href="https://wiki.schokokeks.org/E-Mail/Konfiguration">in unserem Wiki</a>. Sie können Ihre E-Mail-Konten auch über eine einfachere Möglichkeit verwalten, dann ist eine Einrichtung über diese Weboberfläche möglich. Die Umstellung erfolgt '.internal_link("../email/domains", "unter Domains").'.</p>
81
+  '.html_form('email_imap_create', 'imap', 'action=save', '
82 82
   <table style="margin-bottom: 1em;">
83 83
   <tr><th>Einstellung:</th><th>Wert:</th><th>&#160;</th></tr>
84 84
   <tr>
... ...
@@ -131,19 +131,19 @@ elseif (isset($_GET['action']) && $_GET['action'] == 'delete' && $_GET['account'
131 131
   {
132 132
     delete_mailaccount($_GET['account']);
133 133
     if (! $debugmode)
134
-      header('Location: imap.php');
134
+      header('Location: imap');
135 135
     die();
136 136
   }
137 137
   elseif ($sure === false)
138 138
   {
139 139
     if (! $debugmode)
140
-      header("Location: imap.php");
140
+      header("Location: imap");
141 141
     die();
142 142
   }
143 143
 }
144 144
 elseif (isset($_GET['edit']))
145 145
 {
146
-  output('<h3>E-Mail-Account bearbeiten</h3>
146
+  output('<h3>IMAP-Account bearbeiten</h3>
147 147
 <p>Hier können Sie die Einstellungen des IMAP-Kontos bearbeiten.</p>
148 148
 ');
149 149
   $_GET['edit'] = (int) $_GET['edit'];
... ...
@@ -182,11 +182,11 @@ elseif (isset($_GET['edit']))
182 182
   <p><input type="submit" value="Änderungen speichern" /><br />
183 183
   Hinweis: Das Passwort wird nur geändert, wenn Sie auf dieser Seite eines eingeben. Geben Sie keines an, wird das bisherige beibehalten!</p>
184 184
   ';
185
-  output(html_form('email_imap_edit', 'imap.php', 'action=save&id='.$_GET['edit'], $form));
185
+  output(html_form('email_imap_edit', 'imap', 'action=save&id='.$_GET['edit'], $form));
186 186
 }
187 187
 else
188 188
 {
189
-  output('<h3>E-Mail-Accounts</h3>
189
+  output('<h3>IMAP-Accounts</h3>
190 190
 <p>Folgende POP3/IMAP-Konten sind eingerichtet:</p>
191 191
 <table style="margin-bottom: 1em;">
192 192
 <tr><th>Kontoname:</th><th>Mailbox-Pfad:</th><th>aktiv</th><th>&#160;</th></tr>
... ...
@@ -198,13 +198,13 @@ else
198 198
                 if (empty($mailbox))
199 199
                         $mailbox = '<i>nicht festgelegt</i>';
200 200
                 output('<tr>
201
-            <td>'.internal_link('imap.php', $account['account'], 'edit='.$account['id']).'</td>
201
+            <td>'.internal_link('imap', $account['account'], 'edit='.$account['id']).'</td>
202 202
             <td>'.$mailbox.'</td>
203 203
             <td><b>'.($account['enabled'] ? 'Ja' : 'Nein').'</b></td>
204
-            <td><a href="imap.php?action=delete&amp;account='.$account['id'].'">löschen</a></td></tr>');
204
+            <td>'.internal_link("imap", "löschen", "action=delete&account=".$account['id']).'</td></tr>');
205 205
         }
206 206
         output('</table>
207
-<p><a href="imap.php?action=create">Neuen Account anlegen</a></p>
207
+<p>'.internal_link("imap", "Neuen Account anlegen", "action=create").'</p>
208 208
 
209 209
 ');
210 210
 }
... ...
@@ -65,7 +65,7 @@ function change_mailaccount($id, $arr)
65 65
 
66 66
 
67 67
   db_query("UPDATE mail.mailaccounts SET ".implode(",", $conditions)." WHERE id='$id' LIMIT 1");
68
-  logger("modules/imap/include/mailaccounts.php", "imap", "updated account »{$arr['account']}«");
68
+  logger("modules/imap/include/mailaccounts", "imap", "updated account »{$arr['account']}«");
69 69
 
70 70
 }
71 71
 
... ...
@@ -104,7 +104,7 @@ function create_mailaccount($arr)
104 104
 
105 105
 
106 106
   db_query("INSERT INTO mail.mailaccounts (".implode(',', array_keys($values)).") VALUES (".implode(",", array_values($values)).")");
107
-  logger("modules/imap/include/mailaccounts.php", "imap", "created account »{$arr['account']}«");
107
+  logger("modules/imap/include/mailaccounts", "imap", "created account »{$arr['account']}«");
108 108
 
109 109
 }
110 110
 
... ...
@@ -128,7 +128,7 @@ function delete_mailaccount($id)
128 128
 {
129 129
   $id = (int) $id;
130 130
   db_query("DELETE FROM mail.mailaccounts WHERE id=".$id." LIMIT 1");
131
-  logger("modules/imap/include/mailaccounts.php", "imap", "deleted account »{$id}«");
131
+  logger("modules/imap/include/mailaccounts", "imap", "deleted account »{$id}«");
132 132
 }
133 133
 
134 134
 
... ...
@@ -6,18 +6,18 @@ require_once('include/hasdomain.php');
6 6
 require_once('include/hasaccount.php');
7 7
 
8 8
 if ($role & ROLE_SYSTEMUSER) {
9
-  $menu["email_vmail"] = array("label" => "E-Mail", "file" => "vmail.php", "weight" => 3);
9
+  $menu["email_vmail"] = array("label" => "E-Mail", "file" => "vmail", "weight" => 3);
10 10
 }
11 11
 if ($role & (ROLE_VMAIL_ACCOUNT | ROLE_MAILACCOUNT))
12 12
 {
13
-  $menu['email_chpass'] = array("label" => "Passwort ändern", "file" => "chpass.php", "weight" => 15);
13
+  $menu['email_chpass'] = array("label" => "Passwort ändern", "file" => "chpass", "weight" => 15);
14 14
 }
15 15
 if ($role & ROLE_SYSTEMUSER) {
16
-  $menu["email_domains"] = array("label" => "Mail-Verwaltung", "file" => "domains.php", "weight" => 2, "submenu" => "domains_domains");
16
+  $menu["email_domains"] = array("label" => "Mail-Verwaltung", "file" => "domains", "weight" => 2, "submenu" => "domains_domains");
17 17
 }
18 18
 if ($role & ROLE_SYSTEMUSER && (user_has_accounts() || ! user_has_vmail_domain() || user_has_regular_domain() ) )
19 19
 {
20
-  $menu["email_imap"] = array("label" => "IMAP/POP3", "file" => "imap.php", "weight" => 20, 'submenu' => "email_vmail");
20
+  $menu["email_imap"] = array("label" => "IMAP/POP3", "file" => "imap", "weight" => 20, 'submenu' => "email_vmail");
21 21
 }
22 22
 
23 23
 
... ...
@@ -57,7 +57,7 @@ if ($_GET['action'] == 'edit')
57 57
   save_vmail_account($account);
58 58
 
59 59
   if (! ($debugmode || we_have_an_error()))
60
-    header('Location: vmail.php');
60
+    header('Location: vmail');
61 61
 }
62 62
 elseif ($_GET['action'] == 'delete')
63 63
 {
... ...
@@ -84,12 +84,12 @@ elseif ($_GET['action'] == 'delete')
84 84
   {
85 85
     delete_account($account['id']);
86 86
     if (! $debugmode)
87
-      header("Location: vmail.php");
87
+      header("Location: vmail");
88 88
   }
89 89
   elseif ($sure === false)
90 90
   {
91 91
     if (! $debugmode)
92
-      header("Location: vmail.php");
92
+      header("Location: vmail");
93 93
   }
94 94
 
95 95
 }
... ...
@@ -20,9 +20,9 @@ Subdomains können grundsätzlich nur durch Administratoren eingerichtet und ver
20 20
 
21 21
 <p> </p>
22 22
 
23
-<p>Besuchen Sie die <a href="domains.php">Domain-Einstellungen</a> um diese Auswahl für Ihre Domains zu ändern.</p>
23
+<p>Besuchen Sie die '.internal_link('domains', 'Domain-Einstellungen').' um diese Auswahl für Ihre Domains zu ändern.</p>
24 24
 
25
-<p>Wenn Sie die manuelle Einrichtung möchten oder keine eigene Domain nutzen, können Sie unter <a href="imap.php">POP3/IMAP</a> manuelle POP3-/IMAP-Konten erstellen.</p>
25
+<p>Wenn Sie die manuelle Einrichtung möchten oder keine eigene Domain nutzen, können Sie unter '.internal_link('imap', 'POP3/IMAP').' manuelle POP3-/IMAP-Konten erstellen.</p>
26 26
 
27 27
 ');
28 28
 }
... ...
@@ -93,15 +93,15 @@ output('<h3>E-Mail-Accounts</h3>
93 93
 		$dest .= '</ul>';
94 94
 	      }
95 95
               output('
96
-              <div style="margin-left: 2em; margin-top: 0.5em; padding: 0.1em 0.5em;"><p>'.internal_link('edit.php', $acc['local'].'@'.$this_account['domainname'], 'id='.$acc['id']).' <a href="save.php?action=delete&amp;id='.$acc['id'].'"><img src="'.$prefix.'images/delete.png" alt="löschen" title="Dieses Konto löschen"/></a></p>
96
+              <div style="margin-left: 2em; margin-top: 0.5em; padding: 0.1em 0.5em;"><p>'.internal_link('edit', $acc['local'].'@'.$this_account['domainname'], 'id='.$acc['id']).' '.internal_link("save", '<img src="'.$prefix.'images/delete.png" alt="löschen" title="Dieses Konto löschen"/>', "action=delete&id=".$acc['id']).'</p>
97 97
 	      <p>'.$dest.'</p></div>');
98 98
 	    }
99 99
 
100 100
         }
101
-output('<p><a href="edit.php">Neue E-Mail-Adresse anlegen</a></p>');
101
+output('<p>'.internal_link("edit", "Neue E-Mail-Adresse anlegen").'</p>');
102 102
 
103 103
 /* FIXME: Das sollte nur kommen, wenn der IMAP/POP3-Menü-Eintrag nicht da ist */
104
-output('<p style="font-size: 90%;padding-top: 0.5em; border-top: 1px solid black;">Hinweis: schokokeks.org bietet für fortgeschrittene Nutzer die manuelle Einrichtung von POP3/IMAP-Accounts.<br/><a href="imap.php?action=create">Neuen POP3/IMAP-Account anlegen</a></p>');
104
+output('<p style="font-size: 90%;padding-top: 0.5em; border-top: 1px solid black;">Hinweis: schokokeks.org bietet für fortgeschrittene Nutzer die manuelle Einrichtung von POP3/IMAP-Accounts.<br/>'.internal_link("imap", "Neuen POP3/IMAP-Account anlegen", "action=create").'</p>');
105 105
 
106 106
 }
107 107
 
... ...
@@ -7,7 +7,7 @@ $uid = (int) $_SESSION['userinfo']['uid'];
7 7
 
8 8
 if (in_array($_POST['freq'],array("day","week","month"))) {
9 9
 	db_query("REPLACE INTO qatools.freewvs (user,freq) VALUES ({$uid},'{$_POST['freq']}');");
10
-	header("Location: freewvs.php");
10
+	header("Location: freewvs");
11 11
 	die();
12 12
 }
13 13
 
... ...
@@ -4,5 +4,5 @@ $role = $_SESSION['role'];
4 4
 
5 5
 if ($role & ROLE_SYSTEMUSER)
6 6
 {
7
-  $menu["freewvs_freewvs"] = array("label" => "freewvs", "file" => "freewvs.php", "weight" => 1, "submenu" => "vhosts_vhosts");
7
+  $menu["freewvs_freewvs"] = array("label" => "freewvs", "file" => "freewvs", "weight" => 1, "submenu" => "vhosts_vhosts");
8 8
 }
... ...
@@ -4,7 +4,7 @@ $role = $_SESSION['role'];
4 4
 
5 5
 if ($role & ROLE_SYSTEMUSER)
6 6
 {
7
-  $menu['greylisting_whitelist'] = array("label" => "Greylisting", "file" => "whitelist.php", "weight" => 5, 'submenu' => 'email_vmail');
7
+  $menu['greylisting_whitelist'] = array("label" => "Greylisting", "file" => "whitelist", "weight" => 5, 'submenu' => 'email_vmail');
8 8
 }
9 9
 
10 10
 ?>
... ...
@@ -17,12 +17,12 @@ if ($_GET['action'] == 'delete')
17 17
   {
18 18
     delete_from_whitelist($entry['id']);
19 19
     if (! $debugmode)
20
-      header("Location: whitelist.php");
20
+      header("Location: whitelist");
21 21
   }
22 22
   elseif ($sure === false)
23 23
   {
24 24
     if (! $debugmode)
25
-      header("Location: whitelist.php");
25
+      header("Location: whitelist");
26 26
   }
27 27
 }
28 28
 elseif ($_GET['action'] == 'add')
... ...
@@ -44,7 +44,7 @@ elseif ($_GET['action'] == 'add')
44 44
 	DEBUG("Whitelisting {$local}@{$domain} for {$_POST['expire']} minutes");
45 45
 	new_whitelist_entry($local, $domain, $_POST['expire']);
46 46
 	if (! $debugmode)	
47
-		header("Location: whitelist.php");
47
+		header("Location: whitelist");
48 48
 
49 49
 }
50 50
 
... ...
@@ -36,7 +36,7 @@ foreach ($whitelist AS $entry)
36 36
 	$end = $entry['expire'];
37 37
 	if (! $end)
38 38
 		$end = '<em>unbegrenzt</em>';
39
-	$form .= "<tr><td>{$entry['local']}@{$entry['domain']}</td><td>{$entry['date']}</td><td>{$end}</td><td><a href=\"save.php?action=delete&amp;id={$entry['id']}\"><img src=\"{$prefix}images/delete.png\" alt=\"Eintrag löschen\" title=\"Diesen Eintrag löschen\" style=\"width: 16px; height: 16px;\" /></a></td></tr>\n";
39
+	$form .= "<tr><td>{$entry['local']}@{$entry['domain']}</td><td>{$entry['date']}</td><td>{$end}</td><td>".internal_link("save", "<img src=\"{$prefix}images/delete.png\" alt=\"Eintrag löschen\" title=\"Diesen Eintrag löschen\" style=\"width: 16px; height: 16px;\" />", "action=delete&id={$entry['id']}")."</td></tr>\n";
40 40
 }
41 41
 
42 42
 $form .= '<tr><td><input type="text" name="address" /></td><td>-</td><td>'.html_select('expire', array('none' => 'Unbegrenzt', '5' => '5 Minuten', '10' => '10 Minuten', '20' => '20 Minuten', '30' => '30 Minuten', '60' => '1 Stunde', '120' => '2 Stunden', '1440' => '1 Tag'), '10').'</td><td></td></tr>';
... ...
@@ -45,65 +45,8 @@ $form .= '</table>';
45 45
 
46 46
 $form .= '<p><input type="submit" value="Speichern" /></p>';
47 47
 
48
-output(html_form('greylisting_add', 'save.php', 'action=add', $form));
48
+output(html_form('greylisting_add', 'save', 'action=add', $form));
49 49
 
50 50
 output('<p></p>');
51 51
 
52
-/*****************************
53
-$form = "
54
-  <table>
55
-    <tr><th>Adresse</th><th>Verhalten</th><th>&#160;</th></tr>
56
-    <tr><td><strong>{$vhost['fqdn']}</strong>{$mainalias}</td><td>Haupt-Adresse</td><td>&#160;</td></tr>
57
-";
58
-
59
-foreach ($aliases AS $alias) {
60
-  $aliastype = 'Zusätzliche Adresse';
61
-  if (strstr($alias['options'], 'forward')) {
62
-    $aliastype = 'Umleitung auf Haupt-Adresse';
63
-  }
64
-  $formtoken = generate_form_token('aliases_toggle');
65
-  $havewww = '<br />www.'.$alias['fqdn'].' &#160; ('.internal_link('aliasoptions.php', 'WWW-Alias entfernen', "alias={$alias['id']}&aliaswww=0&formtoken={$formtoken}").')';
66
-  $nowww = '<br />'.internal_link('aliasoptions.php', 'Auch mit WWW', "alias={$alias['id']}&aliaswww=1&formtoken={$formtoken}");
67
-  $wwwalias = (strstr($alias['options'], 'aliaswww') ? $havewww : $nowww);
68
-
69
-  $to_forward = internal_link('aliasoptions.php', 'In Umleitung umwandeln', "alias={$alias['id']}&forward=1&formtoken={$formtoken}");
70
-  $remove_forward = internal_link('aliasoptions.php', 'In zusätzliche Adresse umwandeln', "alias={$alias['id']}&forward=0&formtoken={$formtoken}");
71
-  $typetoggle = (strstr($alias['options'], 'forward') ? $remove_forward : $to_forward);
72
-
73
-    
74
-  $form .= "<tr>
75
-    <td>{$alias['fqdn']}{$wwwalias}</td>
76
-    <td>{$aliastype}<br />{$typetoggle}</td>
77
-    <td>".internal_link('save.php', 'Aliasname löschen', "action=deletealias&alias={$alias['id']}")."</td></tr>
78
-  ";
79
-}
80
-
81
-$form .= "
82
-<tr>
83
-  <td>
84
-    <strong>Neuen Aliasnamen hinzufügen</strong><br />
85
-    <input type=\"text\" name=\"hostname\" id=\"hostname\" size=\"10\" value=\"\" />
86
-      <strong>.</strong>".domainselect()."<br />
87
-    <input type=\"checkbox\" name=\"options[]\" id=\"aliaswww\" value=\"aliaswww\" />
88
-      <label for=\"aliaswww\">Auch mit <strong>www</strong> davor.</label>
89
-  </td>
90
-  <td>
91
-    <select name=\"options[]\">
92
-      <option value=\"\">zusätzliche Adresse</option>
93
-      <option value=\"forward\">Umleitung auf Haupt-Adresse</option>
94
-    </select>
95
-  </td>
96
-  <td>
97
-    <input type=\"submit\" value=\"Hinzufügen\" />
98
-  </td>
99
-</tr>
100
-</table>";
101
-
102
-output(html_form('vhosts_add_alias', 'save.php', 'action=addalias&vhost='.$vhost['id'], $form));
103
-    
104
-output("<p>
105
-  <a href=\"vhosts.php\">Zurück zur Übersicht</a>
106
-</p>");
107
-
108
-*/
109 52
 ?>
... ...
@@ -28,7 +28,7 @@ if ($_POST['password1'] != '')
28 28
   else {
29 29
     change_mailaccount(get_mailaccount_id($_SESSION['mailaccount']), array('password' => $_POST['password1']));
30 30
     if (! $debugmode)
31
-      header('Location: chpass.php');
31
+      header('Location: chpass');
32 32
     else
33 33
       output('');
34 34
   }
... ...
@@ -38,7 +38,7 @@ if ($_POST['password1'] != '')
38 38
 
39 39
 output('<h3>Passwort ändern</h3>
40 40
 <p>Hier können Sie Ihr Passwort ändern.</p>
41
-'.html_form('imap_chpass', 'chpass.php', '', '<table>
41
+'.html_form('imap_chpass', 'chpass', '', '<table>
42 42
   <tr>
43 43
     <td>bisheriges Passwort:</td>  <td><input type="password" name="old_password" value="" /></td>
44 44
   </tr>
... ...
@@ -6,11 +6,11 @@ $role = $_SESSION['role'];
6 6
 
7 7
 if ($role & ROLE_SYSTEMUSER && (user_has_accounts() || ! user_has_vmail_domain() || user_has_regular_domain() ) )
8 8
 {
9
-  $menu["imap_accounts"] = array("label" => "IMAP/POP3", "file" => "accounts.php", "weight" => 10);
9
+  $menu["imap_accounts"] = array("label" => "IMAP/POP3", "file" => "accounts", "weight" => 10);
10 10
 }
11 11
 elseif ($role & ROLE_MAILACCOUNT)
12 12
 {
13
-  $menu["imap_chpass"] = array("label" => "Passwort ändern", "file" => "chpass.php", "weight" => 10);
13
+  $menu["imap_chpass"] = array("label" => "Passwort ändern", "file" => "chpass", "weight" => 10);
14 14
 }
15 15
 
16 16
 
... ...
@@ -37,7 +37,7 @@ if ($_POST['password1'] != '')
37 37
       system_failure("WTF?! (\$result={$result})");
38 38
     
39 39
     if (! $debugmode)
40
-      header('Location: index.php');
40
+      header('Location: index');
41 41
     else
42 42
       output('');
43 43
   }
... ...
@@ -50,7 +50,7 @@ if ($_SESSION['role'] & ROLE_SYSTEMUSER)
50 50
 
51 51
 output('<h3>Passwort ändern</h3>
52 52
 <p>Hier können Sie Ihr Passwort ändern.</p>
53
-'.html_form('index_chpass', 'chpass.php', '', '<table>
53
+'.html_form('index_chpass', 'chpass', '', '<table>
54 54
   <tr>
55 55
     <td>bisheriges Passwort:</td>  <td><input type="password" name="old_password" value="" /></td>
56 56
   </tr>
... ...
@@ -27,14 +27,14 @@ if (isset($_REQUEST['uid']) and isset($_REQUEST['token']))
27 27
       {
28 28
         require_once('session/checkuser.php');
29 29
         require_once('inc/base.php');
30
-        logger("modules/index/initialize_useraccount.php", "initialize", "uid »{$uid}« set a new password");
30
+        logger("modules/index/initialize_useraccount", "initialize", "uid »{$uid}« set a new password");
31 31
         set_systemuser_password($uid, $_POST['password']);
32 32
         success_msg('Das Passwort wurde gesetzt!');
33 33
         invalidate_systemuser_token($uid);
34 34
         $_SESSION['role'] = find_role($uid, '', True);;
35 35
 	setup_session($_SESSION['role'], $uid);
36 36
         output('<h3>Passwort gesetzt</h3>
37
-        <p>Ihr neues Passwort wurde gesetzt, Sie können jetzt <a href="index.php">die Web-Oberfläche sofort benutzen</a>.</p>');
37
+        <p>Ihr neues Passwort wurde gesetzt, Sie können jetzt '.internal_link('index', 'die Web-Oberfläche sofort benutzen').'.</p>');
38 38
         $show = NULL;
39 39
       }
40 40
     }
... ...
@@ -4,22 +4,22 @@ require_once('session/start.php');
4 4
 
5 5
 require_once('inc/error.php');
6 6
 
7
-logger("modules/index/logout.php", "logout", "logged out");
8
-
9 7
 if (!session_destroy())
10 8
 {
11
-  logger("modules/index/logout.php", "logout", "session timed out.");
9
+  logger("modules/index/logout", "logout", "session timed out.");
12 10
 	system_failure('Die Sitzung konnte nicht geschlossen werden, eventuell ist die Wartezeit abgelaufen und die Sitzung wurde daher schon beendet.');
13 11
 }
14 12
 unset($_SESSION['role']);
15 13
 
14
+logger("modules/index/logout", "logout", "logged out");
15
+
16 16
 output('
17 17
 
18 18
 <h3>Abmeldung</h3>
19 19
 
20 20
 <p>Sie wurden vom System abgemeldet.</p>
21 21
 
22
-<p>Um sich neu anzumelden, klicken Sie bitte hier: <a href="index.php">Anmeldung</a>.</p>
22
+<p>Um sich neu anzumelden, klicken Sie bitte hier: '.internal_link("index", "Anmeldung").'.</p>
23 23
 
24 24
 ');
25 25
 
... ...
@@ -3,14 +3,14 @@
3 3
 $role = $_SESSION['role'];
4 4
 
5 5
 if ($role == ROLE_ANONYMOUS) {
6
-  $menu["index_login"] = array("label" => "Login", "file" => "index.php", "weight" => 0);
6
+  $menu["index_login"] = array("label" => "Login", "file" => "index", "weight" => 0);
7 7
 } else {
8 8
   if ($role & (ROLE_SYSTEMUSER | ROLE_CUSTOMER)) {
9
-    $menu["index_chpass"] = array("label" => "Passwort ändern", "file" => "chpass.php", "weight" => 98);
9
+    $menu["index_chpass"] = array("label" => "Passwort ändern", "file" => "chpass", "weight" => 98);
10 10
   }
11 11
 
12
-  $menu["index_logout"] = array("label" => "Logout", "file" => "logout.php", "weight" => 99);
13
-  $menu["index_index"] = array("label" => "Übersicht", "file" => "index.php", "weight" => 0);
12
+  $menu["index_logout"] = array("label" => "Logout", "file" => "logout", "weight" => 99);
13
+  $menu["index_index"] = array("label" => "Übersicht", "file" => "index", "weight" => 0);
14 14
 }
15 15
 
16 16
 
... ...
@@ -14,7 +14,7 @@ if (isset($_POST['customerno']))
14 14
       require_once('mail.php');
15 15
       require_once('inc/base.php');
16 16
       send_customer_token($_POST['customerno']);
17
-      logger("modules/index/new_password.php", "pwrecovery", "token sent for customer »{$_POST['customerno']}«");
17
+      logger("modules/index/new_password", "pwrecovery", "token sent for customer »{$_POST['customerno']}«");
18 18
       success_msg('Die angegebenen Daten waren korrekt, Sie sollten umgehend eine E-Mail erhalten.');
19 19
     }
20 20
   }
... ...
@@ -25,7 +25,7 @@ if (isset($_REQUEST['customerno']) and isset($_REQUEST['token']))
25 25
       {
26 26
         require_once('session/checkuser.php');
27 27
         require_once('inc/base.php');
28
-        logger("modules/index/validate_token.php", "pwrecovery", "customer »{$customerno}« set a new password");
28
+        logger("modules/index/validate_token", "pwrecovery", "customer »{$customerno}« set a new password");
29 29
         set_customer_password($customerno, $_POST['password']);
30 30
         success_msg('Das Passwort wurde gesetzt!');
31 31
         set_customer_verified($customerno);
... ...
@@ -34,7 +34,7 @@ if (isset($_REQUEST['customerno']) and isset($_REQUEST['token']))
34 34
         $_SESSION['role'] = ROLE_CUSTOMER;
35 35
         $_SESSION['customerinfo'] = get_customer_info($customerno);
36 36
         output('<h3>Passwort gesetzt</h3>
37
-        <p>Ihr neues Passwort wurde gesetzt, Sie können jetzt <a href="index.php">die Web-Oberfläche sofort benutzen</a>.</p>');
37
+        <p>Ihr neues Passwort wurde gesetzt, Sie können jetzt '.internal_link("index", "die Web-Oberfläche sofort benutzen").'.</p>');
38 38
         $show = NULL;
39 39
       }
40 40
     }
... ...
@@ -18,7 +18,7 @@ foreach($invoices AS $invoice)
18 18
 	$bezahlt = 'Nein';
19 19
 	if ($invoice['bezahlt'] == 1)
20 20
 		$bezahlt = 'Ja';
21
-	output("<tr><td>{$invoice['id']}</td><td>{$invoice['datum']}</td><td>{$invoice['betrag']} €</td><td>{$bezahlt}</td><td><a href=\"pdf.php?id={$invoice['id']}\">PDF</a> &#160; <a href=\"html.php?id={$invoice['id']}\">HTML</a></td></tr>\n");
21
+	output("<tr><td>{$invoice['id']}</td><td>{$invoice['datum']}</td><td>{$invoice['betrag']} €</td><td>{$bezahlt}</td><td>".internal_link("pdf", "PDF", "id={$invoice['id']}").' &#160; '.internal_link("html", "HTML", "id={$invoice['id']}")."</td></tr>\n");
22 22
 }
23 23
 
24 24
 output('</table><br />');
... ...
@@ -12,7 +12,7 @@ output('<h3>Rechnung</h3>
12 12
 
13 13
 $invoice_id = (int) filter_input_general($_GET['id']);
14 14
 
15
-output("<p>Für eine druckbare Version benutzen Sie bitte die Ausgabe <a href=\"pdf.php?id={$invoice_id}\">als PDF-Datei</a>.</p>
15
+output("<p>Für eine druckbare Version benutzen Sie bitte die Ausgabe ".internal_link("pdf", "als PDF-Datei", "id={$invoice_id}").".</p>
16 16
 <p>&#160;</p>");
17 17
 
18 18
 
... ...
@@ -4,8 +4,8 @@ $role = $_SESSION['role'];
4 4
 
5 5
 if ($role & ROLE_CUSTOMER)
6 6
 {
7
-  $menu["invoice_current"] = array("label" => "Rechnungen", "file" => "current.php", "weight" => 2);
8
-  $menu["invoice_upcoming"] = array("label" => "zukünftige Rechnungen", "file" => "upcoming.php", "weight" => 2, "submenu" => "invoice_current");
7
+  $menu["invoice_current"] = array("label" => "Rechnungen", "file" => "current", "weight" => 2);
8
+  $menu["invoice_upcoming"] = array("label" => "zukünftige Rechnungen", "file" => "upcoming", "weight" => 2, "submenu" => "invoice_current");
9 9
 
10 10
     
11 11
 }
... ...
@@ -26,11 +26,11 @@ foreach ($jabberaccounts as $acc)
26 26
     $domain = new Domain();
27 27
     $domain->fqdn='schokokeks.org';
28 28
   }
29
-  output("<tr><td>{$local}@{$domain->fqdn}</td><td>".internal_link('chpass.php', 'Passwort ändern', 'account='.$acc['id'])."&#160;&#160;&#160;".internal_link('save.php', 'Löschen', 'action=delete&account='.$acc['id']).'</td></tr>');
29
+  output("<tr><td>{$local}@{$domain->fqdn}</td><td>".internal_link('chpass', 'Passwort ändern', 'account='.$acc['id'])."&#160;&#160;&#160;".internal_link('save', 'Löschen', 'action=delete&account='.$acc['id']).'</td></tr>');
30 30
 }
31 31
 
32 32
 output('</table>
33 33
 
34
-<p><a href="new_account.php">Neues Jabber-Konto anlegen</a></p>');
34
+<p>'.internal_link("new_account", "Neues Jabber-Konto anlegen").'</p>');
35 35
 
36 36
 ?>
... ...
@@ -14,7 +14,7 @@ $account_string = $account['local'].'@'.$account['domain'];
14 14
 
15 15
 output("<h3>Passwort für Jabber-Account ändern</h3>");
16 16
 
17
-output(html_form('jabber_chpass', 'save.php', 'action=chpass', '
17
+output(html_form('jabber_chpass', 'save', 'action=chpass', '
18 18
 <table>
19 19
 <tr><td>Account-Name:</td><td>'.$account_string.'</td></tr>
20 20
 <tr><td>Passwort:</td><td><input type="password" name="newpass" value="" /></td></tr>
... ...
@@ -71,7 +71,7 @@ function create_jabber_account($local, $domain, $password)
71 71
     $result = db_query("SELECT id FROM kundendaten.domains WHERE kunde={$customerno} AND jabber=1 AND id={$domain};");
72 72
     if (mysql_num_rows($result) == 0)
73 73
     {
74
-      logger("modules/jabber/include/jabberaccounts.php", "jabber", "attempt to create account for invalid domain »{$domain}«");
74
+      logger("modules/jabber/include/jabberaccounts", "jabber", "attempt to create account for invalid domain »{$domain}«");
75 75
       system_failure("Invalid domain!");
76 76
     }
77 77
   }
... ...
@@ -85,12 +85,12 @@ function create_jabber_account($local, $domain, $password)
85 85
   $result = db_query("SELECT id FROM jabber.accounts WHERE local='{$local}' AND {$domainquery}");
86 86
   if (mysql_num_rows($result) > 0)
87 87
   {
88
-    logger("modules/jabber/include/jabberaccounts.php", "jabber", "attempt to create already existing account »{$local}@{$domain}«");
88
+    logger("modules/jabber/include/jabberaccounts", "jabber", "attempt to create already existing account »{$local}@{$domain}«");
89 89
     system_failure("Diesen Account gibt es bereits!");
90 90
   }
91 91
 
92 92
   db_query("INSERT INTO jabber.accounts (customerno,local,domain,password) VALUES ({$customerno}, '{$local}', {$domain}, '{$password}');");
93
-  logger("modules/jabber/include/jabberaccounts.php", "jabber", "created account »{$local}@{$domain}«");
93
+  logger("modules/jabber/include/jabberaccounts", "jabber", "created account »{$local}@{$domain}«");
94 94
 }
95 95
 
96 96
 
... ...
@@ -108,7 +108,7 @@ function change_jabber_password($id, $password)
108 108
   $password = mysql_real_escape_string( $password );
109 109
   
110 110
   db_query("UPDATE jabber.accounts SET password='{$password}' WHERE customerno={$customerno} AND id={$id} LIMIT 1");
111
-  logger("modules/jabber/include/jabberaccounts.php", "jabber", "changed password for account  »{$id}«");
111
+  logger("modules/jabber/include/jabberaccounts", "jabber", "changed password for account  »{$id}«");
112 112
 }
113 113
 
114 114
 
... ...
@@ -121,7 +121,7 @@ function delete_jabber_account($id)
121 121
   $id = (int) $id;
122 122
 
123 123
   db_query("UPDATE jabber.accounts SET `delete`=1 WHERE customerno={$customerno} AND id={$id} LIMIT 1");
124
-  logger("modules/jabber/include/jabberaccounts.php", "jabber", "deleted account »{$id}«");
124
+  logger("modules/jabber/include/jabberaccounts", "jabber", "deleted account »{$id}«");
125 125
 }
126 126
 
127 127
 ?>
... ...
@@ -4,7 +4,7 @@ $role = $_SESSION['role'];
4 4
 
5 5
 if ($role & ROLE_CUSTOMER)
6 6
 {
7
-  $menu["jabber_accounts"] = array("label" => "Jabber", "file" => "accounts.php", "weight" => 10);
7
+  $menu["jabber_accounts"] = array("label" => "Jabber", "file" => "accounts", "weight" => 10);
8 8
     
9 9
 }
10 10
 
... ...
@@ -24,7 +24,7 @@ output("<h3>Neuen Jabber-Account erstellen</h3>");
24 24
 
25 25
 output('<p>Erstellen Sie hier ein neues Jabber-Konto. Ihre Änderungen werden nach ca. 10 Minuten automatisch in das System übertragen. Accounts funktionieren also nicht unmittelbar nach dem Anlegen.</p>
26 26
 
27
-'.html_form('jabber_new_account', 'save.php', 'action=new', '
27
+'.html_form('jabber_new_account', 'save', 'action=new', '
28 28
 <table>
29 29
 <tr><td>Account-Name:</td><td><input type="text" name="local" value="" />&#160;@&#160;<select name="domain" size="1">
30 30
 '.$options.'
... ...
@@ -25,7 +25,7 @@ if ($_GET['action'] == 'new')
25 25
   {
26 26
     create_jabber_account($_POST['local'], $_POST['domain'], stripslashes($_POST['password']));
27 27
     if (! $debugmode)
28
-      header('Location: accounts.php');
28
+      header('Location: accounts');
29 29
   }
30 30
 }
31 31
 elseif ($_GET['action'] == 'chpass')
... ...
@@ -43,7 +43,7 @@ elseif ($_GET['action'] == 'chpass')
43 43
   {
44 44
     change_jabber_password($_POST['accountid'], stripslashes($_POST['newpass']));
45 45
     if (! $debugmode)
46
-      header('Location: accounts.php');
46
+      header('Location: accounts');
47 47
   }
48 48
 }
49 49
 elseif ($_GET['action'] == 'delete')
... ...
@@ -62,12 +62,12 @@ elseif ($_GET['action'] == 'delete')
62 62
   {
63 63
     delete_jabber_account($account['id']);
64 64
     if (! $debugmode)
65
-      header("Location: accounts.php");
65
+      header("Location: accounts");
66 66
   }
67 67
   elseif ($sure === false)
68 68
   {
69 69
     if (! $debugmode)
70
-      header("Location: accounts.php");
70
+      header("Location: accounts");
71 71
   }
72 72
 
73 73
 }
... ...
@@ -121,7 +121,7 @@ if ($output_something)
121 121
   <tr><th style="background-color: #729bb3; color: #fff;padding: 0.2em; text-align: left;">Datenbanken</th>';
122 122
 
123 123
   foreach ($users as $user)
124
-    $form .= "<th>{$user}<br /><a href=\"?".($debugmode ? 'debug&amp;': '')."action=delete_user&amp;user={$user}\"><img src=\"{$prefix}images/delete.png\" title=\"Benutzer »{$user}« löschen\" alt=\"löschen\" /></a></th>";
124
+    $form .= "<th>{$user}<br />".internal_link("", "<img src=\"{$prefix}images/delete.png\" title=\"Benutzer »{$user}« löschen\" alt=\"löschen\" />", "action=delete_user&user={$user}")."</th>";
125 125
   $form .= '<th><input type="text" name="new_user" size="10" value="" /></th></tr>
126 126
 ';
127 127
 
... ...
@@ -129,7 +129,7 @@ if ($output_something)
129 129
 
130 130
   foreach($dbs as $db)
131 131
   {
132
-    $form .= "<tr><td style=\"border: 0px; font-weight: bold; text-align: right;\">{$db}&#160;<a href=\"?".($debugmode ? 'debug&amp;': '')."action=delete_db&amp;db={$db}\"><img src=\"{$prefix}images/delete.png\" title=\"Datenbank »{$db}« löschen\" alt=\"löschen\" /></a></td>";
132
+    $form .= "<tr><td style=\"border: 0px; font-weight: bold; text-align: right;\">{$db}&#160;".internal_link("", "<img src=\"{$prefix}images/delete.png\" title=\"Datenbank »{$db}« löschen\" alt=\"löschen\" />", "action=delete_db&amp;db={$db}")."</td>";
133 133
     foreach ($users as $user)
134 134
       $form .= '<td style="text-align: center;"><input type="checkbox" id="'.$db.'_'.$user.'" name="access['.$db.'][]" value="'.$user.'" '.(get_mysql_access($db, $user) ? 'checked="checked" ' : '')." /></td>";
135 135
     $form .= "</tr>\n";
... ...
@@ -144,7 +144,7 @@ if ($output_something)
144 144
   <p><input type="submit" name="accesseditor" value="Speichern" /></p>';
145 145
 
146 146
   
147
-  output(html_form('mysql_databases', 'databases.php', '', $form));
147
+  output(html_form('mysql_databases', 'databases', '', $form));
148 148
 
149 149
   $users = get_mysql_accounts($_SESSION['userinfo']['uid']);
150 150
 
... ...
@@ -162,7 +162,7 @@ if ($output_something)
162 162
   output('<h4>Passwort ändern</h4>
163 163
   <p>Hier können Sie das Passwort eines MySQL-Benutzeraccounts ändern bzw. neu setzen</p>
164 164
 
165
-  '.html_form('mysql_databases', 'databases.php', 'action=change_pw', $form));
165
+  '.html_form('mysql_databases', 'databases', 'action=change_pw', $form));
166 166
 
167 167
 }
168 168
 
... ...
@@ -57,14 +57,14 @@ function set_mysql_access($db, $account, $status)
57 57
     if (get_mysql_access($db, $account))
58 58
       return NULL;
59 59
     $query = "INSERT INTO misc.mysql_access (`database`,user) VALUES ((SELECT id FROM misc.mysql_database WHERE name='{$db}' AND useraccount={$uid} LIMIT 1), (SELECT id FROM misc.mysql_accounts WHERE username='{$account}' AND useraccount={$uid}));";
60
-    logger("modules/mysql/include/mysql.php", "mysql", "granting access on »{$db}« to »{$account}«");
60
+    logger("modules/mysql/include/mysql", "mysql", "granting access on »{$db}« to »{$account}«");
61 61
   }
62 62
   else
63 63
   {
64 64
     if (! get_mysql_access($db, $account))
65 65
       return NULL;
66 66
     $query = "DELETE FROM misc.mysql_access WHERE `database`=(SELECT id FROM misc.mysql_database WHERE name='{$db}' AND useraccount={$uid} LIMIT 1) AND user=(SELECT id FROM misc.mysql_accounts WHERE username='{$account}' AND useraccount={$uid});";
67
-    logger("modules/mysql/include/mysql.php", "mysql", "revoking access on »{$db}« from »{$account}«");
67
+    logger("modules/mysql/include/mysql", "mysql", "revoking access on »{$db}« from »{$account}«");
68 68
   }
69 69
   db_query($query);
70 70
 }
... ...
@@ -74,7 +74,7 @@ function create_mysql_account($username)
74 74
 {
75 75
   if (! validate_mysql_dbname($username))
76 76
   {
77
-    logger("modules/mysql/include/mysql.php", "mysql", "illegal username »{$username}«");
77
+    logger("modules/mysql/include/mysql", "mysql", "illegal username »{$username}«");
78 78
     input_error("Der eingegebene Benutzername entspricht leider nicht der Konvention. Bitte tragen Sie einen passenden Namen ein.");
79 79
     return NULL;
80 80
   }
... ...
@@ -84,7 +84,7 @@ function create_mysql_account($username)
84 84
   }
85 85
   $uid = $_SESSION['userinfo']['uid'];
86 86
   $username = mysql_real_escape_string($username);
87
-  logger("modules/mysql/include/mysql.php", "mysql", "creating user »{$username}«");
87
+  logger("modules/mysql/include/mysql", "mysql", "creating user »{$username}«");
88 88
   db_query("INSERT INTO misc.mysql_accounts (username, password, useraccount) VALUES ('$username', '!', $uid);");
89 89
 }
90 90
 
... ...
@@ -93,7 +93,7 @@ function delete_mysql_account($username)
93 93
 {
94 94
   $username = mysql_real_escape_string($username);
95 95
   $uid = $_SESSION['userinfo']['uid'];
96
-  logger("modules/mysql/include/mysql.php", "mysql", "deleting user »{$username}«");
96
+  logger("modules/mysql/include/mysql", "mysql", "deleting user »{$username}«");
97 97
   db_query("DELETE FROM misc.mysql_accounts WHERE username='{$username}' AND useraccount='{$uid}' LIMIT 1;");
98 98
 }
99 99
 
... ...
@@ -102,13 +102,13 @@ function create_mysql_database($dbname)
102 102
 {
103 103
   if (! validate_mysql_dbname($dbname))
104 104
   {
105
-    logger("modules/mysql/include/mysql.php", "mysql", "illegal db-name »{$dbname}«");
105
+    logger("modules/mysql/include/mysql", "mysql", "illegal db-name »{$dbname}«");
106 106
     input_error("Der eingegebene Datenbankname entspricht leider nicht der Konvention. Bitte tragen Sie einen passenden Namen ein.");
107 107
     return NULL;
108 108
   }
109 109
   $dbname = mysql_real_escape_string($dbname);
110 110
   $uid = $_SESSION['userinfo']['uid'];
111
-  logger("modules/mysql/include/mysql.php", "mysql", "creating database »{$dbname}«");
111
+  logger("modules/mysql/include/mysql", "mysql", "creating database »{$dbname}«");
112 112
   db_query("INSERT INTO misc.mysql_database (name, useraccount) VALUES ('$dbname', $uid);");
113 113
 }
114 114
 
... ...
@@ -117,7 +117,7 @@ function delete_mysql_database($dbname)
117 117
 {
118 118
   $dbname = mysql_real_escape_string($dbname);
119 119
   $uid = $_SESSION['userinfo']['uid'];
120
-  logger("modules/mysql/include/mysql.php", "mysql", "removing database »{$dbname}«");
120
+  logger("modules/mysql/include/mysql", "mysql", "removing database »{$dbname}«");
121 121
   db_query("DELETE FROM misc.mysql_database WHERE name='{$dbname}' AND useraccount='{$uid}' LIMIT 1;");
122 122
 }
123 123
 
... ...
@@ -142,7 +142,7 @@ function set_mysql_password($username, $password)
142 142
   $username = mysql_real_escape_string($username);
143 143
   $password = mysql_real_escape_string($password);
144 144
   $uid = $_SESSION['userinfo']['uid'];
145
-  logger("modules/mysql/include/mysql.php", "mysql", "updating password for »{$username}«");
145
+  logger("modules/mysql/include/mysql", "mysql", "updating password for »{$username}«");
146 146
   db_query("UPDATE misc.mysql_accounts SET password=PASSWORD('$password') WHERE username='$username' AND useraccount=$uid;");
147 147
 }
148 148
 
... ...
@@ -4,7 +4,7 @@ $role = $_SESSION['role'];
4 4
 
5 5
 if ($role & ROLE_SYSTEMUSER)
6 6
 {
7
-  $menu["mysql_databases"] = array("label" => "MySQL-Datenbank", "file" => "databases.php", "weight" => 20);
7
+  $menu["mysql_databases"] = array("label" => "MySQL-Datenbank", "file" => "databases", "weight" => 20);
8 8
     
9 9
 }
10 10
 ?>
... ...
@@ -20,7 +20,7 @@ function create_customer($data)
20 20
 
21 21
   if (customer_with_email($data['email']) !== NULL)
22 22
   {
23
-    logger('modules/register/include/register.php', 'register', "Attempt to create customer with duplicate email »{$data['email']}«");
23
+    logger('modules/register/include/register', 'register', "Attempt to create customer with duplicate email »{$data['email']}«");
24 24
     return NULL;
25 25
   }
26 26
 
... ...
@@ -30,7 +30,7 @@ function create_customer($data)
30 30
   $nachname = mysql_escape_string($data['nachname']);
31 31
   $email = mysql_escape_string($data['email']);
32 32
 
33
-  logger('modules/register/include/register.php', 'register', "Creating new account: {$anrede} / {$firma} / {$vorname} / {$nachname} / {$email}");
33
+  logger('modules/register/include/register', 'register', "Creating new account: {$anrede} / {$firma} / {$vorname} / {$nachname} / {$email}");
34 34
   
35 35
   $realname = maybe_null(chop($vorname.' '.$nachname));
36 36
 
... ...
@@ -46,7 +46,7 @@ if (count($_POST) > 0)
46 46
       require_once('inc/base.php');
47 47
       send_initial_customer_token($customerno);
48 48
       notify_admins_about_new_customer($customerno);
49
-      logger("modules/register/index.php", "register", "token sent for customer »{$customerno}«");
49
+      logger("modules/register/index", "register", "token sent for customer »{$customerno}«");
50 50
       $success = true;
51 51
       #success_msg('Die angegebenen Daten wurden gespeichert, Sie sollten umgehend eine E-Mail erhalten.');
52 52
     }
... ...
@@ -5,7 +5,7 @@ $role = $_SESSION['role'];
5 5
 switch ($role)
6 6
 {
7 7
   case ROLE_ANONYMOUS:
8
-    $menu["register_index"] = array("label" => "Kunde werden", "file" => "index.php", "weight" => 0);
8
+    $menu["register_index"] = array("label" => "Kunde werden", "file" => "index", "weight" => 0);
9 9
     break;
10 10
     
11 11
 }
... ...
@@ -4,7 +4,7 @@ $role = $_SESSION['role'];
4 4
 
5 5
 if ($role & ROLE_SYSADMIN)
6 6
 {
7
-  $menu["su_su"] = array("label" => "Su-Login", "file" => "su.php", "weight" => -10);
7
+  $menu["su_su"] = array("label" => "Su-Login", "file" => "su", "weight" => -10);
8 8
 }
9 9
 
10 10
 ?>
... ...
@@ -14,7 +14,7 @@ if (isset($_POST['submit']))
14 14
   $role = find_role($id, '', True);
15 15
   setup_session($role, $id);
16 16
 
17
-  header('Location: ../../go/index/index.php');
17
+  header('Location: ../../go/index/index');
18 18
   die();
19 19
 }
20 20
 
... ...
@@ -33,7 +33,7 @@ foreach ($users as $user)
33 33
   $options .= "  <option value=\"{$user->uid}\">{$user->username} ({$user->uid})</option>\n";
34 34
 }
35 35
 
36
-output(html_form('su_su', 'su.php', '', '<p>Benutzer auswählen:
36
+output(html_form('su_su', 'su', '', '<p>Benutzer auswählen:
37 37
 <select name="destination" size="1">
38 38
 '.$options.'
39 39
 </select>
... ...
@@ -48,7 +48,7 @@ foreach ($customers as $customer)
48 48
   $options .= "  <option value=\"{$customer->id}\">{$customer->id} - {$customer->name}</option>\n";
49 49
 }
50 50
 
51
-output(html_form('su_su', 'su.php', '', '<p>Kunde auswählen:
51
+output(html_form('su_su', 'su', '', '<p>Kunde auswählen:
52 52
 <select name="destination" size="1">
53 53
 '.$options.'
54 54
 </select>
... ...
@@ -27,7 +27,7 @@ else
27 27
     if (customer_useraccount($acc->uid))
28 28
       output($acc->username);
29 29
     else
30
-      output(internal_link('edit.php', $acc->username, "uid={$acc->uid}"));
30
+      output(internal_link('edit', $acc->username, "uid={$acc->uid}"));
31 31
     output("</td><td>{$acc->name}</td><td>{$acc->erstellungsdatum}</td><td>{$acc->quota} MB</td></tr>");
32 32
   }
33 33
   output("</table><br />");
... ...
@@ -18,7 +18,7 @@ if (customer_useraccount($account['uid']))
18 18
   system_failure('Aus Sicherheitsgründen können Sie diesen Account nicht ändern!');
19 19
 
20 20
 
21
-output(html_form('systemuser_edit', 'save.php', 'action=edit', '
21
+output(html_form('systemuser_edit', 'save', 'action=edit', '
22 22
 <table>
23 23
 <tr><td>Benutzername:</td><td><strong>'.$account['username'].'</strong></td></tr>
24 24
 <tr><td>richtiger Name:<br /><span style="font-size:85%;">(wenn nicht »'.$_SESSION['customerinfo']['name'].'«)</span></td><td><input type="text" name="fullname" value="'.$account['name'].'" /></td></tr>
... ...
@@ -67,7 +67,7 @@ function set_systemuser_details($uid, $fullname, $quota)
67 67
   $quota = (int) $quota;
68 68
 
69 69
   db_query("UPDATE system.useraccounts SET name={$fullname} WHERE kunde={$customerno} AND uid={$uid} LIMIT 1");
70
-  logger("modules/systemuser/include/useraccounts.php", "systemuser", "updated real name for uid {$uid}");
70
+  logger("modules/systemuser/include/useraccounts", "systemuser", "updated real name for uid {$uid}");
71 71
 
72 72
 }
73 73
 
... ...
@@ -4,7 +4,7 @@ $role = $_SESSION['role'];
4 4
 
5 5
 if ($role & ROLE_CUSTOMER)
6 6
 {
7
-  $menu["systemuser_accounts"] = array("label" => "Benutzeraccounts", "file" => "accounts.php", "weight" => 30);
7
+  $menu["systemuser_accounts"] = array("label" => "Benutzeraccounts", "file" => "accounts", "weight" => 30);
8 8
 }
9 9
 
10 10
 ?>
... ...
@@ -26,7 +26,7 @@ if ($_GET['action'] == 'new')
26 26
   {
27 27
     create_jabber_account($_POST['local'], $_POST['domain'], $_POST['password']);
28 28
     if (! $debugmode)
29
-      header('Location: accounts.php');
29
+      header('Location: accounts');
30 30
   }
31 31
   */
32 32
 }
... ...
@@ -58,7 +58,7 @@ elseif ($_GET['action'] == 'edit')
58 58
 
59 59
   set_systemuser_details($_POST['uid'], $_POST['fullname'], $_POST['quota']);
60 60
   if (! ($debugmode || $error))
61
-    header('Location: accounts.php');
61
+    header('Location: accounts');
62 62
   
63 63
 }
64 64
 elseif ($_GET['action'] == 'delete')
... ...
@@ -75,12 +75,12 @@ elseif ($_GET['action'] == 'delete')
75 75
   {
76 76
     delete_jabber_account($account['id']);
77 77
     if (! $debugmode)
78
-      header("Location: accounts.php");
78
+      header("Location: accounts");
79 79
   }
80 80
   elseif ($sure === false)
81 81
   {
82 82
     if (! $debugmode)
83
-      header("Location: accounts.php");
83
+      header("Location: accounts");
84 84
   }
85 85
   */
86 86
 }
... ...
@@ -34,19 +34,19 @@ foreach ($aliases AS $alias) {
34 34
     $aliastype = 'Umleitung auf Haupt-Adresse';
35 35
   }
36 36
   $formtoken = generate_form_token('aliases_toggle');
37
-  $havewww = '<br />www.'.$alias['fqdn'].' &#160; ('.internal_link('aliasoptions.php', 'WWW-Alias entfernen', "alias={$alias['id']}&aliaswww=0&formtoken={$formtoken}").')';
38
-  $nowww = '<br />'.internal_link('aliasoptions.php', 'Auch mit WWW', "alias={$alias['id']}&aliaswww=1&formtoken={$formtoken}");
37
+  $havewww = '<br />www.'.$alias['fqdn'].' &#160; ('.internal_link('aliasoptions', 'WWW-Alias entfernen', "alias={$alias['id']}&aliaswww=0&formtoken={$formtoken}").')';
38
+  $nowww = '<br />'.internal_link('aliasoptions', 'Auch mit WWW', "alias={$alias['id']}&aliaswww=1&formtoken={$formtoken}");
39 39
   $wwwalias = (strstr($alias['options'], 'aliaswww') ? $havewww : $nowww);
40 40
 
41
-  $to_forward = internal_link('aliasoptions.php', 'In Umleitung umwandeln', "alias={$alias['id']}&forward=1&formtoken={$formtoken}");
42
-  $remove_forward = internal_link('aliasoptions.php', 'In zusätzliche Adresse umwandeln', "alias={$alias['id']}&forward=0&formtoken={$formtoken}");
41
+  $to_forward = internal_link('aliasoptions', 'In Umleitung umwandeln', "alias={$alias['id']}&forward=1&formtoken={$formtoken}");
42
+  $remove_forward = internal_link('aliasoptions', 'In zusätzliche Adresse umwandeln', "alias={$alias['id']}&forward=0&formtoken={$formtoken}");
43 43
   $typetoggle = (strstr($alias['options'], 'forward') ? $remove_forward : $to_forward);
44 44
 
45 45
     
46 46
   $form .= "<tr>
47 47
     <td>{$alias['fqdn']}{$wwwalias}</td>
48 48
     <td>{$aliastype}<br />{$typetoggle}</td>
49
-    <td>".internal_link('save.php', 'Aliasname löschen', "action=deletealias&alias={$alias['id']}")."</td></tr>
49
+    <td>".internal_link('save', 'Aliasname löschen', "action=deletealias&alias={$alias['id']}")."</td></tr>
50 50
   ";
51 51
 }
52 52
 
... ...
@@ -71,10 +71,10 @@ $form .= "
71 71
 </tr>
72 72
 </table>";
73 73
 
74
-output(html_form('vhosts_add_alias', 'save.php', 'action=addalias&vhost='.$vhost['id'], $form));
74
+output(html_form('vhosts_add_alias', 'save', 'action=addalias&vhost='.$vhost['id'], $form));
75 75
     
76 76
 output("<p>
77
-  <a href=\"vhosts.php\">Zurück zur Übersicht</a>
77
+  ".internal_link("vhosts", "Zurück zur Übersicht")."
78 78
 </p>");
79 79
 
80 80
 
... ...
@@ -33,7 +33,7 @@ if (isset($_GET['aliaswww'])) {
33 33
   save_alias($alias);
34 34
 
35 35
   if (! $debugmode)
36
-    header('Location: aliases.php?vhost='.$alias['vhost']);
36
+    header('Location: aliases?vhost='.$alias['vhost']);
37 37
 }
38 38
 if (isset($_GET['forward'])) {
39 39
 
... ...
@@ -60,7 +60,7 @@ if (isset($_GET['forward'])) {
60 60
   save_alias($alias);
61 61
 
62 62
   if (! $debugmode)
63
-    header('Location: aliases.php?vhost='.$alias['vhost']);
63
+    header('Location: aliases?vhost='.$alias['vhost']);
64 64
 }
65 65
 
66 66
 
... ...
@@ -180,12 +180,12 @@ $form .= "<br /><input type=\"checkbox\" name=\"options[]\" id=\"aliaswww\" valu
180 180
     ";
181 181
 
182 182
 $form .= '
183
-  <p><input type="submit" value="Speichern" />&#160;&#160;&#160;&#160;'.internal_link('vhosts.php', 'Abbrechen').'</p>
183
+  <p><input type="submit" value="Speichern" />&#160;&#160;&#160;&#160;'.internal_link('vhosts', 'Abbrechen').'</p>
184 184
   <p class="warning"><span class="warning">*</span>Es ist im Moment Gegenstand gerichtlicher Außeinandersetzungen, ob die Speicherung von Logfiles auf Webservern
185 185
   zulässig ist. Wir weisen alle Nutzer darauf hin, dass sie selbst dafür verantwortlich sind, bei geloggten Nutzerdaten die
186 186
   Seitenbesucher darauf hinzuweisen. Wir empfehlen, wenn möglich, Logfiles abzuschalten oder anonymes Logging einzusetzen.</p>
187 187
 ';
188
-output(html_form('vhosts_edit_vhost', 'save.php', 'action=edit&vhost='.$vhost['id'], $form));
188
+output(html_form('vhosts_edit_vhost', 'save', 'action=edit&vhost='.$vhost['id'], $form));
189 189
 
190 190
 
191 191
 ?>
... ...
@@ -132,7 +132,7 @@ function delete_vhost($id)
132 132
   if ($id == 0)
133 133
     system_failure("id == 0");
134 134
   $vhost = get_vhost_details($id);
135
-  logger('modules/vhosts/include/vhosts.php', 'vhosts', 'Removing vhost #'.$id.' ('.$vhost['hostname'].'.'.$vhost['domain'].')');
135
+  logger('modules/vhosts/include/vhosts', 'vhosts', 'Removing vhost #'.$id.' ('.$vhost['hostname'].'.'.$vhost['domain'].')');
136 136
   db_query("DELETE FROM vhosts.vhost WHERE id={$vhost['id']} LIMIT 1");
137 137
 }
138 138
 
... ...
@@ -143,7 +143,7 @@ function make_svn_vhost($id)
143 143
   $id = (int) $id;
144 144
   if ($id == 0)
145 145
     system_failure("id == 0");
146
-  logger('modules/vhosts/include/vhosts.php', 'vhosts', 'Converting vhost #'.$id.' to SVN');
146
+  logger('modules/vhosts/include/vhosts', 'vhosts', 'Converting vhost #'.$id.' to SVN');
147 147
   db_query("REPLACE INTO vhosts.dav (vhost, type) VALUES ({$id}, 'svn')");
148 148
   db_query("DELETE FROM vhosts.webapps WHERE vhost={$id}");
149 149
 }
... ...
@@ -153,7 +153,7 @@ function make_dav_vhost($id)
153 153
   $id = (int) $id;
154 154
   if ($id == 0)
155 155
     system_failure("id == 0");
156
-  logger('modules/vhosts/include/vhosts.php', 'vhosts', 'Converting vhost #'.$id.' to WebDAV');
156
+  logger('modules/vhosts/include/vhosts', 'vhosts', 'Converting vhost #'.$id.' to WebDAV');
157 157
   db_query("REPLACE INTO vhosts.dav (vhost, type, options) VALUES ({$id}, 'dav', 'nouserfile')");
158 158
   db_query("DELETE FROM vhosts.webapps WHERE vhost={$id}");
159 159
 }
... ...
@@ -163,7 +163,7 @@ function make_regular_vhost($id)
163 163
   $id = (int) $id;
164 164
   if ($id == 0)
165 165
     system_failure("id == 0");
166
-  logger('modules/vhosts/include/vhosts.php', 'vhosts', 'Converting vhost #'.$id.' to regular');
166
+  logger('modules/vhosts/include/vhosts', 'vhosts', 'Converting vhost #'.$id.' to regular');
167 167
   db_query("DELETE FROM vhosts.dav WHERE vhost={$id}");
168 168
   db_query("DELETE FROM vhosts.webapps WHERE vhost={$id}");
169 169
 }
... ...
@@ -179,7 +179,7 @@ function make_webapp_vhost($id, $webapp)
179 179
   if (mysql_num_rows($result) == 0)
180 180
     system_failure("webapp-id invalid");
181 181
   $webapp_name = mysql_fetch_object($result)->displayname;
182
-  logger('modules/vhosts/include/vhosts.php', 'vhosts', 'Setting up webapp '.$webapp_name.' on vhost #'.$id);
182
+  logger('modules/vhosts/include/vhosts', 'vhosts', 'Setting up webapp '.$webapp_name.' on vhost #'.$id);
183 183
   db_query("REPLACE INTO vhosts.webapps (vhost, webapp) VALUES ({$id}, {$webapp})");
184 184
   mail('webapps-setup@schokokeks.org', 'setup', 'setup');
185 185
 }
... ...
@@ -208,11 +208,11 @@ function save_vhost($vhost)
208 208
   $options = mysql_real_escape_string( $vhost['options'] );
209 209
 
210 210
   if ($id != 0) {
211
-    logger('modules/vhosts/include/vhosts.php', 'vhosts', 'Updating vhost #'.$id.' ('.$vhost['hostname'].'.'.$vhost['domain'].')');
211
+    logger('modules/vhosts/include/vhosts', 'vhosts', 'Updating vhost #'.$id.' ('.$vhost['hostname'].'.'.$vhost['domain'].')');
212 212
     db_query("UPDATE vhosts.vhost SET hostname={$hostname}, domain={$domain}, docroot={$docroot}, php={$php}, `ssl`={$ssl}, logtype={$logtype}, errorlog={$errorlog}, options='{$options}' WHERE id={$id} LIMIT 1");
213 213
   }
214 214
   else {
215
-    logger('modules/vhosts/include/vhosts.php', 'vhosts', 'Creating vhost '.$vhost['hostname'].'.'.$vhost['domain'].'');
215
+    logger('modules/vhosts/include/vhosts', 'vhosts', 'Creating vhost '.$vhost['hostname'].'.'.$vhost['domain'].'');
216 216
     $result = db_query("INSERT INTO vhosts.vhost (user, hostname, domain, docroot, php, `ssl`, logtype, errorlog, options) VALUES ({$_SESSION['userinfo']['uid']}, {$hostname}, {$domain}, {$docroot}, {$php}, {$ssl}, {$logtype}, {$errorlog}, '{$options}')");
217 217
     $id = mysql_insert_id();
218 218
   }
... ...
@@ -259,7 +259,7 @@ function delete_alias($id)
259 259
   $id = (int) $id;
260 260
   $alias = get_alias_details($id);
261 261
 
262
-  logger('modules/vhosts/include/vhosts.php', 'aliases', 'Removing alias #'.$id.' ('.$alias['hostname'].'.'.$alias['domain'].')');
262
+  logger('modules/vhosts/include/vhosts', 'aliases', 'Removing alias #'.$id.' ('.$alias['hostname'].'.'.$alias['domain'].')');
263 263
   db_query("DELETE FROM vhosts.alias WHERE id={$id}");
264 264
 }
265 265
 
... ...
@@ -277,11 +277,11 @@ function save_alias($alias)
277 277
   $vhost = get_vhost_details( (int) $alias['vhost']);
278 278
   $options = mysql_real_escape_string( $alias['options'] );
279 279
   if ($id == 0) {
280
-    logger('modules/vhosts/include/vhosts.php', 'aliases', 'Creating alias '.$alias['hostname'].'.'.$alias['domain'].' for VHost '.$vhost['id']);
280
+    logger('modules/vhosts/include/vhosts', 'aliases', 'Creating alias '.$alias['hostname'].'.'.$alias['domain'].' for VHost '.$vhost['id']);
281 281
     db_query("INSERT INTO vhosts.alias (hostname, domain, vhost, options) VALUES ({$hostname}, {$domain}, {$vhost['id']}, '{$options}')");
282 282
   }
283 283
   else {
284
-    logger('modules/vhosts/include/vhosts.php', 'aliases', 'Updating alias #'.$id.' ('.$alias['hostname'].'.'.$alias['domain'].')');
284
+    logger('modules/vhosts/include/vhosts', 'aliases', 'Updating alias #'.$id.' ('.$alias['hostname'].'.'.$alias['domain'].')');
285 285
     db_query("UPDATE vhosts.alias SET hostname={$hostname}, domain={$domain}, options='{$options}' WHERE id={$id} LIMIT 1");
286 286
   }
287 287
 }
... ...
@@ -4,7 +4,7 @@ $role = $_SESSION['role'];
4 4
 
5 5
 if ($role & ROLE_SYSTEMUSER)
6 6
 {
7
-    $menu["vhosts_vhosts"] = array("label" => "Webserver", "file" => "vhosts.php", "weight" => 1);
7
+    $menu["vhosts_vhosts"] = array("label" => "Webserver", "file" => "vhosts", "weight" => 1);
8 8
 }
9 9
 
10 10
 ?>
... ...
@@ -147,7 +147,7 @@ if ($_GET['action'] == 'edit')
147 147
   save_vhost($vhost);
148 148
 
149 149
   if (! $debugmode)
150
-    header('Location: vhosts.php');
150
+    header('Location: vhosts');
151 151
 
152 152
 }
153 153
 elseif ($_GET['action'] == 'addalias')
... ...
@@ -192,7 +192,7 @@ elseif ($_GET['action'] == 'addalias')
192 192
   save_alias($alias);
193 193
 
194 194
   if (! $debugmode)
195
-    header('Location: aliases.php?vhost='.$vhost['id']);
195
+    header('Location: aliases?vhost='.$vhost['id']);
196 196
 
197 197
 }
198 198
 elseif ($_GET['action'] == 'deletealias')
... ...
@@ -217,12 +217,12 @@ elseif ($_GET['action'] == 'deletealias')
217 217
   {
218 218
     delete_alias($alias['id']);
219 219
     if (! $debugmode)
220
-      header('Location: aliases.php?vhost='.$vhost['id']);
220
+      header('Location: aliases?vhost='.$vhost['id']);
221 221
   }
222 222
   elseif ($sure === false)
223 223
   {
224 224
     if (! $debugmode)
225
-      header('Location: aliases.php?vhost='.$vhost['id']);
225
+      header('Location: aliases?vhost='.$vhost['id']);
226 226
   }
227 227
 }
228 228
 elseif ($_GET['action'] == 'delete')
... ...
@@ -242,12 +242,12 @@ elseif ($_GET['action'] == 'delete')
242 242
   {
243 243
     delete_vhost($vhost['id']);
244 244
     if (! $debugmode)
245
-      header("Location: vhosts.php");
245
+      header("Location: vhosts");
246 246
   }
247 247
   elseif ($sure === false)
248 248
   {
249 249
     if (! $debugmode)
250
-      header("Location: vhosts.php");
250
+      header("Location: vhosts");
251 251
   }
252 252
 }
253 253
 else
... ...
@@ -26,13 +26,13 @@ if (count($vhosts) > 0)
26 26
   foreach ($vhosts as $vhost)
27 27
   {
28 28
     $fqdn = $vhost['fqdn'];
29
-    output("<tr><td>".internal_link('edit.php', $fqdn, "vhost={$vhost['id']}")."</td><td>".internal_link('save.php', "<img src=\"{$prefix}images/delete.png\" title=\"»{$vhost['fqdn']}« löschen\" alt=\"löschen\" />", 'action=delete&vhost='.$vhost['id'] )."</td><td>");
29
+    output("<tr><td>".internal_link('edit', $fqdn, "vhost={$vhost['id']}")."</td><td>".internal_link('save', "<img src=\"{$prefix}images/delete.png\" title=\"»{$vhost['fqdn']}« löschen\" alt=\"löschen\" />", 'action=delete&vhost='.$vhost['id'] )."</td><td>");
30 30
     $aliases = get_all_aliases($vhost['id']);
31 31
     foreach ($aliases as $alias)
32 32
     {
33 33
       output($alias['fqdn'].'<br />');
34 34
     }
35
-    output(internal_link('aliases.php', 'Aliase verwalten', 'vhost='.$vhost['id']));
35
+    output(internal_link('aliases', 'Aliase verwalten', 'vhost='.$vhost['id']));
36 36
     output('</td>');
37 37
     $logfiles = 'keine';
38 38
     if ($vhost['logtype'] == 'default')
... ...
@@ -82,7 +82,7 @@ if (count($vhosts) > 0)
82 82
   output('<p><sup>*</sup>)&#160;schwach geschriebene Pfadangaben bezeichnen die Standardeinstellung. Ist ein Pfad fett dargestellt, so haben Sie einen davon abweichenden Wert eingegeben.</p>');
83 83
   output('  <br />');
84 84
 }
85
-output('<p><a href="edit.php">Neue Domain bzw. Subdomain einrichten</a></p>');
85
+output('<p>'.internal_link('edit', 'Neue Domain bzw. Subdomain einrichten').'</p>');
86 86
 output('  <br />');
87 87
 
88 88