From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
interface/web/sites/cron_edit.php | 36 +++++++++++++++++++++++-------------
1 files changed, 23 insertions(+), 13 deletions(-)
diff --git a/interface/web/sites/cron_edit.php b/interface/web/sites/cron_edit.php
index 76733ff..a832649 100644
--- a/interface/web/sites/cron_edit.php
+++ b/interface/web/sites/cron_edit.php
@@ -86,8 +86,8 @@
if($_SESSION["s"]["user"]["typ"] != 'admin') {
// Get the limits of the client
- $client_group_id = $_SESSION["s"]["user"]["default_group"];
- $client = $app->db->queryOneRecord("SELECT limit_cron, limit_cron_type FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
+ $client_group_id = $app->functions->intval($_SESSION["s"]["user"]["default_group"]);
+ $client = $app->db->queryOneRecord("SELECT limit_cron, limit_cron_type FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id);
// When the record is updated
if($this->id > 0) {
@@ -95,7 +95,7 @@
} else {
// Check if the user may add another cron job.
if($client["limit_cron"] >= 0) {
- $tmp = $app->db->queryOneRecord("SELECT count(id) as number FROM cron WHERE sys_groupid = $client_group_id");
+ $tmp = $app->db->queryOneRecord("SELECT count(id) as number FROM cron WHERE sys_groupid = ?", $client_group_id);
if($tmp["number"] >= $client["limit_cron"]) {
$app->error($app->tform->wordbook["limit_cron_txt"]);
}
@@ -104,7 +104,7 @@
}
// Get the record of the parent domain
- $parent_domain = $app->db->queryOneRecord("select * FROM web_domain WHERE domain_id = ".$app->functions->intval(@$this->dataRecord["parent_domain_id"]) . " AND ".$app->tform->getAuthSQL('r'));
+ $parent_domain = $app->db->queryOneRecord("select * FROM web_domain WHERE domain_id = ? AND ".$app->tform->getAuthSQL('r'), @$this->dataRecord["parent_domain_id"]);
if(!$parent_domain || $parent_domain['domain_id'] != @$this->dataRecord['parent_domain_id']) $app->tform->errorMessage .= $app->tform->lng("no_domain_perm");
// Set fixed values
@@ -115,7 +115,7 @@
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 = ".$app->functions->intval($parent_domain["sys_groupid"]));
+ $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 = ?", $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') {
@@ -139,14 +139,19 @@
//* last chance to stop this, so check frequency limit!
if($_SESSION["s"]["user"]["typ"] != 'admin') {
// Get the limits of the client
- $client_group_id = $_SESSION["s"]["user"]["default_group"];
- $client = $app->db->queryOneRecord("SELECT limit_cron_frequency FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
+ $client_group_id = $app->functions->intval($_SESSION["s"]["user"]["default_group"]);
+ $client = $app->db->queryOneRecord("SELECT limit_cron_frequency, limit_cron_type FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id);
if($client["limit_cron_frequency"] > 1) {
if($app->tform->cron_min_freq < $client["limit_cron_frequency"]) {
$app->error($app->tform->wordbook["limit_cron_frequency_txt"]);
$has_error = true;
}
+ }
+
+ if($client["limit_cron_type"] == 'url' && $this->dataRecord["type"] != 'url') {
+ $app->error($app->tform->wordbook["limit_cron_url_txt"]);
+ $has_error = true;
}
}
@@ -164,14 +169,19 @@
//* last chance to stop this, so check frequency limit!
if($_SESSION["s"]["user"]["typ"] != 'admin') {
// Get the limits of the client
- $client_group_id = $_SESSION["s"]["user"]["default_group"];
- $client = $app->db->queryOneRecord("SELECT limit_cron_frequency FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
+ $client_group_id = $app->functions->intval($_SESSION["s"]["user"]["default_group"]);
+ $client = $app->db->queryOneRecord("SELECT limit_cron_frequency, limit_cron_type FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id);
if($client["limit_cron_frequency"] > 1) {
if($app->tform->cron_min_freq < $client["limit_cron_frequency"]) {
$app->error($app->tform->wordbook["limit_cron_frequency_txt"]);
$has_error = true;
}
+ }
+
+ if($client["limit_cron_type"] == 'url' && $this->dataRecord["type"] != 'url') {
+ $app->error($app->tform->wordbook["limit_cron_url_txt"]);
+ $has_error = true;
}
}
@@ -186,14 +196,14 @@
function onAfterInsert() {
global $app, $conf;
- $web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".$app->functions->intval($this->dataRecord["parent_domain_id"]));
+ $web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ?", $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'];
+ $sys_groupid = $app->functions->intval($web['sys_groupid']);
- $sql = "UPDATE cron SET server_id = $server_id, sys_groupid = '$sys_groupid' WHERE id = ".$this->id;
- $app->db->query($sql);
+ $sql = "UPDATE cron SET server_id = ?, sys_groupid = ? WHERE id = ?";
+ $app->db->query($sql, $server_id, $sys_groupid, $this->id);
}
function onAfterUpdate() {
--
Gitblit v1.9.1