@@ -2,14 +2,11 @@

 /*

 This file belongs to the Webinterface of schokokeks.org Hosting

-Written 2008-2018 by schokokeks.org Hosting, namely

+Written by schokokeks.org Hosting, namely

   Bernd Wurst <bernd@schokokeks.org>

   Hanno Böck <hanno@schokokeks.org>

-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.

-

-You should have received a copy of the CC0 Public Domain Dedication along with this software. If not, see

-http://creativecommons.org/publicdomain/zero/1.0/

+This code is published under a 0BSD license.

 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.

 */

@@ -30,7 +30,7 @@ output("<p>Daten zu Ihrem Benutzeraccount:</p>");

 $acc = get_account_details($_SESSION['userinfo']['uid'], $_SESSION['userinfo']['customerno']);

 $shell = $shells[$acc['shell']];

 $usedquota = get_used_quota($acc['uid']);

-$quota = array();

+$quota = [];

 foreach ($usedquota as $q) {

     $mailbar = '';

     $mailstring = '';

@@ -53,7 +53,7 @@ foreach ($usedquota as $q) {

 $customer = get_customer_info($_SESSION['userinfo']['customerno']);

 $realname = $acc['name'] ? $acc['name'] : $customer['name'];

 $quotastring = implode('', $quota);

-output("<h5>Stammdaten</h5><div style=\"margin-left: 2em;\"><p>Benutzername: <strong>{$acc['username']}</strong></p><p>Name: {$realname}</p><p>Existiert seit {$acc['erstellungsdatum']}</p><p>Verwendete Shell: {$shell}</p>");

+output("<h5>Stammdaten</h5><div style=\"margin-left: 2em;\"><p>Benutzername: <strong>{$acc['username']}</strong></p><p>Name: ".filter_output_html($realname)."</p><p>Existiert seit {$acc['erstellungsdatum']}</p><p>Verwendete Shell: {$shell}</p>");

 output("<p>".internal_link('edit', other_icon('user_edit.png', 'Bearbeiten').' Daten bearbeiten').'</p>');

 output("</div>\n");

 output("<h5>Speicherplatz</h5><div style=\"margin-left: 2em;\">{$quotastring}</div>");

@@ -45,7 +45,7 @@ foreach ($usedquota as $q) {

     $percent = round((($q["systemquota_used"]+$q["mailquota"]) / $q["systemquota"]) * 100);

     $color = ($percent > 99 ? 'red' : ($percent > 80 ? "yellow" : "green"));

     $width = 2 * min($percent, 100) - $mailwidth;

-     

+

     $used_space = $q['systemquota_used'] + $q['mailquota'];

     $quota[] = "<p>Server <strong>{$q['server']}</strong><br />{$percent}%: {$used_space} MB von {$q['systemquota']} MB belegt{$mailstring}.</p> 

         <div style=\"margin: 0; padding: 0; width: 200px; border: 1px solid black;\">{$mailbar}<div style=\"font-size: 1px; background-color: {$color}; height: 10px; width: {$width}px; margin: 0; margin-left: {$mailwidth}px; padding: 0;\">&#160;</div></div>";

@@ -57,5 +57,5 @@ output("<h5>Stammdaten</h5><div style=\"margin-left: 2em;\"><p>Benutzername: <st

 output("<p>".internal_link('edit', other_icon('user_edit.png', 'Bearbeiten').' Daten bearbeiten').'</p>');

 output("</div>\n");

 output("<h5>Speicherplatz</h5><div style=\"margin-left: 2em;\">{$quotastring}</div>");

-    

+

 output("<p><sup>*</sup>) Die Werte für den verbrauchten Speicherplatz werden periodisch eingelesen und hier erst verspätet angezeigt!</p>");

@@ -8,7 +8,7 @@ Written 2008-2018 by schokokeks.org Hosting, namely

 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.

-You should have received a copy of the CC0 Public Domain Dedication along with this software. If not, see 

+You should have received a copy of the CC0 Public Domain Dedication along with this software. If not, see

 http://creativecommons.org/publicdomain/zero/1.0/

 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.

@@ -31,26 +31,24 @@ $acc = get_account_details($_SESSION['userinfo']['uid'], $_SESSION['userinfo']['

 $shell = $shells[$acc['shell']];

 $usedquota = get_used_quota($acc['uid']);

 $quota = array();

-foreach ($usedquota as $q)

-{

-      $mailbar = '';

-      $mailstring = '';

-      $mailpercent = round(( $q['mailquota'] / $q["systemquota"]) * 100);

-      $mailwidth = 2 * min($mailpercent, 100);

-

-      if ($q["mailquota"] > 0) {

-	$mailstring = "<br />(davon {$q["mailquota"]} MB für Postfächer reserviert)";

+foreach ($usedquota as $q) {

+    $mailbar = '';

+    $mailstring = '';

+    $mailpercent = round(($q['mailquota'] / $q["systemquota"]) * 100);

+    $mailwidth = 2 * min($mailpercent, 100);

+

+    if ($q["mailquota"] > 0) {

+        $mailstring = "<br />(davon {$q["mailquota"]} MB für Postfächer reserviert)";

         $mailbar = "<div style=\"font-size: 1px; background-color: blue; height: 10px; width: {$mailwidth}px; margin: 0; padding: 0; float: left;\">&#160;</div>";

-      }  

+    }

-      $percent = round(( ($q["systemquota_used"]+$q["mailquota"]) / $q["systemquota"] ) * 100 );

-      $color = ( $percent > 99 ? 'red' : ($percent > 80 ? "yellow" : "green" ));

-      $width = 2 * min($percent, 100) - $mailwidth;

+    $percent = round((($q["systemquota_used"]+$q["mailquota"]) / $q["systemquota"]) * 100);

+    $color = ($percent > 99 ? 'red' : ($percent > 80 ? "yellow" : "green"));

+    $width = 2 * min($percent, 100) - $mailwidth;

-      $used_space = $q['systemquota_used'] + $q['mailquota'];

-      $quota[] = "<p>Server <strong>{$q['server']}</strong><br />{$percent}%: {$used_space} MB von {$q['systemquota']} MB belegt{$mailstring}.</p> 

+    $used_space = $q['systemquota_used'] + $q['mailquota'];

+    $quota[] = "<p>Server <strong>{$q['server']}</strong><br />{$percent}%: {$used_space} MB von {$q['systemquota']} MB belegt{$mailstring}.</p> 

         <div style=\"margin: 0; padding: 0; width: 200px; border: 1px solid black;\">{$mailbar}<div style=\"font-size: 1px; background-color: {$color}; height: 10px; width: {$width}px; margin: 0; margin-left: {$mailwidth}px; padding: 0;\">&#160;</div></div>";

-

 }

 $customer = get_customer_info($_SESSION['userinfo']['customerno']);

 $realname = $acc['name'] ? $acc['name'] : $customer['name'];

@@ -61,6 +59,3 @@ output("</div>\n");

 output("<h5>Speicherplatz</h5><div style=\"margin-left: 2em;\">{$quotastring}</div>");

 output("<p><sup>*</sup>) Die Werte für den verbrauchten Speicherplatz werden periodisch eingelesen und hier erst verspätet angezeigt!</p>");

-

-

-?>

@@ -2,7 +2,7 @@

 /*

 This file belongs to the Webinterface of schokokeks.org Hosting

-Written 2008-2014 by schokokeks.org Hosting, namely

+Written 2008-2018 by schokokeks.org Hosting, namely

   Bernd Wurst <bernd@schokokeks.org>

   Hanno Böck <hanno@schokokeks.org>

@@ -2,7 +2,7 @@

 /*

 This file belongs to the Webinterface of schokokeks.org Hosting

-Written 2008-2013 by schokokeks.org Hosting, namely

+Written 2008-2014 by schokokeks.org Hosting, namely

   Bernd Wurst <bernd@schokokeks.org>

   Hanno Böck <hanno@schokokeks.org>

@@ -2,7 +2,7 @@

 /*

 This file belongs to the Webinterface of schokokeks.org Hosting

-Written 2008-2012 by schokokeks.org Hosting, namely

+Written 2008-2013 by schokokeks.org Hosting, namely

   Bernd Wurst <bernd@schokokeks.org>

   Hanno Böck <hanno@schokokeks.org>

@@ -1,4 +1,19 @@

 <?php

+/*

+This file belongs to the Webinterface of schokokeks.org Hosting

+

+Written 2008-2012 by schokokeks.org Hosting, namely

+  Bernd Wurst <bernd@schokokeks.org>

+  Hanno Böck <hanno@schokokeks.org>

+

+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.

+

+You should have received a copy of the CC0 Public Domain Dedication along with this software. If not, see 

+http://creativecommons.org/publicdomain/zero/1.0/

+

+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.

+*/

+

 require_once('inc/base.php');

 require_once('inc/icons.php');

@@ -18,11 +18,24 @@ $usedquota = get_used_quota($acc['uid']);

 $quota = array();

 foreach ($usedquota as $q)

 {

-  $percent = round(( $q["used"] / $q["quota"] ) * 100 );

-  $color = ( $percent > 99 ? 'red' : ($percent > 80 ? "yellow" : "green" ));

-  $width = 2 * min($percent, 100);

-  $quota[] = "<p>Server <strong>{$q['server']}</strong><br />{$percent}%: {$q['used']} MB von {$q['quota']} MB belegt.</p> 

-  <div style=\"margin: 0; padding: 0; width: 200px; border: 1px solid black;\"><div style=\"font-size: 1px; background-color: {$color}; height: 10px; width: {$width}px; margin: 0; padding: 0;\">&#160;</div></div>";

+      $mailbar = '';

+      $mailstring = '';

+      $mailpercent = round(( $q['mailquota'] / $q["systemquota"]) * 100);

+      $mailwidth = 2 * min($mailpercent, 100);

+

+      if ($q["mailquota"] > 0) {

+	$mailstring = "<br />(davon {$q["mailquota"]} MB für Postfächer reserviert)";

+        $mailbar = "<div style=\"font-size: 1px; background-color: blue; height: 10px; width: {$mailwidth}px; margin: 0; padding: 0; float: left;\">&#160;</div>";

+      }  

+

+      $percent = round(( ($q["systemquota_used"]+$q["mailquota"]) / $q["systemquota"] ) * 100 );

+      $color = ( $percent > 99 ? 'red' : ($percent > 80 ? "yellow" : "green" ));

+      $width = 2 * min($percent, 100) - $mailwidth;

+     

+      $used_space = $q['systemquota_used'] + $q['mailquota'];

+      $quota[] = "<p>Server <strong>{$q['server']}</strong><br />{$percent}%: {$used_space} MB von {$q['systemquota']} MB belegt{$mailstring}.</p> 

+        <div style=\"margin: 0; padding: 0; width: 200px; border: 1px solid black;\">{$mailbar}<div style=\"font-size: 1px; background-color: {$color}; height: 10px; width: {$width}px; margin: 0; margin-left: {$mailwidth}px; padding: 0;\">&#160;</div></div>";

+

 }

 $customer = get_customer_info($_SESSION['userinfo']['customerno']);

 $realname = $acc['name'] ? $acc['name'] : $customer['name'];

@@ -7,6 +7,7 @@ require_once('useraccounts.php');

 require_role(ROLE_SYSTEMUSER);

 title("Ihr Benutzeraccount");

+$section = "systemuser_account";

 $shells = available_shells();

@@ -6,11 +6,9 @@ require_once('useraccounts.php');

 require_role(ROLE_SYSTEMUSER);

-$title = "Benutzeraccount";

+title("Ihr Benutzeraccount");

-output("<h3>System-Benutzeraccount</h3>");

-

 $shells = available_shells();

 output("<p>Daten zu Ihrem Benutzeraccount:</p>");

 $acc = get_account_details($_SESSION['userinfo']['uid'], $_SESSION['userinfo']['customerno']);

@@ -25,7 +25,8 @@ foreach ($usedquota as $q)

   $quota[] = "<p>Server <strong>{$q['server']}</strong><br />{$percent}%: {$q['used']} MB von {$q['quota']} MB belegt.</p> 

   <div style=\"margin: 0; padding: 0; width: 200px; border: 1px solid black;\"><div style=\"font-size: 1px; background-color: {$color}; height: 10px; width: {$width}px; margin: 0; padding: 0;\">&#160;</div></div>";

 }

-$realname = $acc['name'] ? $acc['name'] : $_SESSION['customerinfo']['name'];

+$customer = get_customer_info($_SESSION['userinfo']['customerno']);

+$realname = $acc['name'] ? $acc['name'] : $customer['name'];

 $quotastring = implode('', $quota);

 output("<h5>Stammdaten</h5><div style=\"margin-left: 2em;\"><p>Benutzername: <strong>{$acc['username']}</strong></p><p>Name: {$realname}</p><p>Existiert seit {$acc['erstellungsdatum']}</p><p>Verwendete Shell: {$shell}</p>");

 output("<p>".internal_link('edit', other_icon('user_edit.png', 'Bearbeiten').' Daten bearbeiten').'</p>');

new file mode 100644

@@ -0,0 +1,38 @@

+<?php

+require_once('inc/base.php');

+require_once('inc/icons.php');

+

+require_once('useraccounts.php');

+

+require_role(ROLE_SYSTEMUSER);

+

+$title = "Benutzeraccount";

+

+

+output("<h3>System-Benutzeraccount</h3>");

+

+$shells = available_shells();

+output("<p>Daten zu Ihrem Benutzeraccount:</p>");

+$acc = get_account_details($_SESSION['userinfo']['uid'], $_SESSION['userinfo']['customerno']);

+$shell = $shells[$acc['shell']];

+$usedquota = get_used_quota($acc['uid']);

+$quota = array();

+foreach ($usedquota as $q)

+{

+  $percent = round(( $q["used"] / $q["quota"] ) * 100 );

+  $color = ( $percent > 99 ? 'red' : ($percent > 80 ? "yellow" : "green" ));

+  $width = 2 * min($percent, 100);

+  $quota[] = "<p>Server <strong>{$q['server']}</strong><br />{$percent}%: {$q['used']} MB von {$q['quota']} MB belegt.</p> 

+  <div style=\"margin: 0; padding: 0; width: 200px; border: 1px solid black;\"><div style=\"font-size: 1px; background-color: {$color}; height: 10px; width: {$width}px; margin: 0; padding: 0;\">&#160;</div></div>";

+}

+$realname = $acc['name'] ? $acc['name'] : $_SESSION['customerinfo']['name'];

+$quotastring = implode('', $quota);

+output("<h5>Stammdaten</h5><div style=\"margin-left: 2em;\"><p>Benutzername: <strong>{$acc['username']}</strong></p><p>Name: {$realname}</p><p>Existiert seit {$acc['erstellungsdatum']}</p><p>Verwendete Shell: {$shell}</p>");

+output("<p>".internal_link('edit', other_icon('user_edit.png', 'Bearbeiten').' Daten bearbeiten').'</p>');

+output("</div>\n");

+output("<h5>Speicherplatz</h5><div style=\"margin-left: 2em;\">{$quotastring}</div>");

+    

+output("<p><sup>*</sup>) Die Werte für den verbrauchten Speicherplatz werden periodisch eingelesen und hier erst verspätet angezeigt!</p>");

+

+

+?>