From bf0a4d7bfe44b689fca346b97dbd0287a59c4af3 Mon Sep 17 00:00:00 2001 From: Marc Michalsky forumZFD Date: Tue, 13 Oct 2020 15:15:33 +0200 Subject: [PATCH] moved some BAO classes and json files + refactoring paths --- .../{Upgrader => }/BAO/CampaignType.php | 0 CRM/TwingleCampaign/{Upgrader => }/BAO/CustomField.php | 2 +- CRM/TwingleCampaign/{Upgrader => }/BAO/CustomGroup.php | 0 .../TwingleCampaign}/BAO/TwingleCampaign.php | 0 .../TwingleCampaign}/BAO/TwingleEvent.php | 0 .../TwingleCampaign}/BAO/TwingleProject.php | 8 ++++---- CRM/TwingleCampaign/Upgrader.php | 10 +++++----- .../{Upgrader => }/resources/campaigns.json | 0 .../TwingleCampaign}/resources/dictionary.json | 0 .../resources/twingle_api_templates.json | 0 api/v3/TwingleSync/BAO/TwingleApiCall.php | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) rename CRM/TwingleCampaign/{Upgrader => }/BAO/CampaignType.php (100%) rename CRM/TwingleCampaign/{Upgrader => }/BAO/CustomField.php (99%) rename CRM/TwingleCampaign/{Upgrader => }/BAO/CustomGroup.php (100%) rename {api/v3/TwingleSync => CRM/TwingleCampaign}/BAO/TwingleCampaign.php (100%) rename {api/v3/TwingleSync => CRM/TwingleCampaign}/BAO/TwingleEvent.php (100%) rename {api/v3/TwingleSync => CRM/TwingleCampaign}/BAO/TwingleProject.php (98%) rename CRM/TwingleCampaign/{Upgrader => }/resources/campaigns.json (100%) rename {api/v3/TwingleSync => CRM/TwingleCampaign}/resources/dictionary.json (100%) rename {api/v3/TwingleSync => CRM/TwingleCampaign}/resources/twingle_api_templates.json (100%) diff --git a/CRM/TwingleCampaign/Upgrader/BAO/CampaignType.php b/CRM/TwingleCampaign/BAO/CampaignType.php similarity index 100% rename from CRM/TwingleCampaign/Upgrader/BAO/CampaignType.php rename to CRM/TwingleCampaign/BAO/CampaignType.php diff --git a/CRM/TwingleCampaign/Upgrader/BAO/CustomField.php b/CRM/TwingleCampaign/BAO/CustomField.php similarity index 99% rename from CRM/TwingleCampaign/Upgrader/BAO/CustomField.php rename to CRM/TwingleCampaign/BAO/CustomField.php index 68c2c51..b2fdefc 100644 --- a/CRM/TwingleCampaign/Upgrader/BAO/CustomField.php +++ b/CRM/TwingleCampaign/BAO/CustomField.php @@ -147,7 +147,7 @@ class CustomField { $customFields = []; $json_file = file_get_contents(E::path() . - '/CRM/TwingleCampaign/Upgrader/resources/campaigns.json'); + '/CRM/TwingleCampaign/resources/campaigns.json'); $campaign_info = json_decode($json_file, TRUE); if (!$campaign_info) { diff --git a/CRM/TwingleCampaign/Upgrader/BAO/CustomGroup.php b/CRM/TwingleCampaign/BAO/CustomGroup.php similarity index 100% rename from CRM/TwingleCampaign/Upgrader/BAO/CustomGroup.php rename to CRM/TwingleCampaign/BAO/CustomGroup.php diff --git a/api/v3/TwingleSync/BAO/TwingleCampaign.php b/CRM/TwingleCampaign/BAO/TwingleCampaign.php similarity index 100% rename from api/v3/TwingleSync/BAO/TwingleCampaign.php rename to CRM/TwingleCampaign/BAO/TwingleCampaign.php diff --git a/api/v3/TwingleSync/BAO/TwingleEvent.php b/CRM/TwingleCampaign/BAO/TwingleEvent.php similarity index 100% rename from api/v3/TwingleSync/BAO/TwingleEvent.php rename to CRM/TwingleCampaign/BAO/TwingleEvent.php diff --git a/api/v3/TwingleSync/BAO/TwingleProject.php b/CRM/TwingleCampaign/BAO/TwingleProject.php similarity index 98% rename from api/v3/TwingleSync/BAO/TwingleProject.php rename to CRM/TwingleCampaign/BAO/TwingleProject.php index 3316fcd..6ad5d99 100644 --- a/api/v3/TwingleSync/BAO/TwingleProject.php +++ b/CRM/TwingleCampaign/BAO/TwingleProject.php @@ -7,7 +7,7 @@ use CRM_TwingleCampaign_ExtensionUtil as E; use DateTime; use CRM\TwingleCampaign\BAO\CustomField as CustomField; -include_once E::path() . '/CRM/TwingleCampaign/Upgrader/BAO/CustomField.php'; +include_once E::path() . '/CRM/TwingleCampaign/BAO/CustomField.php'; class TwingleProject { @@ -107,9 +107,9 @@ class TwingleProject { // Initialize json files as arrays $file_paths = [ - 'translations' => '/api/v3/TwingleSync/resources/dictionary.json', - 'templates' => '/api/v3/TwingleSync/resources/twingle_api_templates.json', - 'campaigns' => '/CRM/TwingleCampaign/Upgrader/resources/campaigns.json', + 'translations' => '/CRM/TwingleCampaign/resources/dictionary.json', + 'templates' => '/CRM/TwingleCampaign/resources/twingle_api_templates.json', + 'campaigns' => '/CRM/TwingleCampaign/resources/campaigns.json', ]; foreach ($file_paths as $key => $file_path) { diff --git a/CRM/TwingleCampaign/Upgrader.php b/CRM/TwingleCampaign/Upgrader.php index 14eac8e..a1e4f62 100644 --- a/CRM/TwingleCampaign/Upgrader.php +++ b/CRM/TwingleCampaign/Upgrader.php @@ -3,9 +3,9 @@ use CRM_TwingleCampaign_ExtensionUtil as E; use CRM\TwingleCampaign\BAO as BAO; -include E::path() . '/CRM/TwingleCampaign/Upgrader/BAO/CampaignType.php'; -include E::path() . '/CRM/TwingleCampaign/Upgrader/BAO/CustomField.php'; -include E::path() . '/CRM/TwingleCampaign/Upgrader/BAO/CustomGroup.php'; +include E::path() . '/CRM/TwingleCampaign/BAO/CampaignType.php'; +include E::path() . '/CRM/TwingleCampaign/BAO/CustomField.php'; +include E::path() . '/CRM/TwingleCampaign/BAO/CustomGroup.php'; /** * Collection of upgrade steps. @@ -44,7 +44,7 @@ class CRM_TwingleCampaign_Upgrader extends CRM_TwingleCampaign_Upgrader_Base { // of the json file "campaigns.json" $json_file = file_get_contents(E::path() . - '/CRM/TwingleCampaign/Upgrader/resources/campaigns.json'); + '/CRM/TwingleCampaign/resources/campaigns.json'); $campaign_info = json_decode($json_file, TRUE); if (!$campaign_info) { @@ -86,7 +86,7 @@ class CRM_TwingleCampaign_Upgrader extends CRM_TwingleCampaign_Upgrader_Base { */ public function disable() { - $json_file = file_get_contents(E::path() . '/CRM/TwingleCampaign/Upgrader/resources/campaigns.json'); + $json_file = file_get_contents(E::path() . '/CRM/TwingleCampaign/resources/campaigns.json'); $campaign_info = json_decode($json_file, TRUE); if (!$campaign_info) { diff --git a/CRM/TwingleCampaign/Upgrader/resources/campaigns.json b/CRM/TwingleCampaign/resources/campaigns.json similarity index 100% rename from CRM/TwingleCampaign/Upgrader/resources/campaigns.json rename to CRM/TwingleCampaign/resources/campaigns.json diff --git a/api/v3/TwingleSync/resources/dictionary.json b/CRM/TwingleCampaign/resources/dictionary.json similarity index 100% rename from api/v3/TwingleSync/resources/dictionary.json rename to CRM/TwingleCampaign/resources/dictionary.json diff --git a/api/v3/TwingleSync/resources/twingle_api_templates.json b/CRM/TwingleCampaign/resources/twingle_api_templates.json similarity index 100% rename from api/v3/TwingleSync/resources/twingle_api_templates.json rename to CRM/TwingleCampaign/resources/twingle_api_templates.json diff --git a/api/v3/TwingleSync/BAO/TwingleApiCall.php b/api/v3/TwingleSync/BAO/TwingleApiCall.php index 17f1c31..f7aa329 100644 --- a/api/v3/TwingleSync/BAO/TwingleApiCall.php +++ b/api/v3/TwingleSync/BAO/TwingleApiCall.php @@ -6,7 +6,7 @@ use CRM_Core_BAO_Setting; use CRM_TwingleCampaign_ExtensionUtil as E; use CRM\TwingleCampaign\BAO\TwingleProject as TwingleProject; -include_once E::path() . '/api/v3/TwingleSync/BAO/TwingleProject.php'; +include_once E::path() . '/CRM/TwingleCampaign/BAO/TwingleProject.php'; class TwingleApiCall {