diff --git a/campaign.php b/campaign.php index e64c494c..8ac2cc76 100644 --- a/campaign.php +++ b/campaign.php @@ -29,6 +29,19 @@ if(isset($_GET['campaign_id'])){ $campaign_badge_color = "secondary"; } + //Get Stat Counts + $sql = mysqli_query($mysqli,"SELECT message_id FROM campaign_messages WHERE message_sent_at IS NOT NULL AND message_campaign_id = $campaign_id"); + $sent_count = mysqli_num_rows($sql); + + $sql = mysqli_query($mysqli,"SELECT message_id FROM campaign_messages WHERE message_opened_at IS NOT NULL AND message_campaign_id = $campaign_id"); + $open_count = mysqli_num_rows($sql); + + $sql = mysqli_query($mysqli,"SELECT message_id FROM campaign_messages WHERE message_clicked_at IS NOT NULL AND message_campaign_id = $campaign_id"); + $click_count = mysqli_num_rows($sql); + + $sql = mysqli_query($mysqli,"SELECT message_id FROM campaign_messages WHERE message_bounced_at IS NOT NULL AND message_campaign_id = $campaign_id"); + $fail_count = mysqli_num_rows($sql); + ?>
    @@ -61,28 +74,28 @@ if(isset($_GET['campaign_id'])){
    Sent
    -

    18

    +

    Opened
    -

    10

    +

    Clicked
    -

    7

    +

    Failed
    -

    3

    +

    @@ -171,7 +184,9 @@ if(isset($_GET['campaign_id'])){ Client Name Contact Name Email + IP Sent + Opened @@ -179,19 +194,26 @@ if(isset($_GET['campaign_id'])){ while($row = mysqli_fetch_array($sql)){ $message_id = $row['message_id']; + $message_ip = $row['message_ip']; + $message_user_agent = $row['message_user_agent']; + $message_sent_at = $row['message_sent_at']; + $message_opened_at = $row['message_opened_at']; + $client_id = $row['client_id']; $client_name = $row['client_name']; $contact_id = $row['contact_id']; $contact_name = $row['contact_name']; $contact_email = $row['contact_email']; - $message_sent_at = $row['message_sent_at']; + ?> + + \ No newline at end of file diff --git a/campaigns.php b/campaigns.php index e68630c9..244f4f18 100644 --- a/campaigns.php +++ b/campaigns.php @@ -192,12 +192,25 @@ $campaign_badge_color = "secondary"; } + //Get Stat Counts + $sql = mysqli_query($mysqli,"SELECT message_id FROM campaign_messages WHERE message_sent_at IS NOT NULL AND message_campaign_id = $campaign_id"); + $sent_count = mysqli_num_rows($sql); + + $sql = mysqli_query($mysqli,"SELECT message_id FROM campaign_messages WHERE message_opened_at IS NOT NULL AND message_campaign_id = $campaign_id"); + $open_count = mysqli_num_rows($sql); + + $sql = mysqli_query($mysqli,"SELECT message_id FROM campaign_messages WHERE message_clicked_at IS NOT NULL AND message_campaign_id = $campaign_id"); + $click_count = mysqli_num_rows($sql); + + $sql = mysqli_query($mysqli,"SELECT message_id FROM campaign_messages WHERE message_bounced_at IS NOT NULL AND message_campaign_id = $campaign_id"); + $fail_count = mysqli_num_rows($sql); + ?> - - - - - - + + + diff --git a/cron-mailer.php b/cron-mailer.php index 265e7009..130820aa 100644 --- a/cron-mailer.php +++ b/cron-mailer.php @@ -49,6 +49,7 @@ while($row = mysqli_fetch_array($sql_companies)){ while($row = mysqli_fetch_array($sql_messages)){ $message_id = $row['message_id']; + $message_hash = $row['message_hash']; $client_id = $row['client_id']; $client_name = $row['client_name']; $contact_id = $row['contact_id']; @@ -80,6 +81,8 @@ while($row = mysqli_fetch_array($sql_companies)){ $mail->Subject = "$campaign_subject"; $mail->Body = "Hello $contact_name,

    $campaign_content

    + +


    ~
    $company_name
    $company_phone"; $mail->send(); diff --git a/post.php b/post.php index 77e5c744..fe8f919d 100644 --- a/post.php +++ b/post.php @@ -1676,10 +1676,12 @@ if(isset($_POST['add_campaign'])){ $contact_email = $row['contact_email']; //Check to see if the email has already been added if so don't add it - $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT(message_id) AS count FROM campaign_messages WHERE message_recipient_email = '$contact_email' AND message_campaign_id = $campaign_id")); + $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT(message_id) AS count FROM campaign_messages WHERE message_contact_id = $contact_id AND message_campaign_id = $campaign_id")); $count = $row['count']; if($count == 0){ - mysqli_query($mysqli,"INSERT INTO campaign_messages SET message_recipient_email = '$contact_email', message_created_at = NOW(), message_client_tag_id = $tag, message_contact_id = $contact_id, message_campaign_id = $campaign_id, company_id = $session_company_id"); + //Generate Unique hash + $message_hash = keygen(); + mysqli_query($mysqli,"INSERT INTO campaign_messages SET message_hash = '$message_hash', message_created_at = NOW(), message_client_tag_id = $tag, message_contact_id = $contact_id, message_campaign_id = $campaign_id, company_id = $session_company_id"); } } }