kienan
/
AlternC
mirror of https://github.com/kienanstewart/AlternC.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'stable-3.1' of github.com:AlternC/AlternC into stable-3.1

This commit is contained in:
Benjamin Sonntag 2016-07-12 15:54:30 +02:00
parent 3ffa78aa5f d0a9f6ceac
commit ade5c51f0f
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bureau/class/m_admin.php
View File

@ -522,7 +522,7 @@ class m_admin {
} }
// Check if this domain exist on this admin account // 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->raise("admin", _("You don't seem to be allowed to delegate this domain"));
$err->log("admin", "add_shared_domain", "domain not allowed"); $err->log("admin", "add_shared_domain", "domain not allowed");
return false; return false;

2
debian/alternc.cron.d vendored
View File

@ -32,5 +32,5 @@
00,30 * * * * alterncpanel /usr/lib/alternc/cron_users.sh 00,30 * * * * alterncpanel /usr/lib/alternc/cron_users.sh
# Every 20 minutes, do actions # Every 20 minutes, do actions
00,20 * * * * root /usr/lib/alternc/do_actions.php */20 * * * * root /usr/lib/alternc/do_actions.php

2
src/functions.sh
View File

@ -104,7 +104,7 @@ get_name_by_uid() {
} }
get_variable_from_db() { 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;'
} }