History cleanup updates

Author: sergejey

cycle.php

@@ -283,7 +283,7 @@
         $pvalue = SQLSelectOne($sqlQuery);
         if ($pvalue['ID']) {
             DebMes("Deleting Pvalue: " . $pvalue['ID'], 'threads');
-            SQLExec("DELETE FROM phistory WHERE VALUE_ID=" . $pvalue['ID']);
+            cleanUpValueHistory($pvalue['ID'], 0);
             SQLExec("DELETE FROM pvalues WHERE ID=" . $pvalue['ID']);
         } else {
             DebMes("NO Pvalue for " . $property_id, 'threads');

lib/objects.class.php

@@ -932,6 +932,53 @@ function getHistoryValue($varname, $time, $nerest = false)
     }
 }
 
+
+function cleanUpValueHistory($value_id, $max_age_days, $data_type = 0)
+{
+    $total_removed = 0;
+
+    if (defined('SEPARATE_HISTORY_STORAGE') && SEPARATE_HISTORY_STORAGE == 1) {
+        $table_name = 'phistory_value_'.$value_id;
+    } else {
+        $table_name = 'phistory';
+    }
+
+    $start_tm = date('Y-m-d H:i:s', (time() - $max_age_days * 24 * 60 * 60));
+    $qry = "VALUE_ID='" . $value_id . "' AND ADDED<('" . $start_tm . "')";
+
+    if ($data_type == 5) {
+        $values = SQLSelect("SELECT * FROM $table_name WHERE $qry");
+        $totalv = count($values);
+        for ($iv = 0; $iv < $totalv; $iv++) {
+            $file_path = ROOT . 'cms/images/' . $values[$iv]['VALUE'];
+            if ($values[$iv]['VALUE'] != '' && file_exists($file_path)) {
+                unlink($file_path);
+            }
+        }
+    }
+
+    $tmp = SQLSelectOne("SELECT COUNT(*) as TOTAL FROM $table_name WHERE $qry");
+    if (isset($tmp['TOTAL']) && $tmp['TOTAL']>0) {
+        $total_removed = (int)$tmp['TOTAL'];
+        SQLExec("DELETE FROM $table_name WHERE $qry");
+    }
+    return $total_removed;
+}
+
+function cleanUpPropertyHistory($property_id, $max_age_days)
+{
+    $total_removed = 0;
+    $property = SQLSelectOne("SELECT * FROM properties WHERE ID=".(int)$property_id);
+    if (isset($property['ID'])) {
+        $pvalues = SQLSelect("SELECT * FROM pvalues WHERE PROPERTY_ID='" . $property_id . "'");
+        $total = count($pvalues);
+        for ($i = 0; $i < $total; $i++) {
+            $total_removed+=cleanUpValueHistory($pvalues[$i]['ID'], $max_age_days, $property['DATA_TYPE']);
+        }
+    }
+    return $total_removed;
+}
+
 /**
  * Summary of setGlobal
  * @param mixed $varname Variable name

modules/objects/objects_edit.inc.php

@@ -123,7 +123,7 @@
         if ($pr['ID']) {
             $value = SQLSelectOne("SELECT * FROM pvalues WHERE PROPERTY_ID='" . $delete_prop . "' AND OBJECT_ID='" . $rec['ID'] . "'");
             if ($value['ID']) {
-                SQLExec("DELETE FROM phistory WHERE VALUE_ID='" . $value['ID'] . "'");
+                cleanUpValueHistory($value['ID'], 0, $pr['DATA_TYPE']);
                 SQLExec("DELETE FROM pvalues WHERE PROPERTY_ID='" . $delete_prop . "' AND OBJECT_ID='" . $rec['ID'] . "'");
             }
             if (!$pr['CLASS_ID']) {
@@ -178,12 +178,12 @@
                 $this->setProperty($props[$i]['TITLE'], ${"value" . $props[$i]['ID']});
             }
         }
-        $props[$i]['VALUE'] = isset($value['VALUE'])?$value['VALUE']:'';
+        $props[$i]['VALUE'] = isset($value['VALUE']) ? $value['VALUE'] : '';
         $props[$i]['VALUE_HTML'] = htmlspecialchars($props[$i]['VALUE']);
-        $props[$i]['SOURCE'] = isset($value['SOURCE'])?$value['SOURCE']:'';
-        $props[$i]['UPDATED'] = isset($value['UPDATED'])?date('d.m.Y H:i:s', strtotime($value['UPDATED'])):'';
+        $props[$i]['SOURCE'] = isset($value['SOURCE']) ? $value['SOURCE'] : '';
+        $props[$i]['UPDATED'] = isset($value['UPDATED']) ? date('d.m.Y H:i:s', strtotime($value['UPDATED'])) : '';
 
-        $value['LINKED_MODULES'] = isset($value['LINKED_MODULES'])?explode(',', $value['LINKED_MODULES']):false;
+        $value['LINKED_MODULES'] = isset($value['LINKED_MODULES']) ? explode(',', $value['LINKED_MODULES']) : false;
         $props[$i]['LINKED_MODULES'] = '';
         if (is_array($value['LINKED_MODULES'])) {
             foreach ($value['LINKED_MODULES'] as $prop_link) {