Merge pull request #103 from constantcontact/development

Merge to Master
constantcontact · Jun 29, 2015 · 053b457 · 053b457
2 parents c9f68d7 + 0aa1c72
commit 053b457
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 deletions.
diff --git a/examples/getAccessToken.php b/examples/getAccessToken.php
@@ -38,8 +38,8 @@
     if (isset($_GET['error'])) {
         echo '<span class="label label-important">OAuth2 Error!</span>';
         echo '<div class="container alert-error"><pre class="failure-pre">';
-        echo 'Error: ' . $_GET['error'];
-        echo '<br />Description: ' . $_GET['error_description'];
+        echo 'Error: ' . htmlspecialchars( $_GET['error'] );
+        echo '<br />Description: ' . htmlspecialchars( $_GET['error_description'] );
         echo '</pre></div>';
         die();
     }
@@ -51,14 +51,14 @@
         } catch (OAuth2Exception $ex) {
             echo '<span class="label label-important">OAuth2 Error!</span>';
             echo '<div class="container alert-error"><pre class="failure-pre">';
-            echo 'Error: ' . $ex->getMessage();
+            echo 'Error: ' . htmlspecialchars( $ex->getMessage() );
             echo '</pre></div>';
             die();
         }
 
         echo '<span class="label label-success">Access Token Retrieved!</span>';
         echo '<div class="container alert-success"><pre class="success-pre">';
-        print_r($accessToken);
+        print_r( htmlspecialchars( $accessToken ) );
         echo '</pre></div>';
 
     } else {

diff --git a/src/Ctct/Components/Activities/AddContacts.php b/src/Ctct/Components/Activities/AddContacts.php
@@ -56,6 +56,16 @@ public function __construct(Array $contacts, Array $lists, Array $columnNames =
             if (isset($contact->home_phone)) {
                 $usedColumns[] = Config::get('activities_columns.home_phone');
             }
+
+            if (isset($contact->birthday_day)) {
+                $usedColumns[] = Config::get('activities_columns.birthday_day');
+            }
+            if (isset($contact->birthday_month)) {
+                $usedColumns[] = Config::get('activities_columns.birthday_month');
+            }
+            if (isset($contact->anniversary)) {
+                $usedColumns[] = Config::get('activities_columns.anniversary');
+            }
 
             // Addresses
             if (!empty($contact->addresses)) {

diff --git a/src/Ctct/Components/Activities/AddContactsImportData.php b/src/Ctct/Components/Activities/AddContactsImportData.php
@@ -21,7 +21,11 @@ class AddContactsImportData extends Component
     public $company_name;
     public $work_phone;
     public $home_phone;
-
+
+    public $birthday_day;
+    public $birthday_month;
+    public $anniversary;
+
     public $email_addresses = array();
     public $addresses = array();
     public $custom_fields = array();

diff --git a/test/Json/Campaigns/get_campaign.json b/test/Json/Campaigns/get_campaign.json
@@ -47,8 +47,6 @@
         "bounces": 18,
         "spam_count": 1
     },
-    "archive_status": "PENDING",
-    "archive_url": "http://archive.l1.constantcontact.com/fs136/1100394124185/archive/1100394165290.html",
     "is_visible_in_ui": false,
     "sent_to_contact_lists": [
         {