From 4f0c01820ddcd0b53cd30b28f3912f2f5955bbc6 Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Thu, 7 May 2015 10:53:21 -0500
Subject: [PATCH 1/6] Fix advanced subscription modal window - refs BT#9413

---
 plugin/advanced_subscription/views/admin_view.tpl | 2 +-
 plugin/advanced_subscription/views/css/style.css  | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/plugin/advanced_subscription/views/admin_view.tpl b/plugin/advanced_subscription/views/admin_view.tpl
index b3d3111523..c0606ca79f 100644
--- a/plugin/advanced_subscription/views/admin_view.tpl
+++ b/plugin/advanced_subscription/views/admin_view.tpl
@@ -93,7 +93,7 @@
 <input name="f" value="social" type="hidden">
 </form>
 <div class="modal fade" id="modalMail" tabindex="-1" role="dialog" aria-labelledby="modalMailLabel" aria-hidden="true">
-    <div class="modal-dialog">
+    <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
diff --git a/plugin/advanced_subscription/views/css/style.css b/plugin/advanced_subscription/views/css/style.css
index 9c50b1643f..9d2f1ddaae 100644
--- a/plugin/advanced_subscription/views/css/style.css
+++ b/plugin/advanced_subscription/views/css/style.css
@@ -46,11 +46,6 @@
     vertical-align: middle;
     text-align: center;
 }
-#modalMail{
-    width: 770px;
-    margin-top: -180px !important;
-    margin-left:  -385px !important;
-}
 
 #modalMail .modal-body {
     height: 360px;

From c13e68ad5639cb5b545b1c114435ca4f591d2f0e Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Thu, 7 May 2015 11:48:59 -0500
Subject: [PATCH 2/6] Avoid clear row when accept the subscription - refs
 BT#9413

---
 .../src/AdvancedSubscriptionPlugin.php         |  6 ++----
 .../advanced_subscription/views/admin_view.tpl | 18 ++++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/plugin/advanced_subscription/src/AdvancedSubscriptionPlugin.php b/plugin/advanced_subscription/src/AdvancedSubscriptionPlugin.php
