GitList
Browse code

Fix coding style with php-cs-checker, see https://cs.sensiolabs.org/

Hanno authored on26/06/2018 13:58:19
Showing1 changed files
modules/email/menu.php
History View file @2626dd4
... ... 
@@ -8,7 +8,7 @@ Written 2008-2018 by schokokeks.org Hosting, namely
8 8
9 9 
 To the extent possible under law, the author(s) have dedicated all copyright and related and neighboring rights to this software to the public domain worldwide. This software is distributed without any warranty.
10 10
11 
-You should have received a copy of the CC0 Public Domain Dedication along with this software. If not, see
11 
+You should have received a copy of the CC0 Public Domain Dedication along with this software. If not, see
12 12 
 http://creativecommons.org/publicdomain/zero/1.0/
13 13
14 14 
 Nevertheless, in case you use a significant part of this code, we ask (but not require, see the license) that you keep the authors' names in place and return your changes to the public. We would be especially happy if you tell us what you're going to do with this code.
... ... 
@@ -20,23 +20,17 @@ require_once('include/hasdomain.php');
20 20 
 require_once('include/hasaccount.php');
21 21
22 22 
 if ($role & ROLE_SYSTEMUSER) {
23 
-  $menu["email_vmail"] = array("label" => "E-Mail", "file" => "vmail", "weight" => 3);
23 
+    $menu["email_vmail"] = array("label" => "E-Mail", "file" => "vmail", "weight" => 3);
24 24 
 }
