From 82568356544dedd6295b0714fa445b7f4b5608d7 Mon Sep 17 00:00:00 2001 From: Bohdan Dmytryshyn Date: Thu, 21 May 2020 17:41:58 +0300 Subject: [PATCH] Release 5.1.1 --- .../Install/Entity/ApplicationQrCode.php | 4 ++-- CRM/CiviMobileAPI/Page/Checklist.php | 3 ++- CRM/CiviMobileAPI/Utils/Checklist.php | 19 +++++++++++---- CRM/CiviMobileAPI/Utils/Cms.php | 5 ++-- CRM/CiviMobileAPI/Utils/File.php | 7 ++++-- CRM/CiviMobileAPI/Utils/RestPath.php | 2 +- CRM/CiviMobileAPI/Utils/Website.php | 24 ------------------- README.md | 8 +++---- info.xml | 4 ++-- .../CRM/CiviMobileAPI/Page/Checklist.tpl | 20 ++++++++++------ templates/CRM/CiviMobileAPI/popup.tpl | 2 +- 11 files changed, 47 insertions(+), 51 deletions(-) delete mode 100644 CRM/CiviMobileAPI/Utils/Website.php diff --git a/CRM/CiviMobileAPI/Install/Entity/ApplicationQrCode.php b/CRM/CiviMobileAPI/Install/Entity/ApplicationQrCode.php index d1723b2..966998c 100644 --- a/CRM/CiviMobileAPI/Install/Entity/ApplicationQrCode.php +++ b/CRM/CiviMobileAPI/Install/Entity/ApplicationQrCode.php @@ -26,9 +26,9 @@ class CRM_CiviMobileAPI_Install_Entity_ApplicationQrCode implements CRM_CiviMobi $path = $directoryName . DIRECTORY_SEPARATOR . $imageName; if ($currentCMS == CRM_CiviMobileAPI_Utils_CmsUser::CMS_JOOMLA ) { - $siteUrl = str_replace("/administrator/", "", CIVICRM_UF_BASEURL); + $siteUrl = str_replace("/administrator/", "/", $config->userFrameworkBaseURL); } else { - $siteUrl = CIVICRM_UF_BASEURL; + $siteUrl = $config->userFrameworkBaseURL; } $params = [ 'attachFile_1' => [ diff --git a/CRM/CiviMobileAPI/Page/Checklist.php b/CRM/CiviMobileAPI/Page/Checklist.php index 26c4d57..c0ec1de 100644 --- a/CRM/CiviMobileAPI/Page/Checklist.php +++ b/CRM/CiviMobileAPI/Page/Checklist.php @@ -8,6 +8,7 @@ class CRM_CiviMobileAPI_Page_Checklist extends CRM_Core_Page { public function run() { $checklist = new CRM_CiviMobileAPI_Utils_Checklist(); $checklist->checkAllAvailableItems(); + $config = CRM_Core_Config::singleton(); $currentContact = CRM_Contact_BAO_Contact::findById(CRM_Core_Session::singleton()->getLoggedInContactID()); $apiKey = $currentContact->api_key ? $currentContact->api_key : CRM_CiviMobileAPI_Authentication_Login::setApiKey($currentContact->id); @@ -15,7 +16,7 @@ class CRM_CiviMobileAPI_Page_Checklist extends CRM_Core_Page { $authUrl = CRM_Utils_System::url('civicrm/civimobile/auth', NULL, TRUE); $restPathUrl = self::concatenateUrl( - str_replace("/administrator/", "", CIVICRM_UF_BASEURL) . substr((new CRM_CiviMobileAPI_Utils_RestPath())->get(),1), + str_replace("/administrator/", "", $config->userFrameworkBaseURL) . (new CRM_CiviMobileAPI_Utils_RestPath())->get(), $paramsToRest); $restUrl = self::concatenateUrl((new CRM_CiviMobileAPI_Utils_RestPath())->getAbsoluteUrl(), $paramsToRest); diff --git a/CRM/CiviMobileAPI/Utils/Checklist.php b/CRM/CiviMobileAPI/Utils/Checklist.php index caad117..2740999 100644 --- a/CRM/CiviMobileAPI/Utils/Checklist.php +++ b/CRM/CiviMobileAPI/Utils/Checklist.php @@ -209,19 +209,17 @@ class CRM_CiviMobileAPI_Utils_Checklist { */ public function _checkCron() { $checkCron = CRM_Utils_Check_Component_Env::checkLastCron(); - $this->checkedItems['last_cron']['title'] = 'Is CRON running correct?'; - $this->checkedItems['last_cron']['message'] = $checkCron[0]->getTitle() . "
" . $checkCron[0]->getMessage(); switch ($checkCron[0]->getLevel()) { case CRM_Utils_Check::severityMap(\Psr\Log\LogLevel::INFO): $this->checkedItems['last_cron']['status'] = 'success'; + $this->checkedItems['last_cron']['message'] = 'CRON is running correct.'; break; case CRM_Utils_Check::severityMap(\Psr\Log\LogLevel::WARNING): - $this->checkedItems['last_cron']['status'] = 'warning'; - break; case CRM_Utils_Check::severityMap(\Psr\Log\LogLevel::ERROR): - $this->checkedItems['last_cron']['status'] = 'error'; + $this->checkedItems['last_cron']['status'] = 'warning'; + $this->checkedItems['last_cron']['message'] = 'CRON isn`t running. If CRON isn`t enabled, it can clog your database.'; break; } @@ -284,4 +282,15 @@ class CRM_CiviMobileAPI_Utils_Checklist { ]; } + /** + * Adds baseURL to $systemInfo + */ + public function _siBaseUrl() { + $config = CRM_Core_Config::singleton(); + $this->systemInfo[] = [ + 'title' => 'userFrameworkBaseURL(Config)', + 'message' => $config->userFrameworkBaseURL, + ]; + } + } diff --git a/CRM/CiviMobileAPI/Utils/Cms.php b/CRM/CiviMobileAPI/Utils/Cms.php index af8fafe..9c38845 100644 --- a/CRM/CiviMobileAPI/Utils/Cms.php +++ b/CRM/CiviMobileAPI/Utils/Cms.php @@ -33,15 +33,16 @@ class CRM_CiviMobileAPI_Utils_Cms { */ public static function getCmsRssUrl() { $currentCMS = CRM_CiviMobileAPI_Utils_CmsUser::getInstance()->getSystem(); + $config = CRM_Core_Config::singleton(); if ($currentCMS == CRM_CiviMobileAPI_Utils_CmsUser::CMS_WORDPRESS && function_exists('get_feed_link')) { return get_feed_link('rss2'); } elseif ($currentCMS == CRM_CiviMobileAPI_Utils_CmsUser::CMS_JOOMLA ) { - return str_replace("/administrator/", "", CIVICRM_UF_BASEURL) . "/?format=feed&type=rss"; + return str_replace("/administrator/", "/", $config->userFrameworkBaseURL) . "?format=feed&type=rss"; } elseif ($currentCMS == CRM_CiviMobileAPI_Utils_CmsUser::CMS_DRUPAL6 || $currentCMS == CRM_CiviMobileAPI_Utils_CmsUser::CMS_DRUPAL7) { - return CIVICRM_UF_BASEURL . "/rss.xml"; + return $config->userFrameworkBaseURL . "rss.xml"; } return ''; diff --git a/CRM/CiviMobileAPI/Utils/File.php b/CRM/CiviMobileAPI/Utils/File.php index 435e1fd..9231ea5 100644 --- a/CRM/CiviMobileAPI/Utils/File.php +++ b/CRM/CiviMobileAPI/Utils/File.php @@ -71,6 +71,7 @@ class CRM_CiviMobileAPI_Utils_File { public static function getFileUrl($entityId, $entityTable, $filename) { $url = ''; $files = CRM_Core_BAO_File::getEntityFile($entityTable, $entityId); + $config = CRM_Core_Config::singleton(); foreach ($files as $file) { if ((!empty($file['fileName']) && $file['fileName'] == $filename) @@ -82,6 +83,8 @@ class CRM_CiviMobileAPI_Utils_File { if (substr($url, 0, 1) == '/') { $url = substr($url, 1); } + //CiviCRM sometimes generate url with domain + $url = str_replace($config->userFrameworkBaseURL, "", $url); $url = urldecode($url); @@ -91,10 +94,10 @@ class CRM_CiviMobileAPI_Utils_File { } if ($currentCMS == CRM_CiviMobileAPI_Utils_CmsUser::CMS_JOOMLA ) { - $url = str_replace("administrator/", "", CIVICRM_UF_BASEURL) . $url; + $url = str_replace("administrator/", "", $config->userFrameworkBaseURL) . $url; $url = str_replace("administrator/", "index.php", $url); } else { - $url = CIVICRM_UF_BASEURL . $url; + $url = $config->userFrameworkBaseURL . $url; } $url = htmlspecialchars_decode($url); diff --git a/CRM/CiviMobileAPI/Utils/RestPath.php b/CRM/CiviMobileAPI/Utils/RestPath.php index e1ffa39..480864b 100644 --- a/CRM/CiviMobileAPI/Utils/RestPath.php +++ b/CRM/CiviMobileAPI/Utils/RestPath.php @@ -81,7 +81,7 @@ class CRM_CiviMobileAPI_Utils_RestPath { * @return string */ private function getJoomlaRestPath() { - return '/administrator' . Civi::paths()->getUrl("[civicrm.root]/extern/rest.php"); + return '/administrator' . str_replace('/administrator','', Civi::paths()->getUrl("[civicrm.root]/extern/rest.php")); } /** diff --git a/CRM/CiviMobileAPI/Utils/Website.php b/CRM/CiviMobileAPI/Utils/Website.php deleted file mode 100644 index 3d6549f..0000000 --- a/CRM/CiviMobileAPI/Utils/Website.php +++ /dev/null @@ -1,24 +0,0 @@ -https://agiliway.com http://www.gnu.org/licenses/agpl-3.0.html - 2020-05-04 - 5.1.0 + 2020-05-21 + 5.1.1 4.7 5.20 diff --git a/templates/CRM/CiviMobileAPI/Page/Checklist.tpl b/templates/CRM/CiviMobileAPI/Page/Checklist.tpl index 8b5a697..9d445ac 100644 --- a/templates/CRM/CiviMobileAPI/Page/Checklist.tpl +++ b/templates/CRM/CiviMobileAPI/Page/Checklist.tpl @@ -34,13 +34,15 @@ {literal}