From: Alan Knowles <alan@roojs.com>
Date: Wed, 18 Jan 2017 03:24:13 +0000 (+0800)
Subject: DataObjects/Core_company.php
X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=5d4ac076dc4f620fbb91944eead3e0af66216a03

DataObjects/Core_company.php
DataObjects/Core_company_type.php
DataObjects/Core_curr_rate.php
DataObjects/Core_domain.php
DataObjects/Core_email.php
DataObjects/Core_enum.php
DataObjects/Core_event_audit.php
DataObjects/Core_group.php
DataObjects/Core_group_member.php
DataObjects/Core_group_right.php
DataObjects/Core_image_type.php
DataObjects/Core_locking.php
DataObjects/Core_notify.php
DataObjects/Core_notify_recur.php
DataObjects/Core_office.php
DataObjects/Core_person.php
DataObjects/Core_person_alias.php
DataObjects/Core_person_signup.php
DataObjects/Core_project.php
DataObjects/Core_watch.php
DataObjects/Events.php
DataObjects/I18n.php
DataObjects/Images.php
DataObjects/Proftp_groups.php
DataObjects/ProjectDirectory.php
DataObjects/Translations.php
tests/Tests.php
---

diff --git a/DataObjects/Core_company.php b/DataObjects/Core_company.php
index aaf08e29..13ddb6b6 100644
--- a/DataObjects/Core_company.php
+++ b/DataObjects/Core_company.php
@@ -2,7 +2,7 @@
 /**
  * Table Definition for Companies
  */
