From efb85a00e794b0d23f97fde1ce622f900542af33 Mon Sep 17 00:00:00 2001
From: Daniel Barreto <daniel.barreto@beeznest.com>
Date: Tue, 24 Feb 2015 16:17:00 -0500
Subject: [PATCH] Fix mails to admin - refs BT#9092

---
 .../advanced_subscription/cron/notify_by_mail.php   | 13 ++++++-------
 .../src/AdvancedSubscriptionPlugin.php              |  3 ++-
 .../views/reminder_notice_superior_max.tpl          |  2 +-
 .../views/student_no_superior_notice_admin.tpl      |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/plugin/advanced_subscription/cron/notify_by_mail.php b/plugin/advanced_subscription/cron/notify_by_mail.php
index bcc93bc94e..a60ac5ab95 100644
--- a/plugin/advanced_subscription/cron/notify_by_mail.php
+++ b/plugin/advanced_subscription/cron/notify_by_mail.php
@@ -25,11 +25,10 @@ $joinTables = Database::get_main_table(TABLE_MAIN_SESSION) . ' s INNER JOIN ' .
 $columns = 's.id AS session_id, uu.friend_user_id AS superior_id, uu.user_id AS student_id, asq.id AS queue_id, asq.status AS status';
 $conditions = array(
     'where' => array(
-        //'s.date_start >= ?
-        'uu.relation_type = ? AND asq.updated_at <= ?' => array(
-        //api_get_utc_datetime(),
+        's.date_start >= ? AND uu.relation_type = ? AND asq.updated_at <= ?' => array(
+            $now,
             USER_RELATION_TYPE_BOSS,
-            $weekAgo
+            $weekAgo,
         )
     ),
     'order' => 's.id',
@@ -94,7 +93,7 @@ foreach ($queueBySuperior as $sessionId => $superiorStudents) {
         'currentUserId' => 0,
         'newStatus' => ADVANCED_SUBSCRIPTION_QUEUE_STATUS_BOSS_APPROVED,
         'studentUserId' => 0,
-        'is_connected' => 0,
+        'is_connected' => true,
         'profile_completed' => 0,
     );
     foreach ($superiorStudents as $superiorId => $students) {
@@ -102,7 +101,7 @@ foreach ($queueBySuperior as $sessionId => $superiorStudents) {
         // Check if superior has at least one student
         if (count($students) > 0) {
             foreach ($students as $studentId => $studentInfo) {
-                if ($studentInfo['status'] != ADVANCED_SUBSCRIPTION_QUEUE_STATUS_START) {
+                if ($studentInfo['status'] == ADVANCED_SUBSCRIPTION_QUEUE_STATUS_START) {
                     $data['students'][$studentId] = api_get_user_info($studentId);
                     $dataUrl['studentUserId'] = $studentId;
                     $dataUrl['newStatus'] = ADVANCED_SUBSCRIPTION_QUEUE_STATUS_BOSS_APPROVED;
@@ -141,7 +140,7 @@ foreach ($admins as &$admin) {
 unset($admin);
 $queueByAdmin = array();
 foreach ($queueList as $queueItem) {
-    if ($queueItem['status'] != ADVANCED_SUBSCRIPTION_QUEUE_STATUS_BOSS_APPROVED) {
+    if ($queueItem['status'] == ADVANCED_SUBSCRIPTION_QUEUE_STATUS_BOSS_APPROVED) {
         $queueByAdmin[$queueItem['session_id']]['students'][$queueItem['student_id']]['user_id'] = $queueItem['student_id'];
     }
 }
diff --git a/plugin/advanced_subscription/src/AdvancedSubscriptionPlugin.php b/plugin/advanced_subscription/src/AdvancedSubscriptionPlugin.php
index 55d8d521bd..aeae3ecc1a 100644
--- a/plugin/advanced_subscription/src/AdvancedSubscriptionPlugin.php
+++ b/plugin/advanced_subscription/src/AdvancedSubscriptionPlugin.php
@@ -253,6 +253,7 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface
         $queueTable = Database::get_main_table(TABLE_ADVANCED_SUBSCRIPTION_QUEUE);
         $attributes = array(
             'last_message_id' => $mailId,
+            'updated_at' => api_get_utc_datetime(),
         );
 
         $num = Database::update(
@@ -627,7 +628,7 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface
                         $data['students'],
                         $adminId,
                         $this->get_lang('MailRemindAdmin'),
-                        $template->fetch('/advanced_subscription/views/student_no_superior_notice_admin.tpl'),
+                        $template->fetch('/advanced_subscription/views/reminder_notice_admin.tpl'),
                         $data['sessionId'],
                         true
                     );
diff --git a/plugin/advanced_subscription/views/reminder_notice_superior_max.tpl b/plugin/advanced_subscription/views/reminder_notice_superior_max.tpl
index 54a9becdc6..e2b81836e6 100644
--- a/plugin/advanced_subscription/views/reminder_notice_superior_max.tpl
+++ b/plugin/advanced_subscription/views/reminder_notice_superior_max.tpl
@@ -55,7 +55,7 @@
           <table width="100%" border="0" cellspacing="3" cellpadding="4" style="background:#EDE9EA">
             {% for student in students %}
             <tr>
-              <td valign="middle"><img src="{{ student.picture.file }}" width="50" height="50" alt=""></td>
+              <td valign="middle"><img src="{{ student.avatar }}" width="50" height="50" alt=""></td>
               <td valign="middle"><h4>{{ student.complete_name }}</h4></td>
               <td valign="middle"><a href="{{ student.acceptUrl }}"><img src="{{ _p.web_plugin }}advanced_subscription/views/img/aprobar.png" width="90" height="25" alt=""></a></td>
               <td valign="middle"><a href="{{ student.rejectUrl }}"><img src="{{ _p.web_plugin }}advanced_subscription/views/img/desaprobar.png" width="90" height="25" alt=""></a></td>
diff --git a/plugin/advanced_subscription/views/student_no_superior_notice_admin.tpl b/plugin/advanced_subscription/views/student_no_superior_notice_admin.tpl
index dc9cf37bbe..68d7297415 100644
--- a/plugin/advanced_subscription/views/student_no_superior_notice_admin.tpl
+++ b/plugin/advanced_subscription/views/student_no_superior_notice_admin.tpl
@@ -49,7 +49,7 @@
                     <td height="356">&nbsp;</td>
                     <td valign="top"><p>{{ "MailDear" | get_plugin_lang("AdvancedSubscriptionPlugin") }}</p>
                         <h2>{{ admin.complete_name }}</h2>
-                        <p>{{ "MailContentStudentRequestNoSuperiorToAdmin"| get_plugin_lang("AdvancedSubscriptionPlugin") | format(complete_name_with_username, session.name, admin_view_url) }}</p>
+                        <p>{{ "MailContentStudentRequestNoSuperiorToAdmin"| get_plugin_lang("AdvancedSubscriptionPlugin") | format(student.complete_name_with_username, session.name, admin_view_url) }}</p>
                         <p>{{ "MailThankYou" | get_plugin_lang("AdvancedSubscriptionPlugin") }}</p>
                         <h3>{{ signature }}</h3></td>
                     <td>&nbsp;</td>