From 0b20d638f6baa2b7ad34589786db337aa91ca3e1 Mon Sep 17 00:00:00 2001
From: "o.pinke" <o.pinke@conlite.org>
Date: Tue, 4 Jul 2023 20:00:39 +0200
Subject: [PATCH] fix and closes #42

---
 conlite/cronjobs/setfrontenduserstate.php | 61 +++++++++++------------
 1 file changed, 28 insertions(+), 33 deletions(-)

diff --git a/conlite/cronjobs/setfrontenduserstate.php b/conlite/cronjobs/setfrontenduserstate.php
index 2e5efa8..4d56e25 100644
--- a/conlite/cronjobs/setfrontenduserstate.php
+++ b/conlite/cronjobs/setfrontenduserstate.php
@@ -1,11 +1,11 @@
 <?php
 /**
- * Project: 
+ * Project:
  * Contenido Content Management System
- * 
- * Description: 
+ *
+ * Description:
  * Job to set frontendusers active / inactive depending on the date entered in BE
- * 
+ *
  * @package    Backend
  * @subpackage Cronjobs
  * @version    $Rev$
@@ -23,38 +23,33 @@ if (!defined("CON_FRAMEWORK")) {
 }
 
 // Contenido startup process
-include_once ('../includes/startup.php');
+include_once('../includes/startup.php');
 
-include_once ($cfg['path']['contenido'].$cfg["path"]["classes"] . 'class.user.php');
-include_once ($cfg['path']['contenido'].$cfg["path"]["classes"] . 'class.xml.php');
-include_once ($cfg['path']['contenido'].$cfg["path"]["classes"] . 'class.navigation.php');
-include_once ($cfg['path']['contenido'].$cfg["path"]["classes"] . 'template/class.template.php');
-include_once ($cfg['path']['contenido'].$cfg["path"]["classes"] . 'class.backend.php');
-include_once ($cfg['path']['contenido'].$cfg["path"]["classes"] . 'class.table.php');
-include_once ($cfg['path']['contenido'].$cfg["path"]["classes"] . 'class.notification.php');
-include_once ($cfg['path']['contenido'].$cfg["path"]["classes"] . 'class.area.php');
-include_once ($cfg['path']['contenido'].$cfg["path"]["classes"] . 'class.layout.php');
-include_once ($cfg['path']['contenido'].$cfg["path"]["classes"] . 'class.client.php');
-include_once ($cfg['path']['contenido'].$cfg["path"]["classes"] . 'class.cat.php');
-include_once ($cfg['path']['contenido'].$cfg["path"]["classes"] . 'class.treeitem.php');
-include_once ($cfg['path']['contenido'].$cfg["path"]["classes"] . 'class.inuse.php');
-include_once ($cfg['path']['contenido'].$cfg["path"]["includes"] . 'cfg_language_de.inc.php');
-include_once ($cfg['path']['contenido'].$cfg["path"]["includes"] . 'functions.stat.php');
+include_once($cfg['path']['contenido'] . $cfg["path"]["classes"] . 'class.user.php');
+include_once($cfg['path']['contenido'] . $cfg["path"]["classes"] . 'class.xml.php');
+include_once($cfg['path']['contenido'] . $cfg["path"]["classes"] . 'class.navigation.php');
+include_once($cfg['path']['contenido'] . $cfg["path"]["classes"] . 'template/class.template.php');
+include_once($cfg['path']['contenido'] . $cfg["path"]["classes"] . 'class.backend.php');
+include_once($cfg['path']['contenido'] . $cfg["path"]["classes"] . 'class.table.php');
+include_once($cfg['path']['contenido'] . $cfg["path"]["classes"] . 'class.notification.php');
+include_once($cfg['path']['contenido'] . $cfg["path"]["classes"] . 'class.area.php');
+include_once($cfg['path']['contenido'] . $cfg["path"]["classes"] . 'class.layout.php');
+include_once($cfg['path']['contenido'] . $cfg["path"]["classes"] . 'class.client.php');
+include_once($cfg['path']['contenido'] . $cfg["path"]["classes"] . 'class.cat.php');
+include_once($cfg['path']['contenido'] . $cfg["path"]["classes"] . 'class.treeitem.php');
+include_once($cfg['path']['contenido'] . $cfg["path"]["classes"] . 'class.inuse.php');
+include_once($cfg['path']['contenido'] . $cfg["path"]["includes"] . 'cfg_language_de.inc.php');
+include_once($cfg['path']['contenido'] . $cfg["path"]["includes"] . 'functions.stat.php');
 
-require_once($cfg['path']['contenido'].$cfg["path"]["includes"] . 'pseudo-cron.inc.php');
+require_once($cfg['path']['contenido'] . $cfg["path"]["includes"] . 'pseudo-cron.inc.php');
 
-if (!isRunningFromWeb() || function_exists("runJob") || $area == "cronjobs")
-{
-	$db = new DB_ConLite();
+if (!isRunningFromWeb() || function_exists("runJob") || $area == "cronjobs") {
+    $db = new DB_ConLite();
 
-	$sSql = "UPDATE " . $cfg['tab']['frontendusers'] . "
+    $sSql = "UPDATE " . $cfg['tab']['frontendusers'] . "
                 SET active = 0
-                WHERE
-                        (valid_to < NOW() AND valid_to != '1000-01-01')
-                        OR
-                        (valid_from > NOW() AND valid_from != '1000-01-01')";
-	//echo $sSql;
-	$db->query($sSql);
+                WHERE (UNIX_TIMESTAMP(valid_to) <> 0 AND valid_to < NOW() AND valid_to != '1000-01-01 00:00:00')
+                OR (UNIX_TIMESTAMP(valid_from) <> 0 AND valid_from > NOW() AND valid_from != '1000-01-01 00:00:00')";
 
-}
-?>
+    $db->query($sSql);
+}
\ No newline at end of file