Remove default theme #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

ufundo wants to merge 155 commits into riverlea-rollout-2 from remove-default-theme

CRM/Activity/BAO/Query.php

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -617,11 +617,11 @@ public static function selectorReturnProperties() {
  
      public static function whereClauseSingleActivityText(&$values, &$query) {

        [$name, $op, $value, $grouping, $wildcard] = $values;

        $activityOptionValues = $query->getWhereValues('activity_option', $grouping);

        $activityOption = CRM_Utils_Array::value(2, $activityOptionValues, 6);

        $activityOption = $activityOptionValues[2] ?? 6;

        $query->_useDistinct = TRUE;

        $label = ts('Activity Text (%1)', [1 => CRM_Utils_Array::value($activityOption, CRM_Core_SelectValues::activityTextOptions())]);

        $label = ts('Activity Text (%1)', [1 => CRM_Core_SelectValues::activityTextOptions()[$activityOption] ?? '']);

        $clauses = [];

        if ($activityOption % 2 == 0) {

          $clauses[] = $query->buildClause('civicrm_activity.details', $op, $value, 'String');

CRM/Activity/Form/ActivityFilter.php

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -51,7 +51,7 @@ public function setDefaultValues() {
  
          $defaults = Civi::contactSettings()->get('activity_tab_filter');

        }

        // set Activity status 'Scheduled' by default only for dashlet

        elseif (strstr(CRM_Utils_Array::value('q', $_GET), 'dashlet')) {

        elseif (strstr($_GET['q'] ?? '', 'dashlet')) {

          $defaults['status_id'] = CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_Activity', 'status_id', 'Scheduled');

        }

        return $defaults;

CRM/Activity/Form/ActivityView.php

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -103,7 +103,7 @@ public function preProcess() {
  
        $engagementLevel = $defaults['engagement_level'] ?? NULL;

        if ($engagementLevel) {

          $engagementLevels = CRM_Campaign_PseudoConstant::engagementLevel();

          $values['engagement_level'] = CRM_Utils_Array::value($engagementLevel, $engagementLevels, $engagementLevel);

          $values['engagement_level'] = $engagementLevels[$engagementLevel] ?? $engagementLevel;

        }

        $values['attachment'] = CRM_Core_BAO_File::attachmentInfo('civicrm_activity', $activityId);

CRM/Activity/Page/AJAX.php

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -26,7 +26,7 @@ public static function getCaseActivity() {
  
        $caseID = CRM_Utils_Type::validate($_GET['caseID'], 'Integer');

        $contactID = CRM_Utils_Type::validate($_GET['cid'], 'Integer');

        $userID = CRM_Utils_Type::validate($_GET['userID'], 'Integer');

        $context = CRM_Utils_Type::validate(CRM_Utils_Array::value('context', $_GET), 'String');

        $context = CRM_Utils_Type::validate($_GET['context'] ?? NULL, 'String');

        $optionalParameters = [

          'source_contact_id' => 'Integer',

CRM/Activity/Selector/Activity.php

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -420,7 +420,7 @@ public function &getRows($action, $offset, $rowCount, $sort, $output = NULL, $ca
  
          $engagementLevel = $row['engagement_level'] ?? NULL;

          if ($engagementLevel) {

            $row['engagement_level'] = CRM_Utils_Array::value($engagementLevel, $engagementLevels, $engagementLevel);

            $row['engagement_level'] = $engagementLevels[$engagementLevel] ?? $engagementLevel;

          }

          $actionLinks = $this->actionLinks($row['activity_type_id'],

CRM/Activity/Selector/Search.php

-Original file line number
+Diff line change
@@ Expand Up @@
           $engagementLevel = $row['activity_engagement_level'] ?? NULL;
           if ($engagementLevel) {
-            $row['activity_engagement_level'] = CRM_Utils_Array::value($engagementLevel,
-              $engagementLevels, $engagementLevel
-            );
+            $row['activity_engagement_level'] = $engagementLevels[$engagementLevel] ?? $engagementLevel;
           }
           // Check if recurring activity.
@@ Expand Down @@

CRM/Admin/Form/Options.php

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -39,12 +39,6 @@ class CRM_Admin_Form_Options extends CRM_Admin_Form {
  
       */

      protected $_gLabel;

      /**

       * Is this Option Group Domain Specific

       * @var bool

       */

      protected $_domainSpecific = FALSE;

      /**

       * @var bool

       */

    @@ -88,7 +82,6 @@ public function preProcess() {
  
          'name'

        );

        $this->_gLabel = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_OptionGroup', $this->_gid, 'title');

        $this->_domainSpecific = CRM_Core_OptionGroup::isDomainOptionGroup($this->_gName);

        $url = "civicrm/admin/options/{$this->_gName}";

        $params = "reset=1";

    @@ -115,12 +108,6 @@ public function preProcess() {
  
        $session->pushUserContext(CRM_Utils_System::url($url, $params));

        $this->assign('id', $this->_id);

        $this->setDeleteMessage();

        if ($this->_id && CRM_Core_OptionGroup::isDomainOptionGroup($this->_gName)) {

          $domainID = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_OptionValue', $this->_id, 'domain_id', 'id');

          if (CRM_Core_Config::domainID() != $domainID) {

            CRM_Core_Error::statusBounce(ts('You do not have permission to access this page.'));

          }

        }

        if ($this->isSubmitted()) {

          // The custom data fields are added to the form by an ajax form.

          // However, if they are not present in the element index they will

    @@ -160,7 +147,7 @@ public function setDefaultValues() {
  
          'postal_greeting',

          'addressee',

        ])) {

          $defaults['contact_type_id'] = (CRM_Utils_Array::value('filter', $defaults)) ? $defaults['filter'] : NULL;

          $defaults['contact_type_id'] = !empty($defaults['filter']) ? $defaults['filter'] : NULL;

        }

        // CRM-11516

        if ($this->_gName == 'payment_instrument' && $this->_id) {

    @@ -221,7 +208,7 @@ public function buildQuickForm(): void {
  
          $this->addRule('value',

            ts('This Value already exists in the database for this option group. Please select a different Value.'),

            'optionExists',

            ['CRM_Core_DAO_OptionValue', $this->_id, $this->_gid, 'value', $this->_domainSpecific]

            ['CRM_Core_DAO_OptionValue', $this->_id, $this->_gid, 'value']

          );

        }

    @@ -239,7 +226,7 @@ public function buildQuickForm(): void {
  
          $this->addRule('label',

            ts('This Label already exists in the database for this option group. Please select a different Label.'),

            'optionExists',

            ['CRM_Core_DAO_OptionValue', $this->_id, $this->_gid, 'label', $this->_domainSpecific]

            ['CRM_Core_DAO_OptionValue', $this->_id, $this->_gid, 'label']

          );

        }

    @@ -499,7 +486,7 @@ public function postProcess() {
  
          if (CRM_Core_BAO_OptionValue::deleteRecord(['id' => $this->_id])) {

            if ($this->_gName == 'phone_type') {

              CRM_Core_BAO_Phone::setOptionToNull(CRM_Utils_Array::value('value', $this->_defaultValues));

              CRM_Core_BAO_Phone::setOptionToNull($this->_defaultValues['value'] ?? NULL);

            }

            CRM_Core_Session::setStatus(ts('Selected %1 type has been deleted.', [1 => $this->_gLabel]), ts('Record Deleted'), 'success');

CRM/Admin/Form/PaymentProcessor.php

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -416,7 +416,7 @@ public function postProcess() {
  
      public function updatePaymentProcessor($values, $domainID, $test) {

        if ($test) {

          foreach (['user_name', 'password', 'signature', 'url_site', 'url_recur', 'url_api', 'url_button', 'subject'] as $field) {

            $values[$field] = empty($values["test_{$field}"]) ? CRM_Utils_Array::value($field, $values) : $values["test_{$field}"];

            $values[$field] = empty($values["test_{$field}"]) ? ($values[$field] ?? NULL) : $values["test_{$field}"];

          }

        }

        if (!empty($values['accept_credit_cards'])) {

CRM/Admin/Form/Setting/Localization.php

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -110,9 +110,7 @@ public function buildQuickForm() {
  
       */

      public static function formRule($fields) {

        $errors = [];

        if (($fields['monetaryThousandSeparator'] ?? NULL) ==

          CRM_Utils_Array::value('monetaryDecimalPoint', $fields)

        ) {

        if (($fields['monetaryThousandSeparator'] ?? NULL) == ($fields['monetaryDecimalPoint'] ?? NULL)) {

          $errors['monetaryThousandSeparator'] = ts('Thousands Separator and Decimal Delimiter can not be the same.');

        }

    @@ -200,7 +198,7 @@ public function postProcess() {
  
        }

        // if we manipulated the language list, return to the localization admin screen

        $return = (bool) (CRM_Utils_Array::value('makeMultilingual', $values) or CRM_Utils_Array::value('addLanguage', $values));

        $return = (!empty($values['makeMultilingual']) || !empty($values['addLanguage']));

        // Update enabled currencies

        // we do this only to initialize monetary decimal point and thousand separator

    @@ -221,7 +219,7 @@ public function postProcess() {
  
        unset($filteredValues['addLanguage']);

        unset($filteredValues['languageLimit']);

        Civi::settings()->set('languageLimit', CRM_Utils_Array::value('languageLimit', $values));

        Civi::settings()->set('languageLimit', $values['languageLimit'] ?? NULL);

        // save all the settings

        parent::commonProcess($filteredValues);

CRM/Admin/Form/Setting/Mail.php

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -40,14 +40,12 @@ public static function formRule($fields) {
  
          if ($fields['mailerJobSize'] < 1000) {

            $errors['mailerJobSize'] = ts('The job size must be at least 1000 or set to 0 (unlimited).');

          }

          elseif ($fields['mailerJobSize'] <

            CRM_Utils_Array::value('mailerBatchLimit', $fields)

          ) {

          elseif ($fields['mailerJobSize'] < ($fields['mailerBatchLimit'] ?? 0)) {

            $errors['mailerJobSize'] = ts('A job size smaller than the batch limit will negate the effect of the batch limit.');

          }

        }

        // dev/core#1768 Check the civimail_sync_interval setting.

        if (CRM_Utils_Array::value('civimail_sync_interval', $fields) < 1) {

        if (($fields['civimail_sync_interval'] ?? 0) < 1) {

          $errors['civimail_sync_interval'] = ts('Error - the synchronization interval must be at least 1');

        }

        return empty($errors) ? TRUE : $errors;

CRM/Admin/Form/Setting/Smtp.php

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -60,11 +60,11 @@ public function buildQuickForm() {
  
        $this->setTitle(ts('Settings - Outbound Mail'));

        $this->add('text', 'sendmail_path', ts('Sendmail Path'));

        $this->add('text', 'sendmail_args', ts('Sendmail Argument'));

        $this->add('text', 'smtpServer', ts('SMTP Server'), CRM_Utils_Array::value('smtpServer', $props));

        $this->add('text', 'smtpPort', ts('SMTP Port'), CRM_Utils_Array::value('smtpPort', $props));

        $this->addYesNo('smtpAuth', ts('Authentication?'), CRM_Utils_Array::value('smtpAuth', $props));

        $this->addElement('text', 'smtpUsername', ts('SMTP Username'), CRM_Utils_Array::value('smtpUsername', $props));

        $this->addElement('password', 'smtpPassword', ts('SMTP Password'), CRM_Utils_Array::value('smtpPassword', $props));

        $this->add('text', 'smtpServer', ts('SMTP Server'), $props['smtpServer'] ?? NULL);

        $this->add('text', 'smtpPort', ts('SMTP Port'), $props['smtpPort'] ?? NULL);

        $this->addYesNo('smtpAuth', ts('Authentication?'), $props['smtpAuth'] ?? NULL);

        $this->addElement('text', 'smtpUsername', ts('SMTP Username'), $props['smtpUsername'] ?? NULL);

        $this->addElement('password', 'smtpPassword', ts('SMTP Password'), $props['smtpPassword'] ?? NULL);

        $this->_testButtonName = $this->getButtonName('refresh', 'test');

CRM/Admin/Form/Setting/UpdateConfigBackend.php

This file was deleted.

CRM/Admin/Form/SettingTrait.php

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -130,7 +130,7 @@ protected function getSettingMetadata($setting) {
  
       * @return mixed

       */

      protected function getSettingMetadataItem($setting, $item) {

        return CRM_Utils_Array::value($item, $this->getSettingsMetaData()[$setting]);

        return $this->getSettingsMetaData()[$setting][$item] ?? NULL;

      }

      /**

CRM/Admin/Page/AJAX.php

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -303,7 +303,7 @@ public static function getStatusMsg() {
  
      public static function getTagTree() {

        CRM_Core_Page_AJAX::validateAjaxRequestMethod();

        $parent = CRM_Utils_Type::escape(($_GET['parent_id'] ?? 0), 'Integer');

        $substring = CRM_Utils_Type::escape(CRM_Utils_Array::value('str', $_GET), 'String');

        $substring = CRM_Utils_Type::escape($_GET['str'] ?? NULL, 'String');

        $result = [];

        $whereClauses = ['is_tagset <> 1'];

CRM/Badge/BAO/Badge.php

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -181,17 +181,17 @@ public function labelCreator($formattedRow, $cellspacing = 0) {
  
        $startOffset = 0;

        if (!empty($formattedRow['image_1'])) {

          $this->printImage($formattedRow['image_1'], NULL, NULL, CRM_Utils_Array::value('width_image_1', $formattedRow),

            CRM_Utils_Array::value('height_image_1', $formattedRow));

          $this->printImage($formattedRow['image_1'], NULL, NULL, $formattedRow['width_image_1'] ?? NULL,

            $formattedRow['height_image_1'] ?? NULL);

        }

        if (!empty($formattedRow['image_2'])) {

          $this->printImage($formattedRow['image_2'], $x + 68, NULL, CRM_Utils_Array::value('width_image_2', $formattedRow),

            CRM_Utils_Array::value('height_image_2', $formattedRow));

          $this->printImage($formattedRow['image_2'], $x + 68, NULL, $formattedRow['width_image_2'] ?? NULL,

            $formattedRow['height_image_2'] ?? NULL);

        }

        if ((CRM_Utils_Array::value('height_image_1', $formattedRow) >

            CRM_Utils_Array::value('height_image_2', $formattedRow)) && !empty($formattedRow['height_image_1'])

        if ((($formattedRow['height_image_1'] ?? 0) >

            ($formattedRow['height_image_2'] ?? 0)) && !empty($formattedRow['height_image_1'])

        ) {

          $startOffset = $formattedRow['height_image_1'] ?? NULL;

        }

    @@ -213,7 +213,7 @@ public function labelCreator($formattedRow, $cellspacing = 0) {
  
            default:

              break;

          }

          $this->pdf->Image($formattedRow['participant_image'], $x + $imageAlign, $y + $startOffset, CRM_Utils_Array::value('width_participant_image', $formattedRow), CRM_Utils_Array::value('height_participant_image', $formattedRow));

          $this->pdf->Image($formattedRow['participant_image'], $x + $imageAlign, $y + $startOffset, $formattedRow['width_participant_image'] ?? NULL, $formattedRow['height_participant_image'] ?? NULL);

          if ($startOffset == NULL && !empty($formattedRow['height_participant_image'])) {

            $startOffset = $formattedRow['height_participant_image'];

          }

CRM/Badge/Form/Layout.php

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -148,7 +148,7 @@ public function setDefaultValues() {
  
        }

        // its ok if there is no element called is_active

        $defaults['is_active'] = ($this->_id) ? CRM_Utils_Array::value('is_active', $defaults) : 1;

        $defaults['is_active'] = ($this->_id) ? ($defaults['is_active'] ?? NULL) : 1;

        return $defaults;

      }

CRM/Batch/Form/Entry.php

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -413,7 +413,7 @@ public static function formRule($params, $files, $self) {
  
          if (!empty($params['soft_credit_contact_id'][$key]) && empty($params['soft_credit_amount'][$key])) {

            $errors["soft_credit_amount[$key]"] = ts('Please enter the soft credit amount.');

          }

          if (!empty($params['soft_credit_amount']) && !empty($params['soft_credit_amount'][$key]) && CRM_Utils_Rule::cleanMoney(CRM_Utils_Array::value($key, $params['soft_credit_amount'])) > CRM_Utils_Rule::cleanMoney($value['total_amount'])) {

          if (!empty($params['soft_credit_amount'][$key]) && CRM_Utils_Rule::cleanMoney($params['soft_credit_amount'][$key]) > CRM_Utils_Rule::cleanMoney($value['total_amount'])) {

            $errors["soft_credit_amount[$key]"] = ts('Soft credit amount should not be greater than the total amount');

          }

    @@ -671,10 +671,7 @@ private function processContribution(array &$params): bool {
  
                [$products, $options] = CRM_Contribute_BAO_Premium::getPremiumProductInfo();

                $value['hidden_Premium'] = 1;

                $value['product_option'] = CRM_Utils_Array::value(

                  $value['product_name'][1],

                  $options[$value['product_name'][0]]

                );

                $value['product_option'] = $options[$value['product_name'][0]][$value['product_name'][1]] ?? NULL;

                $premiumParams = [

                  'product_id' => $value['product_name'][0],

CRM/Campaign/Form/SurveyType.php

-Original file line number
+Diff line change
@@ Expand Up / @@ -57,13 +57,6 @@ public function preProcess() { @@
         $session = CRM_Core_Session::singleton();
         $url = CRM_Utils_System::url('civicrm/admin/campaign/surveyType', 'reset=1');
         $session->pushUserContext($url);
-        if ($this->_id && CRM_Core_OptionGroup::isDomainOptionGroup($this->_gName)) {
-          $domainID = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_OptionValue', $this->_id, 'domain_id', 'id');
-          if (CRM_Core_Config::domainID() != $domainID) {
-            CRM_Core_Error::statusBounce(ts('You do not have permission to access this page.'));
-          }
-        }
       }
       /**
@@ Expand Down @@

CRM/Campaign/Form/Task/Interview.php

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -70,8 +70,8 @@ public function preProcess() {
  
        else {

          parent::preProcess();

          //get the survey id from user submitted values.

          $this->_surveyId = CRM_Utils_Array::value('campaign_survey_id', $this->get('formValues'));

          $this->_interviewerId = CRM_Utils_Array::value('survey_interviewer_id', $this->get('formValues'));

          $this->_surveyId = $this->get('formValues')['campaign_survey_id'] ?? NULL;

          $this->_interviewerId = $this->get('formValues')['survey_interviewer_id'] ?? NULL;

        }

        if ($this->_surveyId) {

CRM/Campaign/Form/Task/Release.php

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -61,8 +61,8 @@ public function preProcess() {
  
        else {

          parent::preProcess();

          //get the survey id from user submitted values.

          $this->_surveyId = CRM_Utils_Array::value('campaign_survey_id', $this->get('formValues'));

          $this->_interviewerId = CRM_Utils_Array::value('survey_interviewer_id', $this->get('formValues'));

          $this->_surveyId = $this->get('formValues')['campaign_survey_id'] ?? NULL;

          $this->_interviewerId = $this->get('formValues')['survey_interviewer_id'] ?? NULL;

        }

        if (!$this->_surveyId) {

CRM/Campaign/Page/Petition/ThankYou.php

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -33,7 +33,7 @@ public function run() {
  
        $this->assign('survey_id', $petition_id);

        $this->assign('status_id', $id);

        $this->assign('is_share', $petition['is_share'] ?? NULL);

        CRM_Utils_System::setTitle(CRM_Utils_Array::value('thankyou_title', $petition));

        CRM_Utils_System::setTitle($petition['thankyou_title'] ?? NULL);

        // send thank you or email verification emails

        /*

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove default theme #9

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Remove default theme #9

Are you sure you want to change the base?

Uh oh!

Remove default theme #9

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!