Completed
Push — 1.10.x ( 90a383...61feb9 )
by Angel Fernando Quiroz
39:29
created
main/admin/index.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
 $nameTools = get_lang('PlatformAdmin');
20 20
 
21 21
 $accessUrlId = 0;
22
-$adminExtraContentDir = api_get_path(SYS_APP_PATH) . "home/admin/";
22
+$adminExtraContentDir = api_get_path(SYS_APP_PATH)."home/admin/";
23 23
 
24 24
 if (api_is_multiple_url_enabled()) {
25 25
     $accessUrlId = api_get_current_access_url_id();
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
         $urlInfo = api_get_access_url($accessUrlId);
29 29
         $url = api_remove_trailing_slash(preg_replace('/https?:\/\//i', '', $urlInfo['url']));
30 30
         $cleanUrl = str_replace('/', '-', $url);
31
-        $adminExtraContentDir = api_get_path(SYS_APP_PATH) . "home/$cleanUrl/admin/";
31
+        $adminExtraContentDir = api_get_path(SYS_APP_PATH)."home/$cleanUrl/admin/";
32 32
     }
33 33
 }
34 34
 
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
             <div class="form-group">
97 97
                 <input class="form-control" type="text" name="keyword" value="">
98 98
                 <button class="btn btn-default" type="submit">
99
-                    <em class="fa fa-search"></em> ' . get_lang('Search') . '
99
+                    <em class="fa fa-search"></em> ' . get_lang('Search').'
100 100
                 </button>
101 101
             </div>
102 102
         </form>';
@@ -149,7 +149,7 @@  discard block
 block discarded – undo
149 149
             <div class="form-group">
150 150
                 <input class="form-control" type="text" name="keyword" value="">
151 151
                 <button class="btn btn-default" type="submit">
152
-                    <em class="fa fa-search"></em> ' . get_lang('Search') . '
152
+                    <em class="fa fa-search"></em> ' . get_lang('Search').'
153 153
                 </button>
154 154
             </div>
155 155
         </form>';
@@ -209,7 +209,7 @@  discard block
 block discarded – undo
209 209
                 <input class="form-control" type="text" name="search_field" value="" >
210 210
                 <input type="hidden" value="search_setting" name="category">
211 211
                 <button class="btn btn-default" type="submit">
212
-                    <em class="fa fa-search"></em> ' . get_lang('Search') . '
212
+                    <em class="fa fa-search"></em> ' . get_lang('Search').'
213 213
                 </button>
214 214
             </div>
215 215
         </form>';
@@ -222,18 +222,18 @@  discard block
 block discarded – undo
222 222
     $items[] = array('url' => 'settings.php?category=Regions', 'label' => get_lang('Regions'));
223 223
     $items[] = array('url' => 'system_announcements.php', 'label' => get_lang('SystemAnnouncements'));
224 224
     $items[] = array(
225
-        'url' => api_get_path(WEB_CODE_PATH) . 'calendar/agenda_js.php?type=admin',
225
+        'url' => api_get_path(WEB_CODE_PATH).'calendar/agenda_js.php?type=admin',
226 226
         'label' => get_lang('GlobalAgenda')
227 227
     );
228 228
     $items[] = array('url' => 'configure_homepage.php', 'label' => get_lang('ConfigureHomePage'));
229 229
     $items[] = array('url' => 'configure_inscription.php', 'label' => get_lang('ConfigureInscription'));
230 230
     $items[] = array('url' => 'statistics/index.php', 'label' => get_lang('Statistics'));
231 231
     $items[] = array(
232
-        'url' => api_get_path(WEB_CODE_PATH) . 'mySpace/company_reports.php',
232
+        'url' => api_get_path(WEB_CODE_PATH).'mySpace/company_reports.php',
233 233
         'label' => get_lang('Reports')
234 234
     );
235 235
     $items[] = array(
236
-        'url' => api_get_path(WEB_CODE_PATH) . 'admin/teacher_time_report.php',
236
+        'url' => api_get_path(WEB_CODE_PATH).'admin/teacher_time_report.php',
237 237
         'label' => get_lang('TeacherTimeReport')
238 238
     );