-require_once 'DB/DataObject.php';
+class_exists('DB_DataObject') ? '' : require_once 'DB/DataObject.php';
 
 class Pman_Core_DataObjects_Core_Company extends DB_DataObject 
 {
diff --git a/DataObjects/Core_company_type.php b/DataObjects/Core_company_type.php
index 0eb0b8d4..b4402301 100644
--- a/DataObjects/Core_company_type.php
+++ b/DataObjects/Core_company_type.php
@@ -2,7 +2,7 @@
 /**
  * Table Definition for core company
  */
-require_once 'DB/DataObject.php';
+class_exists('DB_DataObject') ? '' : require_once 'DB/DataObject.php';
 
 class Pman_Core_DataObjects_Core_company_type extends DB_DataObject 
 {
diff --git a/DataObjects/Core_curr_rate.php b/DataObjects/Core_curr_rate.php
index 8371fb22..5b6858cf 100644
--- a/DataObjects/Core_curr_rate.php
+++ b/DataObjects/Core_curr_rate.php
@@ -2,7 +2,7 @@
 /**
  * Table Definition for core_curr_rate
  */
-require_once 'DB/DataObject.php';
+class_exists('DB_DataObject') ? '' : require_once 'DB/DataObject.php';
 
 class Pman_Core_DataObjects_Core_curr_rate extends DB_DataObject 
 {
diff --git a/DataObjects/Core_domain.php b/DataObjects/Core_domain.php
index 6420b7f0..89b4587d 100644
--- a/DataObjects/Core_domain.php
+++ b/DataObjects/Core_domain.php
@@ -2,7 +2,7 @@
 /**
  * Table Definition for core_domain
  */
-require_once 'DB/DataObject.php';
+class_exists('DB_DataObject') ? '' : require_once 'DB/DataObject.php';
 
 class Pman_Core_DataObjects_Core_domain extends DB_DataObject 
 {
diff --git a/DataObjects/Core_email.php b/DataObjects/Core_email.php
index 02758b48..78f21462 100644
--- a/DataObjects/Core_email.php
+++ b/DataObjects/Core_email.php
@@ -2,7 +2,7 @@
 /**
  * Table Definition for core_email
  */
-require_once 'DB/DataObject.php';
+class_exists('DB_DataObject') ? '' : require_once 'DB/DataObject.php';
 
 class Pman_Core_DataObjects_Core_email extends DB_DataObject 
 {
diff --git a/DataObjects/Core_enum.php b/DataObjects/Core_enum.php
index 4ad69a37..66e509ca 100644
--- a/DataObjects/Core_enum.php
+++ b/DataObjects/Core_enum.php
@@ -2,7 +2,7 @@
 /**
  * Table Definition for core enum - it's used in pulldowns or simple option lists.
  */
-require_once 'DB/DataObject.php';
+class_exists('DB_DataObject') ? '' : require_once 'DB/DataObject.php';
 
 class Pman_Core_DataObjects_Core_enum extends DB_DataObject 
 {
diff --git a/DataObjects/Core_event_audit.php b/DataObjects/Core_event_audit.php
index cda5f083..0e578b10 100644
--- a/DataObjects/Core_event_audit.php
+++ b/DataObjects/Core_event_audit.php
@@ -2,7 +2,7 @@
 /**
  * Table Definition for core_event_audit
  */
-require_once 'DB/DataObject.php';
+class_exists('DB_DataObject') ? '' : require_once 'DB/DataObject.php';
 
 class Pman_Core_DataObjects_Core_event_audit extends DB_DataObject 
 {
diff --git a/DataObjects/Core_group.php b/DataObjects/Core_group.php
index bfaabc56..16d12c03 100644
--- a/DataObjects/Core_group.php
+++ b/DataObjects/Core_group.php
@@ -12,7 +12,7 @@
  *  NOTE - used to be called Groups ....
  * 
  */
-require_once 'DB/DataObject.php';
+class_exists('DB_DataObject') ? '' : require_once 'DB/DataObject.php';
 
 class Pman_Core_DataObjects_Core_group extends DB_DataObject 
 {
diff --git a/DataObjects/Core_group_member.php b/DataObjects/Core_group_member.php
index cbd96671..272aa067 100755
--- a/DataObjects/Core_group_member.php
+++ b/DataObjects/Core_group_member.php
@@ -2,7 +2,7 @@
 /**
  * Table Definition for Group_Members
  */
-require_once 'DB/DataObject.php';
+class_exists('DB_DataObject') ? '' : require_once 'DB/DataObject.php';
 
 class Pman_Core_DataObjects_Core_group_member extends DB_DataObject 
 {
diff --git a/DataObjects/Core_group_right.php b/DataObjects/Core_group_right.php
index 7f3ae822..36d338ec 100755
--- a/DataObjects/Core_group_right.php
+++ b/DataObjects/Core_group_right.php
@@ -13,7 +13,7 @@
  *
  * 
  */
-require_once 'DB/DataObject.php';
+class_exists('DB_DataObject') ? '' : require_once 'DB/DataObject.php';
 
  
 class Pman_Core_DataObjects_Core_group_right extends DB_DataObject 
diff --git a/DataObjects/Core_image_type.php b/DataObjects/Core_image_type.php
index 33152a2e..ad1ac408 100644
--- a/DataObjects/Core_image_type.php
+++ b/DataObjects/Core_image_type.php
@@ -2,7 +2,7 @@
 /**
  * Table Definition for core company
  */
-require_once 'DB/DataObject.php';
+class_exists('DB_DataObject') ? '' : require_once 'DB/DataObject.php';
 
 class Pman_Core_DataObjects_Core_image_type extends DB_DataObject 
 {
diff --git a/DataObjects/Core_locking.php b/DataObjects/Core_locking.php
index df878ebe..c7201245 100644
--- a/DataObjects/Core_locking.php
+++ b/DataObjects/Core_locking.php
@@ -2,7 +2,7 @@
 /**
  * Table Definition for core company
  */
-require_once 'DB/DataObject.php';
+class_exists('DB_DataObject') ? '' : require_once 'DB/DataObject.php';
 
 class Pman_Core_DataObjects_Core_locking extends DB_DataObject 
 {
diff --git a/DataObjects/Core_notify.php b/DataObjects/Core_notify.php
index 5e85aeb5..729f0a82 100644
--- a/DataObjects/Core_notify.php
+++ b/DataObjects/Core_notify.php
@@ -20,7 +20,7 @@ CREATE TABLE  core_notify  (
 );
 **/
 
-require_once 'DB/DataObject.php';
+class_exists('DB_DataObject') ? '' : require_once 'DB/DataObject.php';
 
 class Pman_Core_DataObjects_Core_notify extends DB_DataObject 
 {
diff --git a/DataObjects/Core_notify_recur.php b/DataObjects/Core_notify_recur.php
index 7940bba5..ceca27cb 100644
--- a/DataObjects/Core_notify_recur.php
+++ b/DataObjects/Core_notify_recur.php
@@ -2,7 +2,7 @@
 /**
  * Table Definition for core_notify_recur
  */
-require_once 'DB/DataObject.php';
+class_exists('DB_DataObject') ? '' : require_once 'DB/DataObject.php';
 
 class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject 
 {
diff --git a/DataObjects/Core_office.php b/DataObjects/Core_office.php
index 447eedf6..5a7ccfdf 100644
--- a/DataObjects/Core_office.php
+++ b/DataObjects/Core_office.php
@@ -2,7 +2,7 @@
 /**
  * Table Definition for Office
  */
-require_once 'DB/DataObject.php';
+class_exists('DB_DataObject') ? '' : require_once 'DB/DataObject.php';
 
 class Pman_Core_DataObjects_Core_office extends DB_DataObject 
 {
diff --git a/DataObjects/Core_person.php b/DataObjects/Core_person.php
index 9ea60f7a..635ff1cf 100644
--- a/DataObjects/Core_person.php
+++ b/DataObjects/Core_person.php
@@ -2,7 +2,7 @@
 /**
  * Table Definition for Person
  */
-require_once 'DB/DataObject.php';
+class_exists('DB_DataObject') ? '' : require_once 'DB/DataObject.php';
 
 
 class Pman_Core_DataObjects_Core_person extends DB_DataObject 
diff --git a/DataObjects/Core_person_alias.php b/DataObjects/Core_person_alias.php
index c43b7499..76dcebfb 100644
--- a/DataObjects/Core_person_alias.php
+++ b/DataObjects/Core_person_alias.php
@@ -2,7 +2,7 @@
 /**
  * Table Definition for core_person_alias
  */
-require_once 'DB/DataObject.php';
+class_exists('DB_DataObject') ? '' : require_once 'DB/DataObject.php';
 
 class Pman_Core_DataObjects_Core_person_alias extends DB_DataObject 
 {
diff --git a/DataObjects/Core_person_signup.php b/DataObjects/Core_person_signup.php
index 2b182291..529c2b1c 100644
--- a/DataObjects/Core_person_signup.php
+++ b/DataObjects/Core_person_signup.php
@@ -3,7 +3,7 @@
 /**
  * Table Definition for Person
  */
-require_once 'DB/DataObject.php';
+class_exists('DB_DataObject') ? '' : require_once 'DB/DataObject.php';
 
 class Pman_Core_DataObjects_Core_person_signup extends DB_DataObject 
 {
diff --git a/DataObjects/Core_project.php b/DataObjects/Core_project.php
index 517fdac8..818a3eed 100644
--- a/DataObjects/Core_project.php
+++ b/DataObjects/Core_project.php
@@ -2,7 +2,7 @@
 /**
  * Table Definition for Projects
  */
-require_once 'DB/DataObject.php';
+class_exists('DB_DataObject') ? '' : require_once 'DB/DataObject.php';
 
 class Pman_Core_DataObjects_Core_project extends DB_DataObject 
 {
diff --git a/DataObjects/Core_watch.php b/DataObjects/Core_watch.php
index 396dd889..4a30b810 100644
--- a/DataObjects/Core_watch.php
+++ b/DataObjects/Core_watch.php
@@ -26,7 +26,7 @@
  * 
  * 
  */
-require_once 'DB/DataObject.php';
+class_exists('DB_DataObject') ? '' : require_once 'DB/DataObject.php';
 
 class Pman_Core_DataObjects_Core_watch extends DB_DataObject 
 {
diff --git a/DataObjects/Events.php b/DataObjects/Events.php
index 90f598cf..521ead84 100644
--- a/DataObjects/Events.php
+++ b/DataObjects/Events.php
@@ -7,7 +7,7 @@
  *
  * 
  */
-require_once 'DB/DataObject.php';
+class_exists('DB_DataObject') ? '' : require_once 'DB/DataObject.php';
 
 class Pman_Core_DataObjects_Events extends DB_DataObject 
 {
diff --git a/DataObjects/I18n.php b/DataObjects/I18n.php
index 82add747..cae6e3bc 100644
--- a/DataObjects/I18n.php
+++ b/DataObjects/I18n.php
@@ -7,7 +7,7 @@
  * It should eventually replace most of that..
  * 
  */
-require_once 'DB/DataObject.php';
+class_exists('DB_DataObject') ? '' : require_once 'DB/DataObject.php';
 
 class Pman_Core_DataObjects_I18n extends DB_DataObject 
 {
diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index 70fb7e71..98a6f815 100644
--- a/DataObjects/Images.php
+++ b/DataObjects/Images.php
@@ -2,7 +2,7 @@
 /**
  * Table Definition for Images
  */
-require_once 'DB/DataObject.php';
+class_exists('DB_DataObject') ? '' : require_once 'DB/DataObject.php';
 
 class Pman_Core_DataObjects_Images extends DB_DataObject 
 {
diff --git a/DataObjects/Proftp_groups.php b/DataObjects/Proftp_groups.php
index c18c8997..1152726a 100644
--- a/DataObjects/Proftp_groups.php
+++ b/DataObjects/Proftp_groups.php
@@ -4,7 +4,7 @@
  * 
  * -- this is needed for proftp integratin, but it's not used.. AFAIK
  */
-require_once 'DB/DataObject.php';
+class_exists('DB_DataObject') ? '' : require_once 'DB/DataObject.php';
 
 class Pman_Core_DataObjects_Proftp_groups extends DB_DataObject 
 {
diff --git a/DataObjects/ProjectDirectory.php b/DataObjects/ProjectDirectory.php
index 0851ea5c..f494e3c6 100644
--- a/DataObjects/ProjectDirectory.php
+++ b/DataObjects/ProjectDirectory.php
@@ -5,7 +5,7 @@
  * Note - projectdirectory is linked to this - due to an issue with postgres - we should keep to lowercase names only for tables..
  * 
  */
-require_once 'DB/DataObject.php';
+class_exists('DB_DataObject') ? '' : require_once 'DB/DataObject.php';
 
 class Pman_Core_DataObjects_ProjectDirectory extends DB_DataObject 
 {
diff --git a/DataObjects/Translations.php b/DataObjects/Translations.php
index 3bea8363..291dad3c 100644
--- a/DataObjects/Translations.php
+++ b/DataObjects/Translations.php
@@ -2,7 +2,7 @@
 /**
  * Table Definition for translations
  */
-require_once 'DB/DataObject.php';
+class_exists('DB_DataObject') ? '' : require_once 'DB/DataObject.php';
 
 class Pman_Core_DataObjects_Translations extends DB_DataObject 
 {
diff --git a/tests/Tests.php b/tests/Tests.php
index 9598b07b..3d57ecd2 100644
--- a/tests/Tests.php
+++ b/tests/Tests.php
@@ -17,6 +17,6 @@ function init() {
     
     require_once 'HTML/FlexyFramework/Page.php';
     
-    require_once 'DB/DataObject.php';
+    class_exists('DB_DataObject') ? '' : require_once 'DB/DataObject.php';
 
 }
\ No newline at end of file