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

 */

@@ -19,7 +19,7 @@ require_once('inc/base.php');

 function user_has_accounts()

 {

     $uid = (int) $_SESSION['userinfo']['uid'];

-    $result = db_query("SELECT id from `mail`.`mailaccounts` WHERE uid=?", array($uid));

+    $result = db_query("SELECT id from `mail`.`mailaccounts` WHERE uid=?", [$uid]);

     DEBUG($result->rowCount()." accounts");

     return ($result->rowCount() > 0);

 }

@@ -32,7 +32,7 @@ if (! function_exists("user_has_vmail_domain")) {

             return false;

         }

         $uid = (int) $_SESSION['userinfo']['uid'];

-        $result = db_query("SELECT COUNT(*) FROM mail.v_vmail_domains WHERE useraccount=?", array($uid));

+        $result = db_query("SELECT COUNT(*) FROM mail.v_vmail_domains WHERE useraccount=?", [$uid]);

         $row = $result->fetch();

         $count = $row[0];

         DEBUG("User has {$count} vmail-domains");

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

@@ -18,26 +18,24 @@ require_once('inc/base.php');

 function user_has_accounts()

 {

-  $uid = (int) $_SESSION['userinfo']['uid'];

-  $result = db_query("SELECT id from `mail`.`mailaccounts` WHERE uid=?", array($uid));

-  DEBUG($result->rowCount()." accounts");

-  return ($result->rowCount() > 0);

+    $uid = (int) $_SESSION['userinfo']['uid'];

+    $result = db_query("SELECT id from `mail`.`mailaccounts` WHERE uid=?", array($uid));

+    DEBUG($result->rowCount()." accounts");

+    return ($result->rowCount() > 0);

 }

-if (! function_exists("user_has_vmail_domain"))

-{

-  function user_has_vmail_domain()

-  {

+if (! function_exists("user_has_vmail_domain")) {

+    function user_has_vmail_domain()

+    {

         $role = $_SESSION['role'];

         if (! ($role & ROLE_SYSTEMUSER)) {

-                return false;

+            return false;

         }

         $uid = (int) $_SESSION['userinfo']['uid'];

         $result = db_query("SELECT COUNT(*) FROM mail.v_vmail_domains WHERE useraccount=?", array($uid));

         $row = $result->fetch();

         $count = $row[0];

         DEBUG("User has {$count} vmail-domains");

-        return ( (int) $count > 0 );

-  }

+        return ((int) $count > 0);

+    }

 }

-

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

@@ -19,7 +19,7 @@ require_once('inc/base.php');

 function user_has_accounts()

 {

   $uid = (int) $_SESSION['userinfo']['uid'];

-  $result = db_query("SELECT id from `mail`.`mailaccounts` WHERE uid=$uid");

+  $result = db_query("SELECT id from `mail`.`mailaccounts` WHERE uid=?", array($uid));

   DEBUG($result->rowCount()." accounts");

   return ($result->rowCount() > 0);

 }

@@ -33,7 +33,7 @@ if (! function_exists("user_has_vmail_domain"))

                 return false;

         }

         $uid = (int) $_SESSION['userinfo']['uid'];

-        $result = db_query("SELECT COUNT(*) FROM mail.v_vmail_domains WHERE useraccount='{$uid}'");

+        $result = db_query("SELECT COUNT(*) FROM mail.v_vmail_domains WHERE useraccount=?", array($uid));

         $row = $result->fetch();

         $count = $row[0];

         DEBUG("User has {$count} vmail-domains");

@@ -20,8 +20,8 @@ function user_has_accounts()

 {

   $uid = (int) $_SESSION['userinfo']['uid'];

   $result = db_query("SELECT id from `mail`.`mailaccounts` WHERE uid=$uid");

-  DEBUG(mysql_num_rows($result)." accounts");

-  return (mysql_num_rows($result) > 0);

+  DEBUG($result->rowCount()." accounts");

+  return ($result->rowCount() > 0);

 }

 if (! function_exists("user_has_vmail_domain"))

@@ -34,7 +34,7 @@ if (! function_exists("user_has_vmail_domain"))

         }

         $uid = (int) $_SESSION['userinfo']['uid'];

         $result = db_query("SELECT COUNT(*) FROM mail.v_vmail_domains WHERE useraccount='{$uid}'");

-        $row = mysql_fetch_array($result);

+        $row = $result->fetch();

         $count = $row[0];

         DEBUG("User has {$count} vmail-domains");

         return ( (int) $count > 0 );

@@ -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,18 @@

 <?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');

@@ -27,11 +27,3 @@ if (! function_exists("user_has_vmail_domain"))

   }

 }

-function user_has_regular_domain()

-{

-  $result = db_query("SELECT id FROM kundendaten.domains AS dom WHERE id NOT IN (SELECT domain FROM mail.virtual_mail_domains WHERE hostname IS NULL)");

-  return (mysql_num_rows($result) > 0);

-}

-

-

-?>

@@ -30,7 +30,7 @@ if (! function_exists("user_has_vmail_domain"))

 function user_has_regular_domain()

 {

   $result = db_query("SELECT id FROM kundendaten.domains AS dom WHERE id NOT IN (SELECT domain FROM mail.virtual_mail_domains WHERE hostname IS NULL)");

-  return (mysql_num_rows() > 0);

+  return (mysql_num_rows($result) > 0);

 }

new file mode 100644

@@ -0,0 +1,37 @@

+<?php

+

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

+

+function user_has_accounts()

+{

+  $uid = (int) $_SESSION['userinfo']['uid'];

+  $result = db_query("SELECT id from `mail`.`mailaccounts` WHERE uid=$uid");

+  DEBUG(mysql_num_rows($result)." accounts");

+  return (mysql_num_rows($result) > 0);

+}

+

+if (! function_exists("user_has_vmail_domain"))

+{

+  function user_has_vmail_domain()

+  {

+        $role = $_SESSION['role'];

+        if (! ($role & ROLE_SYSTEMUSER)) {

+                return false;

+        }

+        $uid = (int) $_SESSION['userinfo']['uid'];

+        $result = db_query("SELECT COUNT(*) FROM mail.v_vmail_domains WHERE useraccount='{$uid}'");

+        $row = mysql_fetch_array($result);

+        $count = $row[0];

+        DEBUG("User has {$count} vmail-domains");

+        return ( (int) $count > 0 );

+  }

+}

+

+function user_has_regular_domain()

+{

+  $result = db_query("SELECT id FROM kundendaten.domains AS dom WHERE id NOT IN (SELECT domain FROM mail.virtual_mail_domains WHERE hostname IS NULL)");

+  return (mysql_num_rows() > 0);

+}

+

+

+?>