[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Guard against undefined username/pw

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/367427 )

Change subject: Guard against undefined username/pw
......................................................................

Guard against undefined username/pw

Change-Id: I4a3e008f3a4f4798e568b05b043d09a187f449a0
---
M 
sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnimailing/Load.php
1 file changed, 8 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/27/367427/1

diff --git 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnimailing/Load.php
 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnimailing/Load.php
index 781382c..0c827ee 100644
--- 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnimailing/Load.php
+++ 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnimailing/Load.php
@@ -15,12 +15,10 @@
  */
 function civicrm_api3_omnimailing_load($params) {
   $values = array();
-  $mailings = civicrm_api3('Omnimailing', 'get', array(
-    'mail_provider' => 'Silverpop',
+  $getParams = array(
+    'mail_provider' => $params['mail_provider'],
     'start_date' => $params['start_date'],
     'end_date' => $params['end_date'],
-    'username' => $params['username'],
-    'password' => $params['password'],
     'return' => array(
       'external_identifier',
       'subject',
@@ -38,7 +36,12 @@
       'number_bounced',
       'number_sent',
     ),
-  ));
+  );
+  if (isset($params['username']) && isset($params['password'])) {
+    $getParams['username'] = $params['username'];
+    $getParams['password'] = $params['password'];
+  }
+  $mailings = civicrm_api3('Omnimailing', 'get', $getParams);
 
   foreach ($mailings['values']  as $mailing) {
     $campaign = civicrm_api3('Campaign', 'replace', array(

-- 
To view, visit https://gerrit.wikimedia.org/r/367427
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4a3e008f3a4f4798e568b05b043d09a187f449a0
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Ejegg <ej...@ejegg.com>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits