Completed
Pull Request — 1.11.x (#1661)
by José
27:18
created
plugin/advanced_subscription/test/terms_to_pdf.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@  discard block
 block discarded – undo
5 5
  * @package chamilo.plugin.advanced_subscription
6 6
  */
7 7
 
8
-require_once __DIR__ . '/../config.php';
8
+require_once __DIR__.'/../config.php';
9 9
 
10 10
 // Protect test
11 11
 api_protect_admin_script();
@@ -39,9 +39,9 @@  discard block
 block discarded – undo
39 39
         $tpl->assign('termsContent', $termsAndConditions);
40 40
         $termsAndConditions = $tpl->fetch('/advanced_subscription/views/terms_and_conditions_to_pdf.tpl');
41 41
         $pdf = new PDF();
42
-        $filename = 'terms' . sha1(rand(0,99999));
42
+        $filename = 'terms'.sha1(rand(0, 99999));
43 43
         $pdf->content_to_pdf($termsAndConditions, null, $filename, null, 'F');
44
-        $fileDir = api_get_path(WEB_ARCHIVE_PATH) . $filename . '.pdf';
44
+        $fileDir = api_get_path(WEB_ARCHIVE_PATH).$filename.'.pdf';
45 45
         echo '<pre>', print_r($fileDir, 1), '</pre>';
46 46
     }
47 47
 }
Please login to merge, or discard this patch.
plugin/advanced_subscription/ajax/advanced_subscription.ajax.php 1 patch
Spacing   +6 added lines, -8 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
 /**
9 9
  * Init
10 10
  */
11
-require_once __DIR__ . '/../config.php';
11
+require_once __DIR__.'/../config.php';
12 12
 
13 13
 $plugin = AdvancedSubscriptionPlugin::create();
14 14
 // Get validation hash
@@ -120,8 +120,7 @@  discard block
 block discarded – undo
120 120
                 $isWesternNameOrder = api_is_western_name_order();
121 121
                 foreach ($adminsArray as &$admin) {
122 122
                     $admin['complete_name'] = $isWesternNameOrder ?
123
-                        $admin['firstname'] . ', ' . $admin['lastname'] :
124
-                        $admin['lastname'] . ', ' . $admin['firstname']
123
+                        $admin['firstname'].', '.$admin['lastname'] : $admin['lastname'].', '.$admin['firstname']
125 124
                     ;
126 125
                 }
127 126
                 unset($admin);
@@ -140,8 +139,8 @@  discard block
 block discarded – undo
140 139
                     $res = $plugin->updateQueueStatus($data, ADVANCED_SUBSCRIPTION_QUEUE_STATUS_BOSS_APPROVED);