index 1355ade886..f3ee3f18e2 100644
--- a/plugin/advanced_subscription/src/AdvancedSubscriptionPlugin.php
+++ b/plugin/advanced_subscription/src/AdvancedSubscriptionPlugin.php
@@ -1102,10 +1102,8 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface
         $userJoinTable = $queueTable . ' q INNER JOIN ' . $userTable . ' u ON q.user_id = u.user_id';
         $where = array(
             'where' => array(
-                'q.session_id = ? AND q.status <> ? AND q.status <> ?' => array(
-                    $sessionId,
-                    ADVANCED_SUBSCRIPTION_QUEUE_STATUS_ADMIN_APPROVED,
-                    ADVANCED_SUBSCRIPTION_QUEUE_STATUS_ADMIN_DISAPPROVED,
+                'q.session_id = ?' => array(
+                    $sessionId
                 )
             ),
             'order' => 'q.status DESC, u.lastname ASC'
diff --git a/plugin/advanced_subscription/views/admin_view.tpl b/plugin/advanced_subscription/views/admin_view.tpl
index c0606ca79f..89dd2f50e8 100644
--- a/plugin/advanced_subscription/views/admin_view.tpl
+++ b/plugin/advanced_subscription/views/admin_view.tpl
@@ -34,7 +34,7 @@
         <div class="col-md-12">
             <div class="student-list-table">
                 <table id="student_table" class="table table-striped">
-                    <tbody>
+                    <thead>
                     <tr>
                         <th>{{ "Postulant" | get_plugin_lang('AdvancedSubscriptionPlugin') }}</th>
                         <th>{{ "InscriptionDate" | get_plugin_lang('AdvancedSubscriptionPlugin') }}</th>
@@ -42,6 +42,8 @@
                         <th>{{ "BossValidation" | get_plugin_lang('AdvancedSubscriptionPlugin') }}</th>
                         <th class="advanced-subscription-decision-column">{{ "Decision" | get_plugin_lang('AdvancedSubscriptionPlugin') }}</th>
                     </tr>
+                    </thead>
+                    <tbody>
                     {% set row_class = "row_odd" %}
                     {% for student in students %}
                     <tr class="{{ row_class }}">
@@ -62,7 +64,7 @@
                             {% endif %}
                         </td>
                         <td>
-
+                            {% if student.status != approveAdmin and student.status != disapproveAdmin %}
                             <a
                                 class="btn btn-success btn-advanced-subscription btn-accept"
                                 href="{{ student.acceptUrl }}"
@@ -75,7 +77,7 @@
                             >
                                 {{ 'RejectInfinitive' | get_plugin_lang('AdvancedSubscriptionPlugin') }}
                             </a>
-
+                            {% endif %}
                         </td>
                     </tr>
                     {% if row_class == "row_even" %}
@@ -133,16 +135,16 @@
                 var confirmed = confirm(msg.replace(msgRe, studentName));
             }
             if (confirmed) {
-                var thisBlock = $(this).closest("tr");
-                var advancedSubscriptionUrl = $(this).attr("href")
-                $("#iframeAdvsub").attr("src", advancedSubscriptionUrl)
+                var tdParent = $(this).closest("td");
+                var advancedSubscriptionUrl = $(this).attr("href");
+                $("#iframeAdvsub").attr("src", advancedSubscriptionUrl);
                 $("#modalMail").modal("show");
                 $.ajax({
                     dataType: "json",
                     url: advancedSubscriptionUrl
                 }).done(function(result){
-                    if (result.error == true) {
-                        thisBlock.slideUp();
+                    if (result.error === true) {
+                        tdParent.html('');
                     } else {
                         console.log(result);
                     }

From c4386cfb796536d6e35a08baaf1069d03077d10a Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Thu, 7 May 2015 13:22:37 -0500
Subject: [PATCH 3/6] Show accept/reject message in modal window - refs BT#9413

---
 .../advanced_subscription/views/student_notice_superior.tpl   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugin/advanced_subscription/views/student_notice_superior.tpl b/plugin/advanced_subscription/views/student_notice_superior.tpl
index c241d306f2..e8f5cb753f 100644
--- a/plugin/advanced_subscription/views/student_notice_superior.tpl
+++ b/plugin/advanced_subscription/views/student_notice_superior.tpl
@@ -55,8 +55,8 @@
                             <tr>
                                 <td width="58" valign="middle"><img src="{{ student.picture.file }}" width="50" height="50" alt=""></td>
                                 <td width="211" valign="middle"><h4>{{ student.complete_name }}</h4></td>
-                                <td width="90" 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 width="243" valign="middle"><a href="{{ student.rejectUrl }}"><img src="{{ _p.web_plugin }}advanced_subscription/views/img/desaprobar.png" width="90" height="25" alt=""></a></td>
+                                <td width="90" valign="middle"><a href="{{ student.acceptUrl }}&modal_size=lg" class="ajax"><img src="{{ _p.web_plugin }}advanced_subscription/views/img/aprobar.png" width="90" height="25" alt=""></a></td>
+                                <td width="243" valign="middle"><a href="{{ student.rejectUrl }}&modal_size=lg" class="ajax"><img src="{{ _p.web_plugin }}advanced_subscription/views/img/desaprobar.png" width="90" height="25" alt=""></a></td>
                             </tr>
                         </table>
                         <p>{{ "MailThankYou" | get_plugin_lang("AdvancedSubscriptionPlugin") }}</p>

From d6ef42a924018e811b1610718594e84d57b26e94 Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Tue, 12 May 2015 12:16:32 -0500
Subject: [PATCH 4/6] Fix login with registered user from Drupal - refs BT#9413

---
 main/auth/sso/sso.Drupal.class.php | 10 +++++-----
 main/inc/lib/api.lib.php           |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/main/auth/sso/sso.Drupal.class.php b/main/auth/sso/sso.Drupal.class.php
index d026c4eadd..711b1d0baa 100755
--- a/main/auth/sso/sso.Drupal.class.php
+++ b/main/auth/sso/sso.Drupal.class.php
@@ -103,7 +103,7 @@ class ssoDrupal
 
         //lookup the user in the main database
         $user_table = Database::get_main_table(TABLE_MAIN_USER);
-        $sql = "SELECT user_id, username, password, auth_source, active, expiration_date, status
+        $sql = "SELECT id, username, password, auth_source, active, expiration_date, status
                 FROM $user_table
                 WHERE username = '".trim(Database::escape_string($sso['username']))."'";
         $result = Database::query($sql);
@@ -127,19 +127,19 @@ class ssoDrupal
                                 $current_access_url_id = api_get_current_access_url_id();
                                 // my user is subscribed in these
                                 //sites: $my_url_list
-                                $my_url_list = api_get_access_url_from_user($uData['user_id']);
+                                $my_url_list = api_get_access_url_from_user($uData['id']);
                             } else {
                                 $current_access_url_id = 1;
                                 $my_url_list = array(1);
                             }
 
-                            $my_user_is_admin = UserManager::is_admin($uData['user_id']);
+                            $my_user_is_admin = UserManager::is_admin($uData['id']);
 
                             if ($my_user_is_admin === false) {
                                 if (is_array($my_url_list) && count($my_url_list) > 0) {
                                     if (in_array($current_access_url_id, $my_url_list)) {
                                         // the user has permission to enter at this site
-                                        $_user['user_id'] = $uData['user_id'];
+                                        $_user['user_id'] = $uData['id'];
                                         $_user = api_get_user_info($_user['user_id']);
                                         Session::write('_user', $_user);
                                         Event::event_login($_user['user_id']);
@@ -168,7 +168,7 @@ class ssoDrupal
                                 if (in_array(1, $my_url_list)) {
                                     //Check if this admin is admin on the
                                     // principal portal
-                                    $_user['user_id'] = $uData['user_id'];
+                                    $_user['user_id'] = $uData['id'];
                                     $_user = api_get_user_info($_user['user_id']);
                                     $is_platformAdmin = $uData['status'] == COURSEMANAGER;
                                     Session::write('is_platformAdmin', $is_platformAdmin);
diff --git a/main/inc/lib/api.lib.php b/main/inc/lib/api.lib.php
index 85d8bd598b..3c813645f9 100644
--- a/main/inc/lib/api.lib.php
+++ b/main/inc/lib/api.lib.php
@@ -1384,7 +1384,7 @@ function _api_format_user($user, $add_password = false)
         $result['mail'] = isset($user['mail']) ? $user['mail'] : null;
         $result['email'] = isset($user['mail'])? $user['mail'] : null;
     }
-    $user_id = intval($user['user_id']);
+    $user_id = intval($user['id']);
     $result['user_id'] = $result['id'] = $user_id;
     $saveUserLastLogin = api_get_configuration_value('save_user_last_login');
 

From a93ed4834c80807ca8d4af8e5dd65b1cddc32899 Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Wed, 13 May 2015 16:22:15 -0500
Subject: [PATCH 5/6] Fix format user info to allow login - refs BT#9413

---
 main/inc/lib/api.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/inc/lib/api.lib.php b/main/inc/lib/api.lib.php
index 3c813645f9..85d8bd598b 100644
--- a/main/inc/lib/api.lib.php
+++ b/main/inc/lib/api.lib.php
@@ -1384,7 +1384,7 @@ function _api_format_user($user, $add_password = false)
         $result['mail'] = isset($user['mail']) ? $user['mail'] : null;
         $result['email'] = isset($user['mail'])? $user['mail'] : null;
     }
-    $user_id = intval($user['id']);
+    $user_id = intval($user['user_id']);
     $result['user_id'] = $result['id'] = $user_id;
     $saveUserLastLogin = api_get_configuration_value('save_user_last_login');
 

From 63c8489590e75d5cff24822f4713287f7c47dd95 Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Wed, 13 May 2015 16:24:29 -0500
Subject: [PATCH 6/6] Fix install AdvancedSubscription plugin - refs BT#9413

---
 .../src/AdvancedSubscriptionPlugin.php            | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/plugin/advanced_subscription/src/AdvancedSubscriptionPlugin.php b/plugin/advanced_subscription/src/AdvancedSubscriptionPlugin.php
index f3ee3f18e2..d3c6c99bb5 100644
--- a/plugin/advanced_subscription/src/AdvancedSubscriptionPlugin.php
+++ b/plugin/advanced_subscription/src/AdvancedSubscriptionPlugin.php
@@ -78,17 +78,12 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface
      */
     private function addAreaField()
     {
-        $result = Database::select(
-            'variable',
-            'user_field',
-            array(
-                'where'=> array(
-                    'variable = ? ' => array('area')
-                )
-            )
-        );
+        $extraField = new ExtraField('user');
+        $extraFieldHandler = $extraField->get_handler_field_info_by_field_variable('area');
+
+        $areaExists = $extraFieldHandler !== false;
 
-        if (empty($result)) {
+        if (!$areaExists) {
             $extraField = new ExtraField('user');
             $extraField->save(array(
                 'field_type' => 1,