239 239
 
@@ -282,7 +282,7 @@  discard block
 block discarded – undo
282 282
                     <div class="form-group">
283 283
                         <input class="form-control" type="text" name="keyword" value="">
284 284
                         <button class="btn btn-default" type="submit">
285
-                            <em class="fa fa-search"></em> ' . get_lang('Search') . '
285
+                            <em class="fa fa-search"></em> ' . get_lang('Search').'
286 286
                         </button>
287 287
                     </div>
288 288
                 </form>';
@@ -310,7 +310,7 @@  discard block
 block discarded – undo
310 310
 
311 311
 if (api_is_platform_admin()) {
312 312
     // option only visible in development mode. Enable through code if required
313
-    if (is_dir(api_get_path(SYS_TEST_PATH) . 'datafiller/')) {
313
+    if (is_dir(api_get_path(SYS_TEST_PATH).'datafiller/')) {
314 314
         $items[] = array('url' => 'user_move_stats.php', 'label' => get_lang('MoveUserStats'));
315 315
     }
316 316
     $items[] = array('url' => 'career_dashboard.php', 'label' => get_lang('CareersAndPromotions'));
@@ -337,7 +337,7 @@  discard block
 block discarded – undo
337 337
     $items = array();
338 338
     $items[] = array('url' => 'special_exports.php', 'label' => get_lang('SpecialExports'));
339 339
     $items[] = array('url' => 'system_status.php', 'label' => get_lang('SystemStatus'));
340
-    if (is_dir(api_get_path(SYS_TEST_PATH) . 'datafiller/')) {
340
+    if (is_dir(api_get_path(SYS_TEST_PATH).'datafiller/')) {
341 341
         $items[] = array('url' => 'filler.php', 'label' => get_lang('DataFiller'));
342 342
     }
343 343
 
@@ -381,12 +381,12 @@  discard block
 block discarded – undo
381 381
         $items[] = array('url' => 'skill_list.php', 'label' => get_lang('ManageSkills'));
382 382
         //$items[] = array('url'=>'skills_profile.php',   'label' => get_lang('SkillsProfile'));
383 383
         $items[] = array(
384
-            'url' => api_get_path(WEB_CODE_PATH) . 'social/skills_ranking.php',
384
+            'url' => api_get_path(WEB_CODE_PATH).'social/skills_ranking.php',
385 385
             'label' => get_lang('SkillsRanking')
386 386
         );
387 387
         $items[] = array('url' => 'skills_gradebook.php', 'label' => get_lang('SkillsAndGradebooks'));
388 388
         $items[] = array(
389
-            'url' => api_get_path(WEB_CODE_PATH) . 'admin/skill_badge.php',
389
+            'url' => api_get_path(WEB_CODE_PATH).'admin/skill_badge.php',
390 390
             'label' => get_lang('Badges')
391 391
         );
392 392
         $blocks['skills']['items'] = $items;
@@ -420,12 +420,12 @@  discard block
 block discarded – undo
420 420
                 $itemUrl = '/start.php';
421 421
             }
422 422
 
423
-            if (!file_exists(api_get_path(SYS_PLUGIN_PATH) . $plugin_name . $itemUrl)) {
423
+            if (!file_exists(api_get_path(SYS_PLUGIN_PATH).$plugin_name.$itemUrl)) {
424 424
                 continue;
425 425
             }
426 426
 
427 427
             $items[] = array(
428
-                'url' => api_get_path(WEB_PLUGIN_PATH) . $plugin_name . $itemUrl,
428
+                'url' => api_get_path(WEB_PLUGIN_PATH).$plugin_name.$itemUrl,
429 429
                 'label' => $plugin_info['title']
430 430
             );
431 431
         }
@@ -503,7 +503,7 @@  discard block
 block discarded – undo
503 503
     }
504 504
     //end hack
505 505
 }
506
-$admin_ajax_url = api_get_path(WEB_AJAX_PATH) . 'admin.ajax.php';
506
+$admin_ajax_url = api_get_path(WEB_AJAX_PATH).'admin.ajax.php';
507 507
 
508 508
 $tpl = new Template();
509 509
 