141 140
                     if (!empty($res)) {
142 141
                         // Prepare admin url
143
-                        $data['admin_view_url'] = api_get_path(WEB_PLUGIN_PATH) .
144
-                            'advanced_subscription/src/admin_view.php?s=' . $data['sessionId'];
142
+                        $data['admin_view_url'] = api_get_path(WEB_PLUGIN_PATH).
143
+                            'advanced_subscription/src/admin_view.php?s='.$data['sessionId'];
145 144
                         // Send mails
146 145
                         $result['mailIds'] = $plugin->sendMail(
147 146
                             $data,
@@ -276,8 +275,7 @@  discard block
 block discarded – undo
276 275
                     $isWesternNameOrder = api_is_western_name_order();
277 276
                     foreach ($adminsArray as &$admin) {
278 277
                         $admin['complete_name'] = $isWesternNameOrder ?
279
-                            $admin['firstname'] . ', ' . $admin['lastname'] :
280
-                            $admin['lastname'] . ', ' . $admin['firstname']
278
+                            $admin['firstname'].', '.$admin['lastname'] : $admin['lastname'].', '.$admin['firstname']
281 279
                         ;
282 280
                     }
283 281
                     unset($admin);
@@ -288,7 +286,7 @@  discard block
 block discarded – undo
288 286
                     $data['session'] = $sessionArray;
289 287
                     $data['signature'] = api_get_setting('Institution');
290 288
                     $data['admin_view_url'] = api_get_path(WEB_PLUGIN_PATH)
291
-                        . 'advanced_subscription/src/admin_view.php?s=' . $data['sessionId'];
289
+                        . 'advanced_subscription/src/admin_view.php?s='.$data['sessionId'];
292 290
                     // Check if exist and action in data
293 291
                     if (empty($data['mailAction'])) {
294 292
                         // set action in data by new status
Please login to merge, or discard this patch.
plugin/advanced_subscription/plugin.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -8,5 +8,5 @@
 block discarded – undo
8 8
 /**
9 9
  * Plugin details (must be present)
10 10
  */
11
-require_once __DIR__ . '/config.php';
11
+require_once __DIR__.'/config.php';
12 12
 $plugin_info = AdvancedSubscriptionPlugin::create()->get_info();
Please login to merge, or discard this patch.
plugin/advanced_subscription/config.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -33,4 +33,4 @@
 block discarded – undo
33 33
 
34 34
 
35 35
 
36
-require_once __DIR__ . '/../../main/inc/global.inc.php';
36
+require_once __DIR__.'/../../main/inc/global.inc.php';
Please login to merge, or discard this patch.
plugin/advanced_subscription/cron/notify_by_mail.php 1 patch
Spacing   +8 added lines, -9 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
9 9
  * Init
10 10
  */
11 11
 
12
-require_once __DIR__ . '/../config.php';
12
+require_once __DIR__.'/../config.php';
13 13
 $plugin = AdvancedSubscriptionPlugin::create();
14 14
 $now = api_get_utc_datetime();
15 15
 $weekAgo = api_get_utc_datetime('-1 week');
@@ -18,10 +18,10 @@  discard block
 block discarded – undo
18 18
 /**
19 19
  * Get session list
20 20
  */
21
-$joinTables = Database::get_main_table(TABLE_MAIN_SESSION) . ' s INNER JOIN ' .
22
-    Database::get_main_table(TABLE_MAIN_SESSION_USER) . ' su ON s.id = su.session_id INNER JOIN ' .
23
-    Database::get_main_table(TABLE_MAIN_USER_REL_USER) . ' uu ON su.user_id = uu.user_id INNER JOIN ' .
24
-    Database::get_main_table(TABLE_ADVANCED_SUBSCRIPTION_QUEUE) . ' asq ON su.session_id = asq.session_id AND su.user_id = asq.user_id';
21
+$joinTables = Database::get_main_table(TABLE_MAIN_SESSION).' s INNER JOIN '.
22
+    Database::get_main_table(TABLE_MAIN_SESSION_USER).' su ON s.id = su.session_id INNER JOIN '.
23
+    Database::get_main_table(TABLE_MAIN_USER_REL_USER).' uu ON su.user_id = uu.user_id INNER JOIN '.
24
+    Database::get_main_table(TABLE_ADVANCED_SUBSCRIPTION_QUEUE).' asq ON su.session_id = asq.session_id AND su.user_id = asq.user_id';
25 25
 $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';
26 26
 $conditions = array(
27 27
     'where' => array(
@@ -133,8 +133,7 @@  discard block
 block discarded – undo
133 133
 $isWesternNameOrder = api_is_western_name_order();
134 134
 foreach ($admins as &$admin) {
135 135
     $admin['complete_name'] = $isWesternNameOrder ?
136
-        $admin['firstname'] . ', ' . $admin['lastname'] :
137
-        $admin['lastname'] . ', ' . $admin['firstname']
136
+        $admin['firstname'].', '.$admin['lastname'] : $admin['lastname'].', '.$admin['firstname']
138 137
     ;
139 138
 }
140 139
 unset($admin);
@@ -149,8 +148,8 @@  discard block
 block discarded – undo
149 148
 );
150 149
 foreach ($queueByAdmin as $sessionId => $studentInfo) {
151 150
     $data['sessionId'] = $sessionId;
152
-    $data['admin_view_url'] = api_get_path(WEB_PLUGIN_PATH) .
153
-        'advanced_subscription/src/admin_view.php?s=' . $data['sessionId'];
151
+    $data['admin_view_url'] = api_get_path(WEB_PLUGIN_PATH).
152
+        'advanced_subscription/src/admin_view.php?s='.$data['sessionId'];
154 153
     $data['session'] = $sessionInfoList[$sessionId];
155 154
     $data['students'] = $studentInfo['students'];
156 155
     $plugin->sendMail($data, ADVANCED_SUBSCRIPTION_ACTION_REMINDER_ADMIN);
Please login to merge, or discard this patch.
plugin/advanced_subscription/uninstall.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@
 block discarded – undo
10 10
 /**
11 11
  * Queries
12 12
  */
13
-require_once dirname(__FILE__) . '/config.php';
13
+require_once dirname(__FILE__).'/config.php';
14 14
 if (!api_is_platform_admin()) {
15 15
     die ('You must have admin permissions to uninstall plugins');
16 16
 }
Please login to merge, or discard this patch.
plugin/advanced_subscription/install.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@
 block discarded – undo
10 10
  * Initialization
11 11
  */
12 12
 
13
-require_once dirname(__FILE__) . '/config.php';
13
+require_once dirname(__FILE__).'/config.php';
14 14
 if (!api_is_platform_admin()) {
15 15
     die ('You must have admin permissions to install plugins');
16 16
 }
Please login to merge, or discard this patch.
plugin/resubscription/src/HookResubscription.php 3 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@
 block discarded – undo
31 31
 
32 32
             $resubscriptionLimit = Resubscription::create()->get('resubscription_limit');
33 33
 
34
-             // Initialize variables as a calendar year by default
34
+                // Initialize variables as a calendar year by default
35 35
             $limitDateFormat = 'Y-01-01';
36 36
             $limitDate = gmdate($limitDateFormat);
37 37
             $resubscriptionOffset = "1 year";
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -101,7 +101,7 @@
 block discarded – undo
101 101
                     $resubscriptionDate = gmdate($limitDateFormat, strtotime($endDate." +$resubscriptionOffset"));
102 102
                     $icon = Display::return_icon('students.gif', get_lang('Student'));
103 103
                     $canResubscribeFrom = sprintf(get_plugin_lang('CanResubscribeFromX', 'resubscription'), $resubscriptionDate);
104
-                    throw new Exception(Display::label($icon . ' ' . $canResubscribeFrom, "info"));
104
+                    throw new Exception(Display::label($icon.' '.$canResubscribeFrom, "info"));
105 105
                 }
106 106
             }
107 107
         }
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@
 block discarded – undo
22 22
 
23 23
     /**
24 24
      * Limit session resubscription when a Chamilo user is resubscribed to a session
25
-     * @param HookCreateUserEventInterface $hook The hook
25
+     * @param HookResubscribeEventInterface $hook The hook
26 26
      */
27 27
     public function hookResubscribe(HookResubscribeEventInterface $hook)
28 28
     {
Please login to merge, or discard this patch.
plugin/resubscription/index.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -5,4 +5,4 @@
 block discarded – undo
5 5
  * @author Imanol Losada Oriol <[email protected]>
6 6
  * @package chamilo.plugin.resubscription
7 7
  */
8
-require_once __DIR__ . '/config.php';
8
+require_once __DIR__.'/config.php';
Please login to merge, or discard this patch.