From 5d3dfb2a115f0009f9a376256174a3a5700efc22 Mon Sep 17 00:00:00 2001 From: Remi Date: Wed, 6 Jul 2016 22:21:34 +0200 Subject: [PATCH 1/3] Bug fix: Error in function get_variable_from_db --- src/functions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/functions.sh b/src/functions.sh index 5f005c52..b6cd5fee 100755 --- a/src/functions.sh +++ b/src/functions.sh @@ -104,7 +104,7 @@ get_name_by_uid() { } get_variable_from_db() { - mysql_query 'SELECT value FROM membres WHERE name="'"$1"'" LIMIT 1;' + mysql_query 'SELECT value FROM variable WHERE name="'"$1"'" LIMIT 1;' } From 1b73dff3a5d72361e4f56476c98af19dc3f4fe84 Mon Sep 17 00:00:00 2001 From: Remi Date: Thu, 7 Jul 2016 12:59:56 +0200 Subject: [PATCH 2/3] bug fix: sub admin were proposed to install hosting_tld for new user, but the domain creation silently failed --- bureau/class/m_admin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bureau/class/m_admin.php b/bureau/class/m_admin.php index 1e817c72..e3c2f0e4 100644 --- a/bureau/class/m_admin.php +++ b/bureau/class/m_admin.php @@ -522,7 +522,7 @@ class m_admin { } // Check if this domain exist on this admin account - if (!in_array($domain_name, $dom->enum_domains())) { + if ((!in_array($domain_name, $dom->enum_domains()))&&($domaine_name!=variable_get("hosting_tld"))) { $err->raise("admin", _("You don't seem to be allowed to delegate this domain")); $err->log("admin", "add_shared_domain", "domain not allowed"); return false; From d0a9f6ceac05d6cd0df71b66d23af7e9320ebcef Mon Sep 17 00:00:00 2001 From: Remi Date: Sat, 9 Jul 2016 20:51:06 +0200 Subject: [PATCH 3/3] every 20 minutes is */20 not 00,20 --- debian/alternc.cron.d | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/alternc.cron.d b/debian/alternc.cron.d index 9b2d82bb..c67056f5 100644 --- a/debian/alternc.cron.d +++ b/debian/alternc.cron.d @@ -32,5 +32,5 @@ 00,30 * * * * alterncpanel /usr/lib/alternc/cron_users.sh # Every 20 minutes, do actions -00,20 * * * * root /usr/lib/alternc/do_actions.php +*/20 * * * * root /usr/lib/alternc/do_actions.php