From 3d1eadccf4964cf7c57272b4e55e918aa79e49dd Mon Sep 17 00:00:00 2001
From: mcramer <m.cramer@pixcept.de>
Date: Thu, 11 Jul 2013 08:29:33 -0400
Subject: [PATCH] - Fixed: distribution recognition of debian wheezy
---
interface/web/sites/cron_edit.php | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/interface/web/sites/cron_edit.php b/interface/web/sites/cron_edit.php
index 8ccf340..4c584d1 100644
--- a/interface/web/sites/cron_edit.php
+++ b/interface/web/sites/cron_edit.php
@@ -104,7 +104,7 @@
}
// Get the record of the parent domain
- $parent_domain = $app->db->queryOneRecord("select * FROM web_domain WHERE domain_id = ".intval(@$this->dataRecord["parent_domain_id"]));
+ $parent_domain = $app->db->queryOneRecord("select * FROM web_domain WHERE domain_id = ".$app->functions->intval(@$this->dataRecord["parent_domain_id"]));
// Set fixed values
$this->dataRecord["server_id"] = $parent_domain["server_id"];
@@ -114,9 +114,18 @@
if(preg_match("'^http(s)?:\/\/'i", $command)) {
$this->dataRecord["type"] = 'url';
} else {
- $domain_owner = $app->db->queryOneRecord("SELECT limit_cron_type FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ".intval($parent_domain["sys_groupid"]));
- if($domain_owner["limit_cron_type"] == 'full') $this->dataRecord["type"] = 'full';
- else $this->dataRecord["type"] = 'chrooted';
+ $domain_owner = $app->db->queryOneRecord("SELECT limit_cron_type FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ".$app->functions->intval($parent_domain["sys_groupid"]));
+ //* True when the site is assigned to a client
+ if(isset($domain_owner["limit_cron_type"])) {
+ if($domain_owner["limit_cron_type"] == 'full') {
+ $this->dataRecord["type"] = 'full';
+ } else {
+ $this->dataRecord["type"] = 'chrooted';
+ }
+ } else {
+ //* True when the site is assigned to the admin
+ $this->dataRecord["type"] = 'full';
+ }
}
parent::onSubmit();
@@ -176,13 +185,13 @@
function onAfterInsert() {
global $app, $conf;
- $web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".intval($this->dataRecord["parent_domain_id"]));
+ $web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".$app->functions->intval($this->dataRecord["parent_domain_id"]));
$server_id = $web["server_id"];
// The cron shall be owned by the same group then the website
$sys_groupid = $web['sys_groupid'];
- $sql = "UPDATE shell_user SET server_id = $server_id, sys_groupid = '$sys_groupid' WHERE id = ".$this->id;
+ $sql = "UPDATE cron SET server_id = $server_id, sys_groupid = '$sys_groupid' WHERE id = ".$this->id;
$app->db->query($sql);
}
--
Gitblit v1.9.1