@@ -556,7 +556,7 @@  discard block
 block discarded – undo
556 556
                 die;
557 557
             }
558 558
 
559
-            $fullFilePath = $adminExtraContentDir . $extraData['block'];
559
+            $fullFilePath = $adminExtraContentDir.$extraData['block'];
560 560
             $fullFilePath .= "_extra.html";
561 561
 
562 562
             file_put_contents($fullFilePath, $extraData['extra_content']);
Please login to merge, or discard this patch.
plugin/bbb/lib/bbb.lib.php 1 patch
Spacing   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -176,13 +176,13 @@  discard block
 block discarded – undo
176 176
         }
177 177
 
178 178
         $params['attendee_pw'] = isset($params['moderator_pw']) ? $params['moderator_pw'] : $courseCode;
179
-        $attendeePassword =  $params['attendee_pw'];
179
+        $attendeePassword = $params['attendee_pw'];
180 180
         $params['moderator_pw'] = isset($params['moderator_pw']) ? $params['moderator_pw'] : $this->getModMeetingPassword();
181 181
         $moderatorPassword = $params['moderator_pw'];
182 182
 
183 183
         $params['record'] = api_get_course_setting('big_blue_button_record_and_store', $courseCode) == 1 ? true : false;
184 184
         $max = api_get_course_setting('big_blue_button_max_students_allowed', $courseCode);
185
-        $max =  isset($max) ? $max : -1;
185
+        $max = isset($max) ? $max : -1;
186 186
 
187 187
         $params['status'] = 1;
188 188
         // Generate a pseudo-global-unique-id to avoid clash of conferences on
@@ -213,23 +213,23 @@  discard block
 block discarded – undo
213 213
             $duration = 300;
214 214
 
215 215
             $bbbParams = array(
216
-                'meetingId' => $params['remote_id'], 					// REQUIRED
217
-                'meetingName' => $meetingName, 	// REQUIRED
218
-                'attendeePw' => $attendeePassword, 					// Match this value in getJoinMeetingURL() to join as attendee.
219
-                'moderatorPw' => $moderatorPassword, 					// Match this value in getJoinMeetingURL() to join as moderator.
220
-                'welcomeMsg' => $welcomeMessage, 					// ''= use default. Change to customize.
221
-                'dialNumber' => '', 					// The main number to call into. Optional.
222
-                'voiceBridge' => $params['voice_bridge'], 					// PIN to join voice. Required.
223
-                'webVoice' => '', 						// Alphanumeric to join voice. Optional.
216
+                'meetingId' => $params['remote_id'], // REQUIRED
217
+                'meetingName' => $meetingName, // REQUIRED
218
+                'attendeePw' => $attendeePassword, // Match this value in getJoinMeetingURL() to join as attendee.
219
+                'moderatorPw' => $moderatorPassword, // Match this value in getJoinMeetingURL() to join as moderator.
220
+                'welcomeMsg' => $welcomeMessage, // ''= use default. Change to customize.
221
+                'dialNumber' => '', // The main number to call into. Optional.
222
+                'voiceBridge' => $params['voice_bridge'], // PIN to join voice. Required.
223
+                'webVoice' => '', // Alphanumeric to join voice. Optional.
224 224
                 'logoutUrl' =>  $this->logoutUrl,
225
-                'maxParticipants' => $max, 				// Optional. -1 = unlimitted. Not supported in BBB. [number]
226
-                'record' => $record, 					// New. 'true' will tell BBB to record the meeting.
227
-                'duration' => $duration, 				// Default = 0 which means no set duration in minutes. [number]
225
+                'maxParticipants' => $max, // Optional. -1 = unlimitted. Not supported in BBB. [number]
226
+                'record' => $record, // New. 'true' will tell BBB to record the meeting.
227
+                'duration' => $duration, // Default = 0 which means no set duration in minutes. [number]
228 228
                 //'meta_category' => '', 				// Use to pass additional info to BBB server. See API docs.
229 229
             );
230 230
 
231 231
             if ($this->debug) {
232
-                error_log("create_meeting params: ".print_r($bbbParams,1));
232
+                error_log("create_meeting params: ".print_r($bbbParams, 1));
233 233
             }
