From bcde9545517bcb3c800ed851b983c7bbd5b45ef5 Mon Sep 17 00:00:00 2001
From: Ulrich Block <ulblock@gmx.de>
Date: Thu, 17 Dec 2015 20:07:10 +0100
Subject: [PATCH] #674 cloud.php cannot be used via external cronjob

---
 web/cloud.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/web/cloud.php b/web/cloud.php
index 5993b579..1e89fd2d 100644
--- a/web/cloud.php
+++ b/web/cloud.php
@@ -49,7 +49,18 @@ if (isset($_SERVER['REMOTE_ADDR'])) {
 
 set_time_limit($timelimit);
 
-if (!isset($ip) or $_SERVER['SERVER_ADDR'] == $ip or in_array($ip, ipstoarray($rSA['cronjob_ips']))) {
+include(EASYWIDIR . '/stuff/methods/vorlage.php');
+include(EASYWIDIR . '/stuff/methods/functions.php');
+include(EASYWIDIR . '/stuff/methods/class_validator.php');
+include(EASYWIDIR . '/stuff/methods/class_ts3.php');
+include(EASYWIDIR . '/stuff/settings.php');
+include(EASYWIDIR . '/stuff/methods/functions_ssh_exec.php');
+include(EASYWIDIR . '/stuff/keyphrasefile.php');
+include(EASYWIDIR . '/stuff/methods/class_ftp.php');
+include(EASYWIDIR . '/stuff/methods/functions_gs.php');
+include(EASYWIDIR . '/stuff/methods/class_app.php');
+
+if (!isset($ip) or $ui->escaped('SERVER_ADDR', 'server') == $ip or in_array($ip, ipstoarray($rSA['cronjob_ips']))) {
 
     function printText ($text) {
         echo $text."\r\n";
@@ -64,17 +75,6 @@ if (!isset($ip) or $_SERVER['SERVER_ADDR'] == $ip or in_array($ip, ipstoarray($r
 
     printText('Cloud jobs started');
 
-    include(EASYWIDIR . '/stuff/methods/vorlage.php');
-    include(EASYWIDIR . '/stuff/methods/functions.php');
-    include(EASYWIDIR . '/stuff/methods/class_validator.php');
-    include(EASYWIDIR . '/stuff/methods/class_ts3.php');
-    include(EASYWIDIR . '/stuff/settings.php');
-    include(EASYWIDIR . '/stuff/methods/functions_ssh_exec.php');
-    include(EASYWIDIR . '/stuff/keyphrasefile.php');
-    include(EASYWIDIR . '/stuff/methods/class_ftp.php');
-    include(EASYWIDIR . '/stuff/methods/functions_gs.php');
-    include(EASYWIDIR . '/stuff/methods/class_app.php');
-
     printText('File include and parameters fetched. Start connecting to external systems.');
 
     $query = $sql->prepare("SELECT * FROM `api_import` WHERE `active`='Y'");