25 
-if ($role & ROLE_VMAIL_ACCOUNT)
26 
-{
27 
-  $menu['email_edit'] = array("label" => "Einstellungen", "file" => "edit", "weight" => 10);
25 
+if ($role & ROLE_VMAIL_ACCOUNT) {
26 
+    $menu['email_edit'] = array("label" => "Einstellungen", "file" => "edit", "weight" => 10);
28 27 
 }
29 
-if ($role & (ROLE_VMAIL_ACCOUNT | ROLE_MAILACCOUNT))
30 
-{
31 
-  $menu['email_chpass'] = array("label" => "Passwort ändern", "file" => "chpass", "weight" => 15);
28 
+if ($role & (ROLE_VMAIL_ACCOUNT | ROLE_MAILACCOUNT)) {
29 
+    $menu['email_chpass'] = array("label" => "Passwort ändern", "file" => "chpass", "weight" => 15);
32 30 
 }
33 31 
 if ($role & ROLE_SYSTEMUSER) {
34 
-  $menu["email_domains"] = array("label" => "Mail-Verwaltung", "file" => "domains", "weight" => 1, "submenu" => "domains_domains");
32 
+    $menu["email_domains"] = array("label" => "Mail-Verwaltung", "file" => "domains", "weight" => 1, "submenu" => "domains_domains");
35 33 
 }
36 
-if ($role & ROLE_SYSTEMUSER && (user_has_accounts() || ! user_has_vmail_domain() || user_has_dotcourier_domain() ) )
37 
-{
38 
-  $menu["email_imap"] = array("label" => "IMAP/POP3", "file" => "imap", "weight" => 20, 'submenu' => "email_vmail");
34 
+if ($role & ROLE_SYSTEMUSER && (user_has_accounts() || ! user_has_vmail_domain() || user_has_dotcourier_domain())) {
35 
+    $menu["email_imap"] = array("label" => "IMAP/POP3", "file" => "imap", "weight" => 20, 'submenu' => "email_vmail");
39 36 
 }
40 
-
41 
-
42 
-?>
Browse code

Copyright year update

Bernd Wurst authored on13/01/2018 06:07:05
Showing1 changed files
modules/email/menu.php
History View file @cf54502
... ... 
@@ -2,7 +2,7 @@
2 2 
 /*
3 3 
 This file belongs to the Webinterface of schokokeks.org Hosting
4 4
5 
-Written 2008-2014 by schokokeks.org Hosting, namely
5 
+Written 2008-2018 by schokokeks.org Hosting, namely
6 6 
   Bernd Wurst <bernd@schokokeks.org>
7 7 
   Hanno Böck <hanno@schokokeks.org>
8 8
Browse code

Lizenzinfos in eigenes Modul ausgelagert und Copyright auf 2014 angepasst

Bernd Wurst authored on08/02/2014 05:45:07
Showing1 changed files
modules/email/menu.php
History View file @5effc2b
... ... 
@@ -2,7 +2,7 @@
2 2 
 /*
3 3 
 This file belongs to the Webinterface of schokokeks.org Hosting
4 4
5 
-Written 2008-2013 by schokokeks.org Hosting, namely
5 
+Written 2008-2014 by schokokeks.org Hosting, namely
6 6 
   Bernd Wurst <bernd@schokokeks.org>
7 7 
   Hanno Böck <hanno@schokokeks.org>
8 8
Browse code

Updated copyright notice (2012 => 2013)

Bernd Wurst authored on19/01/2013 10:49:50
Showing1 changed files
modules/email/menu.php
History View file @f12aba6
... ... 
@@ -2,7 +2,7 @@
2 2 
 /*
3 3 
 This file belongs to the Webinterface of schokokeks.org Hosting
4 4
5 
-Written 2008-2012 by schokokeks.org Hosting, namely
5 
+Written 2008-2013 by schokokeks.org Hosting, namely
6 6 
   Bernd Wurst <bernd@schokokeks.org>
7 7 
   Hanno Böck <hanno@schokokeks.org>
8 8
Browse code

Added license tags for CC0, README and COPYING

Bernd Wurst authored on11/03/2012 15:40:04
Showing1 changed files
modules/email/menu.php
History View file @c208bd9
... ... 
@@ -1,4 +1,18 @@
1 1 
 <?php
2 
+/*
3 
+This file belongs to the Webinterface of schokokeks.org Hosting
4 
+
5 
+Written 2008-2012 by schokokeks.org Hosting, namely
6 
+  Bernd Wurst <bernd@schokokeks.org>
7 
+  Hanno Böck <hanno@schokokeks.org>
8 
+
9 
+To the extent possible under law, the author(s) have dedicated all copyright and related and neighboring rights to this software to the public domain worldwide. This software is distributed without any warranty.
10 
+
11 
+You should have received a copy of the CC0 Public Domain Dedication along with this software. If not, see
12 
+http://creativecommons.org/publicdomain/zero/1.0/
13 
+
14 
+Nevertheless, in case you use a significant part of this code, we ask (but not require, see the license) that you keep the authors' names in place and return your changes to the public. We would be especially happy if you tell us what you're going to do with this code.
15 
+*/
2 16
3 17 
 $role = $_SESSION['role'];
4 18
Browse code

VMail-User können ihre Einstellungen selbst vornehmen und bekommen eine individuelle Startseite mit den Einstellungen.

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

bernd authored on29/02/2012 13:26:13
Showing1 changed files
modules/email/menu.php
History View file @aa811d3
... ... 
@@ -8,6 +8,10 @@ require_once('include/hasaccount.php');
8 8 
 if ($role & ROLE_SYSTEMUSER) {
9 9 
   $menu["email_vmail"] = array("label" => "E-Mail", "file" => "vmail", "weight" => 3);
10 10 
 }
11 
+if ($role & ROLE_VMAIL_ACCOUNT)
12 
+{
13 
+  $menu['email_edit'] = array("label" => "Einstellungen", "file" => "edit", "weight" => 10);
14 
+}
11 15 
 if ($role & (ROLE_VMAIL_ACCOUNT | ROLE_MAILACCOUNT))
12 16 
 {
13 17 
   $menu['email_chpass'] = array("label" => "Passwort ändern", "file" => "chpass", "weight" => 15);
Browse code

IMAP/POP3 nur anzeigen wenn es benötigt wird

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

bernd authored on11/03/2010 10:37:59
Showing1 changed files
modules/email/menu.php
History View file @ce89952
... ... 
@@ -15,7 +15,7 @@ if ($role & (ROLE_VMAIL_ACCOUNT | ROLE_MAILACCOUNT))
15 15 
 if ($role & ROLE_SYSTEMUSER) {
16 16 
   $menu["email_domains"] = array("label" => "Mail-Verwaltung", "file" => "domains", "weight" => 1, "submenu" => "domains_domains");
17 17 
 }
18 
-if ($role & ROLE_SYSTEMUSER && (user_has_accounts() || ! user_has_vmail_domain() || user_has_regular_domain() ) )
18 
+if ($role & ROLE_SYSTEMUSER && (user_has_accounts() || ! user_has_vmail_domain() || user_has_dotcourier_domain() ) )
19 19 
 {
20 20 
   $menu["email_imap"] = array("label" => "IMAP/POP3", "file" => "imap", "weight" => 20, 'submenu' => "email_vmail");
21 21 
 }
Browse code

Menü-Reihenfolge sinnvoller

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

bernd authored on19/06/2009 10:14:34
Showing1 changed files
modules/email/menu.php
History View file @ce7a494
... ... 
@@ -13,7 +13,7 @@ if ($role & (ROLE_VMAIL_ACCOUNT | ROLE_MAILACCOUNT))
13 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", "weight" => 2, "submenu" => "domains_domains");
16 
+  $menu["email_domains"] = array("label" => "Mail-Verwaltung", "file" => "domains", "weight" => 1, "submenu" => "domains_domains");
17 17 
 }
18 18 
 if ($role & ROLE_SYSTEMUSER && (user_has_accounts() || ! user_has_vmail_domain() || user_has_regular_domain() ) )
19 19 
 {
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
Showing1 changed files
modules/email/menu.php
History View file @63a0529
... ... 
@@ -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
Browse code

IMAP ganz nach unten

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

bernd authored on03/04/2008 10:42:17
Showing1 changed files
modules/email/menu.php
History View file @83f1505
... ... 
@@ -17,7 +17,7 @@ if ($role & ROLE_SYSTEMUSER) {
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" => 10, 'submenu' => "email_vmail");
20 
+  $menu["email_imap"] = array("label" => "IMAP/POP3", "file" => "imap.php", "weight" => 20, 'submenu' => "email_vmail");
21 21 
 }
22 22
23 23
Browse code

Großer VMail-move

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

bernd authored on03/04/2008 10:38:22
Showing1 changed files
modules/email/menu.php
History View file @8d3da69
1 1 
new file mode 100644
... ... 
@@ -0,0 +1,24 @@
1 
+<?php
2 
+
3 
+$role = $_SESSION['role'];
4 
+
5 
+require_once('include/hasdomain.php');
6 
+require_once('include/hasaccount.php');
7 
+
8 
+if ($role & ROLE_SYSTEMUSER) {
9 
+  $menu["email_vmail"] = array("label" => "E-Mail", "file" => "vmail.php", "weight" => 3);
10 
+}
11 
+if ($role & (ROLE_VMAIL_ACCOUNT | ROLE_MAILACCOUNT))
12 
+{
13 
+  $menu['email_chpass'] = array("label" => "Passwort ändern", "file" => "chpass.php", "weight" => 15);
14 
+}
15 
+if ($role & ROLE_SYSTEMUSER) {
16 
+  $menu["email_domains"] = array("label" => "Mail-Verwaltung", "file" => "domains.php", "weight" => 2, "submenu" => "domains_domains");
17 
+}
18 
+if ($role & ROLE_SYSTEMUSER && (user_has_accounts() || ! user_has_vmail_domain() || user_has_regular_domain() ) )
19 
+{
20 
+  $menu["email_imap"] = array("label" => "IMAP/POP3", "file" => "imap.php", "weight" => 10, 'submenu' => "email_vmail");
21 
+}
22 
+
23 
+
24 
+?>