234 234
 
235 235
             $status = false;
@@ -242,7 +242,7 @@  discard block
 block discarded – undo
242 242
                 if (isset($result) && strval($result['returncode']) == 'SUCCESS') {
243 243
                     if ($this->debug) {
244 244
                         error_log(
245
-                            "create_meeting result: " . print_r($result, 1)
245
+                            "create_meeting result: ".print_r($result, 1)
246 246
                         );
247 247
                     }
248 248
                     $meeting = $this->joinMeeting($meetingName, true);
@@ -273,7 +273,7 @@  discard block
 block discarded – undo
273 273
 
274 274
         $courseId = api_get_course_int_id();
275 275
         $sessionId = api_get_session_id();
276
-        $conditions =  array(
276
+        $conditions = array(
277 277
             'where' => array(
278 278
                 'c_id = ? AND session_id = ? AND meeting_name = ? AND status = 1 ' =>
279 279
                     array($courseId, $sessionId, $meetingName)
@@ -282,7 +282,7 @@  discard block
 block discarded – undo
282 282
 
283 283
         if ($this->hasGroupSupport()) {
284 284
             $groupId = api_get_group_id();
285
-            $conditions =  array(
285
+            $conditions = array(
286 286
                 'where' => array(
287 287
                     'c_id = ? AND session_id = ? AND meeting_name = ? AND group_id = ? AND status = 1 ' =>
288 288
                         array($courseId, $sessionId, $meetingName, $groupId)
@@ -379,7 +379,7 @@  discard block
 block discarded – undo
379 379
 
380 380
             if ($this->debug) {
381 381
                 error_log(
382
-                    "meeting is running: " . intval($meetingInfoExists)
382
+                    "meeting is running: ".intval($meetingInfoExists)
383 383
                 );
384 384
             }
385 385
 
@@ -396,11 +396,11 @@  discard block
 block discarded – undo
396 396
 
397 397
         if ($meetingInfoExists) {
398 398
             $joinParams = array(
399
-                'meetingId' => $meetingData['remote_id'],	//	-- REQUIRED - A unique id for the meeting
400
-                'username' => $this->userCompleteName,	//-- REQUIRED - The name that will display for the user in the meeting
401
-                'password' => $pass,			//-- REQUIRED - The attendee or moderator password, depending on what's passed here
399
+                'meetingId' => $meetingData['remote_id'], //	-- REQUIRED - A unique id for the meeting
400
+                'username' => $this->userCompleteName, //-- REQUIRED - The name that will display for the user in the meeting
401
+                'password' => $pass, //-- REQUIRED - The attendee or moderator password, depending on what's passed here
402 402
                 //'createTime' => api_get_utc_datetime(),			//-- OPTIONAL - string. Leave blank ('') unless you set this correctly.
403
-                'userID' => api_get_user_id(),				//-- OPTIONAL - string
403
+                'userID' => api_get_user_id(), //-- OPTIONAL - string
404 404
                 'webVoiceConf' => ''	//	-- OPTIONAL - string
405 405
             );
406 406
             $url = $this->api->getJoinMeetingURL($joinParams);
@@ -409,7 +409,7 @@  discard block
 block discarded – undo
409 409
             $url = $this->logoutUrl;
410 410
         }
411 411
         if ($this->debug) {
412
-            error_log("return url :" . $url);
412
+            error_log("return url :".$url);
413 413
         }
414 414
 
415 415
         return $url;
@@ -452,14 +452,14 @@  discard block
 block discarded – undo
452 452
         $conditions = [];
453 453
 
454 454
         if ($courseId || $sessionId || $groupId) {
455
-            $conditions =  array(
455
+            $conditions = array(
456 456
                 'where' => array(
457 457
                     'c_id = ? AND session_id = ? ' => array($courseId, $sessionId),
458 458
                 ),
459 459
             );
460 460
 
461 461
             if ($this->hasGroupSupport()) {
462
-                $conditions =  array(
462
+                $conditions = array(
463 463
                     'where' => array(
464 464
                         'c_id = ? AND session_id = ? AND group_id = ? ' => array($courseId, $sessionId, $groupId)
465 465
                     )
@@ -494,7 +494,7 @@  discard block
 block discarded – undo
494 494
             }
495 495
             $meetingBBB['end_url'] = $this->endUrl($meetingDB);
496 496
 
497
-            if ((string)$meetingBBB['returncode'] == 'FAILED') {
497
+            if ((string) $meetingBBB['returncode'] == 'FAILED') {
498 498
                 if ($meetingDB['status'] == 1 && $this->isConferenceManager()) {
499 499
                     $this->endMeeting($meetingDB['id']);
500 500
                 }
@@ -664,7 +664,7 @@  discard block
 block discarded – undo
664 664
                     $item['action_links'] = implode('<br />', $actionLinksArray);
665 665
                 }
666 666
                 //var_dump($recordArray);
667
-                $item['show_links']  = implode('<br />', $recordArray);
667
+                $item['show_links'] = implode('<br />', $recordArray);
668 668
                 $item['action_links'] = implode('<br />', $actionLinksArray);
669 669
             }
670 670
 
@@ -677,11 +677,11 @@  discard block
 block discarded – undo
677 677
 
678 678
             if ($meetingDB['status'] == 1) {
679 679
                 $joinParams = array(
680
-                    'meetingId' => $meetingDB['remote_id'],		//-- REQUIRED - A unique id for the meeting
681
-                    'username' => $this->userCompleteName,	//-- REQUIRED - The name that will display for the user in the meeting
682
-                    'password' => $pass,			//-- REQUIRED - The attendee or moderator password, depending on what's passed here
683
-                    'createTime' => '',			//-- OPTIONAL - string. Leave blank ('') unless you set this correctly.
684
-                    'userID' => '',			//	-- OPTIONAL - string
680
+                    'meetingId' => $meetingDB['remote_id'], //-- REQUIRED - A unique id for the meeting
681
+                    'username' => $this->userCompleteName, //-- REQUIRED - The name that will display for the user in the meeting
682
+                    'password' => $pass, //-- REQUIRED - The attendee or moderator password, depending on what's passed here
683
+                    'createTime' => '', //-- OPTIONAL - string. Leave blank ('') unless you set this correctly.
684
+                    'userID' => '', //	-- OPTIONAL - string
685 685
                     'webVoiceConf' => ''	//	-- OPTIONAL - string
686 686
                 );
687 687
                 $item['go_url'] = $this->protocol.$this->api->getJoinMeetingURL($joinParams);
@@ -746,8 +746,8 @@  discard block
 block discarded – undo
746 746
         $pass = $this->getUserMeetingPassword();
747 747
 
748 748
         $endParams = array(
749
-            'meetingId' => $meetingData['remote_id'],   // REQUIRED - We have to know which meeting to end.
750
-            'password' => $pass,        // REQUIRED - Must match moderator pass for meeting.
749
+            'meetingId' => $meetingData['remote_id'], // REQUIRED - We have to know which meeting to end.
750
+            'password' => $pass, // REQUIRED - Must match moderator pass for meeting.
751 751
         );
752 752
         $this->api->endMeetingWithXmlResponseArray($endParams);
753 753
         Database::update(
@@ -972,7 +972,7 @@  discard block
 block discarded – undo
972 972
      */
973 973
     public function redirectToBBB($url)
974 974
     {
975
-        if (file_exists(__DIR__ . '/../config.vm.php')) {
975
+        if (file_exists(__DIR__.'/../config.vm.php')) {
976 976
             // Using VM
977 977
             echo Display::url(get_lang('ClickToContinue'), $url);
978 978
             exit;
Please login to merge, or discard this patch.
plugin/bbb/admin.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -7,7 +7,7 @@
 block discarded – undo
7 7
  * @package chamilo.plugin.clockworksms
8 8
  * @author  Imanol Losada <[email protected]>
9 9
  */
10
-require_once __DIR__ . '/../../main/inc/global.inc.php';
10
+require_once __DIR__.'/../../main/inc/global.inc.php';
11 11
 
12 12
 require_once 'lib/clockworksms.lib.php';
13 13
 require_once 'vendor/clockworksms_api.php';
Please login to merge, or discard this patch.