From c594944ad18739ab3ce3d2e7bc02d505ef144d19 Mon Sep 17 00:00:00 2001
From: Alan <alan@roojs.com>
Date: Tue, 4 Apr 2023 14:12:02 +0800
Subject: [PATCH] PHP8 fixes

---
 DataObjects/Core_company.php | 7 +++++++
 DataObjects/Core_enum.php    | 4 +++-
 DataObjects/Core_group.php   | 8 ++++----
 Mailer.php                   | 2 ++
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/DataObjects/Core_company.php b/DataObjects/Core_company.php
index c1b9a56d..7141478e 100644
--- a/DataObjects/Core_company.php
+++ b/DataObjects/Core_company.php
@@ -35,6 +35,13 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
     public $country;                         // string(4)  not_null
     public $is_system;                       // int(2)
     
+    
+    public $comptype_id;
+    public $address1;
+    public $address2;
+    public $address3;
+    
+    
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
     
diff --git a/DataObjects/Core_enum.php b/DataObjects/Core_enum.php
index 7a9c12bd..a2d08ca1 100644
--- a/DataObjects/Core_enum.php
+++ b/DataObjects/Core_enum.php
@@ -16,7 +16,9 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
     public $seqid;                           // int(11)  not_null multiple_key
     public $seqmax;                           // int(11)  not_null multiple_key
     public $display_name;
-
+    public $is_system_enum;
+   
+    
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
diff --git a/DataObjects/Core_group.php b/DataObjects/Core_group.php
index f845db39..54f83f55 100644
--- a/DataObjects/Core_group.php
+++ b/DataObjects/Core_group.php
@@ -80,17 +80,17 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
         
         $this->selectAdd("
            (
-            SELECT COUNT(${cgm}.user_id) 
+            SELECT COUNT({$cgm}.user_id) 
                 FROM 
                     {$cgm}
                 LEFT JOIN
                     {$cp}
                 ON
-                    ${cp}.id = {$cgm}.user_id
+                    {$cp}.id = {$cgm}.user_id
                 WHERE
-                    ${cgm}.group_id = {$this->tableName()}.id
+                    {$cgm}.group_id = {$this->tableName()}.id
                 AND
-                    ${cp}.active = 1
+                    {$cp}.active = 1
                 ) AS group_member_count            
         ");
         
diff --git a/Mailer.php b/Mailer.php
index 37aed9df..6fb953d6 100644
--- a/Mailer.php
+++ b/Mailer.php
@@ -73,6 +73,8 @@ class Pman_Core_Mailer {
     var $locale = false; // eg. 'en' or 'zh_HK'
     var $urlmap = array();
     
+    var $htmlbody;
+    var $textbody;
     
     var $html_locale = false; // eg. 'en' or 'zh_HK'
     var $images         = array(); // generated list of cid images for sending
-- 
2.39.2