From 7e6e8bd6c83bc98a8cefaa760a2b3d0fb91cbfe9 Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Tue, 28 Oct 2014 17:16:29 -0700 Subject: [PATCH] CiviMail - Change tabs to spaces. Whitespace. --- CRM/Mailing/BAO/Mailing.php | 6 +- api/v3/Mailing.php | 177 ++++++++++----------- api/v3/MailingGroup.php | 38 +++-- api/v3/MailingRecipients.php | 5 +- js/angular-Mailing.js | 23 +-- js/angular-crmMailingAB.js | 17 +- partials/crmMailing/attachments.html | 56 ++++--- partials/crmMailing/composeonScreen.html | 16 +- partials/crmMailing/content.html | 112 ++++++------- partials/crmMailing/headerandFooter.html | 32 ++-- partials/crmMailing/ht.html | 4 +- partials/crmMailing/mailingGroup.html | 10 +- partials/crmMailing/main.html | 32 ++-- partials/crmMailing/plainText.html | 4 +- partials/crmMailing/previewMailing.html | 14 +- partials/crmMailing/preview_ht.html | 22 +-- partials/crmMailing/preview_plaintext.html | 20 +-- partials/crmMailing/sched.html | 48 +++--- partials/crmMailing/send.html | 12 +- partials/crmMailing/test.html | 44 ++--- partials/crmMailing/trackandRespond.html | 176 ++++++++++---------- partials/crmMailing/uploadContent.html | 24 +-- 22 files changed, 439 insertions(+), 453 deletions(-) diff --git a/CRM/Mailing/BAO/Mailing.php b/CRM/Mailing/BAO/Mailing.php index dd8679f051..7785ec4284 100644 --- a/CRM/Mailing/BAO/Mailing.php +++ b/CRM/Mailing/BAO/Mailing.php @@ -1633,7 +1633,7 @@ ORDER BY civicrm_email.is_bulkmail DESC $mg->search_args = $params['search_args']; $mg->group_type = 'Include'; $mg->save(); - } + } // check and attach and files as needed CRM_Core_BAO_File::processAttachment($params, 'civicrm_mailing', $mailing->id); @@ -1658,8 +1658,8 @@ ORDER BY civicrm_email.is_bulkmail DESC // Populate the recipients. $mailing->getRecipients($job->id, $mailing->id, NULL, NULL, TRUE, FALSE); } - //print_r($params); - //exit; + //print_r($params); + //exit; return $mailing; } diff --git a/api/v3/Mailing.php b/api/v3/Mailing.php index b653d154a4..720da93588 100755 --- a/api/v3/Mailing.php +++ b/api/v3/Mailing.php @@ -50,34 +50,31 @@ * @return array API Success Array */ function civicrm_api3_mailing_create($params, $ids = array()) { - return _civicrm_api3_basic_create(_civicrm_api3_get_BAO(__FUNCTION__), $params); + return _civicrm_api3_basic_create(_civicrm_api3_get_BAO(__FUNCTION__), $params); } function civicrm_api3_mailing_get_token($params) { - if (!array_key_exists("usage", $params)) { - throw new API_Exception('Mandatory keys missing from params array: entity'); - } - - $tokens = CRM_Core_SelectValues::contactTokens(); - switch ($params['usage']) { - case 'Mailing' : - $tokens = array_merge(CRM_Core_SelectValues::mailingTokens(), $tokens); - break; - case 'ScheduleEventReminder' : - $tokens = array_merge(CRM_Core_SelectValues::activityTokens(), $tokens); - $tokens = array_merge(CRM_Core_SelectValues::eventTokens(), $tokens); - $tokens = array_merge(CRM_Core_SelectValues::membershipTokens(), $tokens); - break; - case 'ManageEventScheduleReminder' : - $tokens = array_merge(CRM_Core_SelectValues::eventTokens(), $tokens); - break; - } - - return CRM_Utils_Token::formatTokensForDisplay($tokens); - -} + if (!array_key_exists("usage", $params)) { + throw new API_Exception('Mandatory keys missing from params array: entity'); + } + $tokens = CRM_Core_SelectValues::contactTokens(); + switch ($params['usage']) { + case 'Mailing' : + $tokens = array_merge(CRM_Core_SelectValues::mailingTokens(), $tokens); + break; + case 'ScheduleEventReminder' : + $tokens = array_merge(CRM_Core_SelectValues::activityTokens(), $tokens); + $tokens = array_merge(CRM_Core_SelectValues::eventTokens(), $tokens); + $tokens = array_merge(CRM_Core_SelectValues::membershipTokens(), $tokens); + break; + case 'ManageEventScheduleReminder' : + $tokens = array_merge(CRM_Core_SelectValues::eventTokens(), $tokens); + break; + } + return CRM_Utils_Token::formatTokensForDisplay($tokens); +} /** * Adjust Metadata for Create action @@ -104,7 +101,7 @@ function _civicrm_api3_mailing_create_spec(&$params) { * @return array API Success Array */ function civicrm_api3_mailing_delete($params, $ids = array()) { - return _civicrm_api3_basic_delete(_civicrm_api3_get_BAO(__FUNCTION__), $params); + return _civicrm_api3_basic_delete(_civicrm_api3_get_BAO(__FUNCTION__), $params); } @@ -115,7 +112,7 @@ function civicrm_api3_mailing_delete($params, $ids = array()) { * @return array */ function civicrm_api3_mailing_get($params) { - return _civicrm_api3_basic_get(_civicrm_api3_get_BAO(__FUNCTION__), $params); + return _civicrm_api3_basic_get(_civicrm_api3_get_BAO(__FUNCTION__), $params); } /** @@ -127,19 +124,18 @@ function civicrm_api3_mailing_get($params) { * @return array */ function civicrm_api3_mailing_event_bounce($params) { + $body = $params['body']; + unset($params['body']); - $body = $params['body']; - unset($params['body']); - - $params += CRM_Mailing_BAO_BouncePattern::match($body); + $params += CRM_Mailing_BAO_BouncePattern::match($body); - if (CRM_Mailing_Event_BAO_Bounce::create($params)) { - return civicrm_api3_create_success($params); - } - else { - throw new API_Exception(ts('Queue event could not be found'),'no_queue_event + if (CRM_Mailing_Event_BAO_Bounce::create($params)) { + return civicrm_api3_create_success($params); + } + else { + throw new API_Exception(ts('Queue event could not be found'),'no_queue_event '); - } + } } /** @@ -168,7 +164,7 @@ function _civicrm_api3_mailing_event_bounce_spec(&$params) { * @return array */ function civicrm_api3_mailing_event_confirm($params) { - return civicrm_api('mailing_event_confirm', 'create', $params); + return civicrm_api('mailing_event_confirm', 'create', $params); } /** @@ -187,23 +183,23 @@ function _civicrm_api3_mailing_deprecation() { * @return array */ function civicrm_api3_mailing_event_reply($params) { - $job = $params['job_id']; - $queue = $params['event_queue_id']; - $hash = $params['hash']; - $replyto = $params['replyTo']; - $bodyTxt = CRM_Utils_Array::value('bodyTxt', $params); - $bodyHTML = CRM_Utils_Array::value('bodyHTML', $params); - $fullEmail = CRM_Utils_Array::value('fullEmail', $params); - - $mailing = CRM_Mailing_Event_BAO_Reply::reply($job, $queue, $hash, $replyto); - - if (empty($mailing)) { - return civicrm_api3_create_error('Queue event could not be found'); - } + $job = $params['job_id']; + $queue = $params['event_queue_id']; + $hash = $params['hash']; + $replyto = $params['replyTo']; + $bodyTxt = CRM_Utils_Array::value('bodyTxt', $params); + $bodyHTML = CRM_Utils_Array::value('bodyHTML', $params); + $fullEmail = CRM_Utils_Array::value('fullEmail', $params); + + $mailing = CRM_Mailing_Event_BAO_Reply::reply($job, $queue, $hash, $replyto); + + if (empty($mailing)) { + return civicrm_api3_create_error('Queue event could not be found'); + } - CRM_Mailing_Event_BAO_Reply::send($queue, $mailing, $bodyTxt, $replyto, $bodyHTML, $fullEmail); + CRM_Mailing_Event_BAO_Reply::send($queue, $mailing, $bodyTxt, $replyto, $bodyHTML, $fullEmail); - return civicrm_api3_create_success($params); + return civicrm_api3_create_success($params); } /** @@ -231,20 +227,20 @@ function _civicrm_api3_mailing_event_reply_spec(&$params) { * @return array */ function civicrm_api3_mailing_event_forward($params) { - $job = $params['job_id']; - $queue = $params['event_queue_id']; - $hash = $params['hash']; - $email = $params['email']; - $fromEmail = CRM_Utils_Array::value('fromEmail', $params); - $params = CRM_Utils_Array::value('params', $params); + $job = $params['job_id']; + $queue = $params['event_queue_id']; + $hash = $params['hash']; + $email = $params['email']; + $fromEmail = CRM_Utils_Array::value('fromEmail', $params); + $params = CRM_Utils_Array::value('params', $params); - $forward = CRM_Mailing_Event_BAO_Forward::forward($job, $queue, $hash, $email, $fromEmail, $params); + $forward = CRM_Mailing_Event_BAO_Forward::forward($job, $queue, $hash, $email, $fromEmail, $params); - if ($forward) { - return civicrm_api3_create_success($params); - } + if ($forward) { + return civicrm_api3_create_success($params); + } - return civicrm_api3_create_error('Queue event could not be found'); + return civicrm_api3_create_error('Queue event could not be found'); } /** @@ -272,23 +268,22 @@ function _civicrm_api3_mailing_event_forward_spec(&$params) { * @return array */ function civicrm_api3_mailing_event_click($params) { + civicrm_api3_verify_mandatory($params, + 'CRM_Mailing_Event_DAO_TrackableURLOpen', + array('event_queue_id', 'url_id'), + FALSE + ); - civicrm_api3_verify_mandatory($params, - 'CRM_Mailing_Event_DAO_TrackableURLOpen', - array('event_queue_id', 'url_id'), - FALSE - ); - - $url_id = $params['url_id']; - $queue = $params['event_queue_id']; + $url_id = $params['url_id']; + $queue = $params['event_queue_id']; - $url = CRM_Mailing_Event_BAO_TrackableURLOpen::track($queue, $url_id); + $url = CRM_Mailing_Event_BAO_TrackableURLOpen::track($queue, $url_id); - $values = array(); - $values['url'] = $url; - $values['is_error'] = 0; + $values = array(); + $values['url'] = $url; + $values['is_error'] = 0; - return civicrm_api3_create_success($values); + return civicrm_api3_create_success($values); } /** @@ -300,20 +295,20 @@ function civicrm_api3_mailing_event_click($params) { */ function civicrm_api3_mailing_event_open($params) { - civicrm_api3_verify_mandatory($params, - 'CRM_Mailing_Event_DAO_Opened', - array('event_queue_id'), - FALSE - ); + civicrm_api3_verify_mandatory($params, + 'CRM_Mailing_Event_DAO_Opened', + array('event_queue_id'), + FALSE + ); - $queue = $params['event_queue_id']; - $success = CRM_Mailing_Event_BAO_Opened::open($queue); + $queue = $params['event_queue_id']; + $success = CRM_Mailing_Event_BAO_Opened::open($queue); - if (!$success) { - return civicrm_api3_create_error('mailing open event failed'); - } + if (!$success) { + return civicrm_api3_create_error('mailing open event failed'); + } - return civicrm_api3_create_success($params); + return civicrm_api3_create_success($params); } function civicrm_api3_mailing_preview($params) { @@ -496,9 +491,9 @@ function civicrm_api3_mailing_stats($params) { * Both the min and max days can be set via the params */ function civicrm_api3_mailing_update_email_resetdate($params) { - CRM_Mailing_Event_BAO_Delivered::updateEmailResetDate( - CRM_Utils_Array::value('minDays', $params, 3), - CRM_Utils_Array::value('maxDays', $params, 3) - ); - return civicrm_api3_create_success(); + CRM_Mailing_Event_BAO_Delivered::updateEmailResetDate( + CRM_Utils_Array::value('minDays', $params, 3), + CRM_Utils_Array::value('maxDays', $params, 3) + ); + return civicrm_api3_create_success(); } diff --git a/api/v3/MailingGroup.php b/api/v3/MailingGroup.php index edefc0843b..117c82dbf6 100644 --- a/api/v3/MailingGroup.php +++ b/api/v3/MailingGroup.php @@ -54,7 +54,7 @@ function _civicrm_api3_mailing_group_deprecation() { * @return array */ function civicrm_api3_mailing_group_event_unsubscribe($params) { - return civicrm_api('mailing_event_unsubscribe', 'create', $params); + return civicrm_api('mailing_event_unsubscribe', 'create', $params); } /** @@ -66,8 +66,8 @@ function civicrm_api3_mailing_group_event_unsubscribe($params) { * @return array */ function civicrm_api3_mailing_group_event_domain_unsubscribe($params) { - $params['org_unsubscribe'] = 1; - return civicrm_api('mailing_event_unsubscribe', 'create', $params); + $params['org_unsubscribe'] = 1; + return civicrm_api('mailing_event_unsubscribe', 'create', $params); } /** @@ -79,7 +79,7 @@ function civicrm_api3_mailing_group_event_domain_unsubscribe($params) { * @return array */ function civicrm_api3_mailing_group_event_resubscribe($params) { - return civicrm_api('mailing_event_resubscribe', 'create', $params); + return civicrm_api('mailing_event_resubscribe', 'create', $params); } /** @@ -91,7 +91,7 @@ function civicrm_api3_mailing_group_event_resubscribe($params) { * @return array */ function civicrm_api3_mailing_group_event_subscribe($params) { - return civicrm_api('mailing_event_subscribe', 'create', $params); + return civicrm_api('mailing_event_subscribe', 'create', $params); } /** @@ -103,28 +103,26 @@ function civicrm_api3_mailing_group_get($params) { return _civicrm_api3_basic_get(_civicrm_api3_get_BAO(__FUNCTION__), $params); } - function civicrm_api3_mailing_group_delete($params, $ids = array()) { return _civicrm_api3_basic_delete(_civicrm_api3_get_BAO(__FUNCTION__), $params); } function civicrm_api3_mailing_group_getfields($params) { - $dao = _civicrm_api3_get_DAO('Subscribe'); - $d = new $dao(); - $fields = $d->fields(); - $d->free(); + $dao = _civicrm_api3_get_DAO('Subscribe'); + $d = new $dao(); + $fields = $d->fields(); + $d->free(); - $dao = _civicrm_api3_get_DAO('Unsubscribe'); - $d = new $dao(); - $fields = $fields + $d->fields(); - $d->free(); + $dao = _civicrm_api3_get_DAO('Unsubscribe'); + $d = new $dao(); + $fields = $fields + $d->fields(); + $d->free(); - // CRM-13830 - prevent the api wrapper from helping out with pseudoconstants - // Since these fields don't belong to this entity it will fail - foreach ($fields as &$field) { - unset($field['pseudoconstant']); - } + // CRM-13830 - prevent the api wrapper from helping out with pseudoconstants + // Since these fields don't belong to this entity it will fail + foreach ($fields as &$field) { + unset($field['pseudoconstant']); + } return civicrm_api3_create_success($fields, $params, 'mailing_group', 'getfields'); } - diff --git a/api/v3/MailingRecipients.php b/api/v3/MailingRecipients.php index f230eb0dc4..60c0c93bea 100644 --- a/api/v3/MailingRecipients.php +++ b/api/v3/MailingRecipients.php @@ -53,8 +53,5 @@ * @access public */ function civicrm_api3_mailing_recipients_get($params, $ids = array()) { - return _civicrm_api3_basic_get(_civicrm_api3_get_BAO(__FUNCTION__), $params); + return _civicrm_api3_basic_get(_civicrm_api3_get_BAO(__FUNCTION__), $params); } - - - diff --git a/js/angular-Mailing.js b/js/angular-Mailing.js index a4c94fa81e..556d27da12 100644 --- a/js/angular-Mailing.js +++ b/js/angular-Mailing.js @@ -344,7 +344,8 @@ $scope.mailid.push(c); }); for(var a in chck) - { var b ={} + { + var b ={} b.id = chck[a]; var splt = chck[a].split(" "); @@ -431,9 +432,9 @@ resubscribe_id: $scope.currentMailing.resubscribe_id, body_html: $scope.currentMailing.body_html, body_text: $scope.currentMailing.body_text, - campaign_id: $scope.currentMailing.campaign_id==null ? "" : $scope.currentMailing.campaign_id, - header_id: $scope.currentMailing.header_id, - footer_id: $scope.currentMailing.footer_id, + campaign_id: $scope.currentMailing.campaign_id==null ? "" : $scope.currentMailing.campaign_id, + header_id: $scope.currentMailing.header_id, + footer_id: $scope.currentMailing.footer_id, groups: {include: $scope.incGrp, exclude: $scope.excGrp }, @@ -473,9 +474,9 @@ resubscribe_id: $scope.currentMailing.resubscribe_id, body_html: $scope.currentMailing.body_html, body_text: $scope.currentMailing.body_text, - campaign_id: $scope.currentMailing.campaign_id==null ? "" : $scope.currentMailing.campaign_id, - header_id: $scope.currentMailing.header_id, - footer_id: $scope.currentMailing.footer_id, + campaign_id: $scope.currentMailing.campaign_id==null ? "" : $scope.currentMailing.campaign_id, + header_id: $scope.currentMailing.header_id, + footer_id: $scope.currentMailing.footer_id, is_completed: $scope.currentMailing.is_completed, dedupe_email: $scope.currentMailing.dedupe_email }, @@ -522,9 +523,9 @@ body_text: $scope.currentMailing.body_text, scheduled_date: $scope.currentMailing.scheduled_date==null ? "" : $scope.currentMailing.scheduled_date, scheduled_id: $scope.currentMailing.scheduled_id==null ? "" : $scope.currentMailing.scheduled_id, - campaign_id: $scope.currentMailing.campaign_id==null ? "" : $scope.currentMailing.campaign_id, - header_id: $scope.currentMailing.header_id, - footer_id: $scope.currentMailing.footer_id, + campaign_id: $scope.currentMailing.campaign_id==null ? "" : $scope.currentMailing.campaign_id, + header_id: $scope.currentMailing.header_id, + footer_id: $scope.currentMailing.footer_id, is_completed: $scope.currentMailing.is_completed, approver_id: $scope.currentMailing.approver_id, approval_status_id: $scope.currentMailing.approval_status_id, @@ -612,7 +613,7 @@ }); -// Directive to go to the next tab +// Directive to go to the next tab crmMailing.directive('nexttab', function() { return { restrict: 'A', diff --git a/js/angular-crmMailingAB.js b/js/angular-crmMailingAB.js index 91bffd3f77..ba073cb290 100755 --- a/js/angular-crmMailingAB.js +++ b/js/angular-crmMailingAB.js @@ -994,14 +994,14 @@ return { restrict : 'AE', link: function(scope, element, attrs){ - - function format(item){ + + function format(item){ return item.label.replace(/&/g, '&') .replace(/"/g, '"') .replace(//g, '>'); } - + CRM.api3('OptionGroup', 'get', { "sequential": 1, "name": "from_email_address" @@ -1011,21 +1011,18 @@ "sequential": 1, "option_group_id": result.id }).done(function(orgEmails) { - + //$sce.trustAsHtml( - + $(element).select2({ class: "abtesting-form-element", data: orgEmails.values, formatResult: format, formatSelection: format, placeholder:"Select reply to address"}); - - }); - - }); - + }); + }); } }; }); diff --git a/partials/crmMailing/attachments.html b/partials/crmMailing/attachments.html index 85b7d47d39..472984385b 100644 --- a/partials/crmMailing/attachments.html +++ b/partials/crmMailing/attachments.html @@ -1,35 +1,33 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + +
Attach Files - - - -
Attach Files - - - -
Attach Files - - - -
Attach Files + + + +
Attach Files + + + +
Attach Files + + + +
- diff --git a/partials/crmMailing/composeonScreen.html b/partials/crmMailing/composeonScreen.html index a6b38a34e3..9424d086bc 100644 --- a/partials/crmMailing/composeonScreen.html +++ b/partials/crmMailing/composeonScreen.html @@ -1,17 +1,17 @@
- - + +
-   Save Template -
+   Save Template +
diff --git a/partials/crmMailing/content.html b/partials/crmMailing/content.html index 75696deb68..6ff40c4707 100644 --- a/partials/crmMailing/content.html +++ b/partials/crmMailing/content.html @@ -6,89 +6,89 @@ Required Variables: cool_api and currentMailing and fromAddress

- - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + +
From E-mail Address - -
Reply to E-mail Address - -
Mailing Subject - -
- Mailing subject required. -
Mailing Subject Token - -
Use Template - -
From E-mail Address + +
Reply to E-mail Address + +
Mailing Subject + +
+ Mailing subject required. +
Mailing Subject Token + +
Use Template + +

-
-
HTML Format
-
+
HTML Format
+

- + - + - + - +
diff --git a/partials/crmMailing/headerandFooter.html b/partials/crmMailing/headerandFooter.html index 0c1da434e4..afb9ade209 100644 --- a/partials/crmMailing/headerandFooter.html +++ b/partials/crmMailing/headerandFooter.html @@ -5,21 +5,21 @@ Required vars: currentMailing and headerfooter
- - - - - - - - + + + + + + + +
Mailing Header - -
Mailing Footer - -
Mailing Header + +
Mailing Footer + +
diff --git a/partials/crmMailing/ht.html b/partials/crmMailing/ht.html index df8f31dce8..afc3da4402 100644 --- a/partials/crmMailing/ht.html +++ b/partials/crmMailing/ht.html @@ -1,8 +1,8 @@
-
- +
+


diff --git a/partials/crmMailing/mailingGroup.html b/partials/crmMailing/mailingGroup.html index 3ba5aec882..57d218f64c 100644 --- a/partials/crmMailing/mailingGroup.html +++ b/partials/crmMailing/mailingGroup.html @@ -1,15 +1,15 @@


diff --git a/partials/crmMailing/main.html b/partials/crmMailing/main.html index 0fba3ce902..6307d73106 100644 --- a/partials/crmMailing/main.html +++ b/partials/crmMailing/main.html @@ -4,22 +4,22 @@ Submit Mailing is not functional yet --> -
- +
+ -
-
-
+
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
diff --git a/partials/crmMailing/plainText.html b/partials/crmMailing/plainText.html index 34b08de933..cbc4f740f5 100644 --- a/partials/crmMailing/plainText.html +++ b/partials/crmMailing/plainText.html @@ -3,8 +3,8 @@ Controller: MailCtrl Required vars: currentMailing -->
-
- +
+


diff --git a/partials/crmMailing/previewMailing.html b/partials/crmMailing/previewMailing.html index 7b1d265c49..0b817b5f78 100644 --- a/partials/crmMailing/previewMailing.html +++ b/partials/crmMailing/previewMailing.html @@ -1,17 +1,17 @@
-