Completed
Pull Request — 1.11.x (#1293)
by José
387:57 queued 349:55
created
main/inc/lib/fileDisplay.lib.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -211,7 +211,7 @@  discard block
 block discarded – undo
211 211
     $last_modified = 0;
212 212
     $return = 0;
213 213
     if (is_dir($dir)) {
214
-        while(($entry = $dir->read()) !== false)
214
+        while (($entry = $dir->read()) !== false)
215 215
         {
216 216
             if ($entry != '.' && $entry != '..')
217 217
                 continue;
@@ -284,7 +284,7 @@  discard block
 block discarded – undo
284 284
         'props.session_id'
285 285
     );
286 286
 
287
-    $visibility_rule = ' props.visibility ' . ($can_see_invisible ? '<> 2' : '= 1');
287
+    $visibility_rule = ' props.visibility '.($can_see_invisible ? '<> 2' : '= 1');
288 288
 
289 289
     $sql = "SELECT SUM(table1.size) FROM (
290 290
                 SELECT size
Please login to merge, or discard this patch.
main/inc/lib/zombie/zombie_manager.class.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
         $count = intval($count);
80 80
         $from = intval($from);
81 81
 
82
-        $sql .=  " ORDER BY $column $direction";
82
+        $sql .= " ORDER BY $column $direction";
83 83
         $sql .= " LIMIT $count, $from ";
84 84
 
85 85
         $result = Database::query($sql);
@@ -93,8 +93,8 @@  discard block
 block discarded – undo
93 93
     static function deactivate_zombies($ceiling)
94 94
     {
95 95
         $zombies = self::list_zombies($ceiling);
96
-        $ids  = array();
97
-        foreach($zombies as $zombie) {
96
+        $ids = array();
97
+        foreach ($zombies as $zombie) {
98 98
             $ids[] = $zombie['user_id'];
99 99
         }
100 100
         UserManager::deactivate_users($ids);
Please login to merge, or discard this patch.
main/inc/lib/zombie/zombie_report.class.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -167,7 +167,7 @@  discard block
 block discarded – undo
167 167
         }
168 168
 
169 169
         $action = $this->get_action();
170
-        $f = array($this, 'action_' . $action);
170
+        $f = array($this, 'action_'.$action);
171 171
         if (is_callable($f)) {
172 172
             return call_user_func($f, $ids);
173 173
         }
@@ -292,7 +292,7 @@  discard block
 block discarded – undo
292 292
             $text = get_lang('No');
293 293
         }
294 294
 
295
-        $result = Display::return_icon($image . '.png', $text);
295
+        $result = Display::return_icon($image.'.png', $text);
296 296
         return $result;
297 297
     }
298 298
 
Please login to merge, or discard this patch.
main/inc/lib/text.lib.php 1 patch
Spacing   +74 added lines, -74 removed lines patch added patch discarded remove patch
@@ -58,10 +58,10 @@  discard block
 block discarded – undo
58 58
     if (@preg_match('/(.*<head.*)(<meta[^>]*content=[^>]*>)(.*<\/head>.*)/si', $string, $matches)) {
59 59
         $meta = $matches[2];
60 60
         if (@preg_match("/(<meta[^>]*charset=)(.*)([\"';][^>]*>)/si", $meta, $matches1)) {
61
-            $meta = $matches1[1] . $encoding . $matches1[3];
62
-            $string = $matches[1] . $meta . $matches[3];
61
+            $meta = $matches1[1].$encoding.$matches1[3];
62
+            $string = $matches[1].$meta.$matches[3];
63 63
         } else {
64
-            $string = $matches[1] . '<meta http-equiv="Content-Type" content="text/html; charset='.$encoding.'"/>' . $matches[3];
64
+            $string = $matches[1].'<meta http-equiv="Content-Type" content="text/html; charset='.$encoding.'"/>'.$matches[3];
65 65
         }
66 66
     } else {
67 67
         $count = 1;
@@ -168,9 +168,9 @@  discard block
 block discarded – undo
168 168
     if (!preg_match(_PCRE_XML_ENCODING, $string)) {
169 169
         if (strpos($matches[0], 'standalone') !== false) {
170 170
             // The encoding option should precede the standalone option, othewise DOMDocument fails to load the document.
171
-            $replace = str_replace('standalone', ' encoding="'.$to_encoding.'" standalone' , $matches[0]);
171
+            $replace = str_replace('standalone', ' encoding="'.$to_encoding.'" standalone', $matches[0]);
172 172
         } else {
173
-            $replace = str_replace('?>', ' encoding="'.$to_encoding.'"?>' , $matches[0]);
173
+            $replace = str_replace('?>', ' encoding="'.$to_encoding.'"?>', $matches[0]);
174 174
         }
175 175
         return api_convert_encoding(str_replace($matches[0], $replace, $string), $to_encoding, $from_encoding);
176 176
     }
@@ -335,7 +335,7 @@  discard block
 block discarded – undo
335 335
 function _make_url_clickable_cb($matches) {
336 336
     $url = $matches[2];
337 337
 
338
-    if ( ')' == $matches[3] && strpos( $url, '(' ) ) {
338
+    if (')' == $matches[3] && strpos($url, '(')) {
339 339
         // If the trailing character is a closing parethesis, and the URL has an opening parenthesis in it, add the closing parenthesis to the URL.
340 340
         // Then we can let the parenthesis balancer do its thing below.
341 341
         $url .= $matches[3];
@@ -345,16 +345,16 @@  discard block
 block discarded – undo
345 345
     }
346 346
 
347 347
     // Include parentheses in the URL only if paired
348
-    while ( substr_count( $url, '(' ) < substr_count( $url, ')' ) ) {
349
-        $suffix = strrchr( $url, ')' ) . $suffix;
350
-        $url = substr( $url, 0, strrpos( $url, ')' ) );
348
+    while (substr_count($url, '(') < substr_count($url, ')')) {
349
+        $suffix = strrchr($url, ')').$suffix;
350
+        $url = substr($url, 0, strrpos($url, ')'));
351 351
     }
352 352
 
353 353
     $url = esc_url($url);
354
-    if ( empty($url) )
354
+    if (empty($url))
355 355
         return $matches[0];
356 356
 
357
-    return $matches[1] . "<a href=\"$url\" rel=\"nofollow\">$url</a>" . $suffix;
357
+    return $matches[1]."<a href=\"$url\" rel=\"nofollow\">$url</a>".$suffix;
358 358
 }
359 359
 
360 360
 /**
@@ -374,10 +374,10 @@  discard block
 block discarded – undo
374 374
  * @param string $_context Private. Use esc_url_raw() for database usage.
375 375
  * @return string The cleaned $url after the 'clean_url' filter is applied.
376 376
  */
377
-function esc_url( $url, $protocols = null, $_context = 'display' ) {
377
+function esc_url($url, $protocols = null, $_context = 'display') {
378 378
     //$original_url = $url;
379 379
 
380
-    if ( '' == $url )
380
+    if ('' == $url)
381 381
         return $url;
382 382
     $url = preg_replace('|[^a-z0-9-~+_.?#=!&;,/:%@$\|*\'()\\x80-\\xff]|i', '', $url);
383 383
     $strip = array('%0d', '%0a', '%0D', '%0A');
@@ -387,9 +387,9 @@  discard block
 block discarded – undo
387 387
      * presume it needs http:// appended (unless a relative
388 388
      * link starting with /, # or ? or a php file).
389 389
      */
390
-    if ( strpos($url, ':') === false && ! in_array( $url[0], array( '/', '#', '?' ) ) &&
391
-        ! preg_match('/^[a-z0-9-]+?\.php/i', $url) )
392
-        $url = 'http://' . $url;
390
+    if (strpos($url, ':') === false && !in_array($url[0], array('/', '#', '?')) &&
391
+        !preg_match('/^[a-z0-9-]+?\.php/i', $url))
392
+        $url = 'http://'.$url;
393 393
 
394 394
     return Security::remove_XSS($url);
395 395
 
@@ -437,12 +437,12 @@  discard block
 block discarded – undo
437 437
  * @param string $subject The string being searched and replaced on, otherwise known as the haystack.
438 438
  * @return string The string with the replaced svalues.
439 439
  */
440
-function _deep_replace( $search, $subject ) {
440
+function _deep_replace($search, $subject) {
441 441
     $subject = (string) $subject;
442 442
 
443 443
     $count = 1;
444
-    while ( $count ) {
445
-        $subject = str_replace( $search, '', $subject, $count );
444
+    while ($count) {
445
+        $subject = str_replace($search, '', $subject, $count);
446 446
     }
447 447
 
448 448
     return $subject;
@@ -464,17 +464,17 @@  discard block
 block discarded – undo
464 464
 function _make_web_ftp_clickable_cb($matches) {
465 465
     $ret = '';
466 466
     $dest = $matches[2];
467
-    $dest = 'http://' . $dest;
467
+    $dest = 'http://'.$dest;
468 468
     $dest = esc_url($dest);
469
-    if ( empty($dest) )
469
+    if (empty($dest))
470 470
         return $matches[0];
471 471
 
472 472
     // removed trailing [.,;:)] from URL
473
-    if ( in_array( substr($dest, -1), array('.', ',', ';', ':', ')') ) === true ) {
473
+    if (in_array(substr($dest, -1), array('.', ',', ';', ':', ')')) === true) {
474 474
         $ret = substr($dest, -1);
475
-        $dest = substr($dest, 0, strlen($dest)-1);
475
+        $dest = substr($dest, 0, strlen($dest) - 1);
476 476
     }
477
-    return $matches[1] . "<a href=\"$dest\" rel=\"nofollow\">$dest</a>$ret";
477
+    return $matches[1]."<a href=\"$dest\" rel=\"nofollow\">$dest</a>$ret";
478 478
 }
479 479
 
480 480
 /**
@@ -490,8 +490,8 @@  discard block
 block discarded – undo
490 490
  * @return string HTML A element with email address.
491 491
  */
492 492
 function _make_email_clickable_cb($matches) {
493
-    $email = $matches[2] . '@' . $matches[3];
494
-    return $matches[1] . "<a href=\"mailto:$email\">$email</a>";
493
+    $email = $matches[2].'@'.$matches[3];
494
+    return $matches[1]."<a href=\"mailto:$email\">$email</a>";
495 495
 }
496 496
 
497 497
 /**
@@ -505,30 +505,30 @@  discard block
 block discarded – undo
505 505
  * @param string $text Content to convert URIs.
506 506
  * @return string Content with converted URIs.
507 507
  */
508
-function make_clickable( $text ) {
508
+function make_clickable($text) {
509 509
     $r = '';
510
-    $textarr = preg_split( '/(<[^<>]+>)/', $text, -1, PREG_SPLIT_DELIM_CAPTURE ); // split out HTML tags
510
+    $textarr = preg_split('/(<[^<>]+>)/', $text, -1, PREG_SPLIT_DELIM_CAPTURE); // split out HTML tags
511 511
     $nested_code_pre = 0; // Keep track of how many levels link is nested inside <pre> or <code>
512
-    foreach ( $textarr as $piece ) {
512
+    foreach ($textarr as $piece) {
513 513
 
514
-        if ( preg_match( '|^<code[\s>]|i', $piece ) || preg_match( '|^<pre[\s>]|i', $piece ) )
514
+        if (preg_match('|^<code[\s>]|i', $piece) || preg_match('|^<pre[\s>]|i', $piece))
515 515
             $nested_code_pre++;
516
-        elseif ( ( '</code>' === strtolower( $piece ) || '</pre>' === strtolower( $piece ) ) && $nested_code_pre )
516
+        elseif (('</code>' === strtolower($piece) || '</pre>' === strtolower($piece)) && $nested_code_pre)
517 517
             $nested_code_pre--;
518 518
 
519
-        if ( $nested_code_pre || empty( $piece ) || ( $piece[0] === '<' && ! preg_match( '|^<\s*[\w]{1,20}+://|', $piece ) ) ) {
519
+        if ($nested_code_pre || empty($piece) || ($piece[0] === '<' && !preg_match('|^<\s*[\w]{1,20}+://|', $piece))) {
520 520
             $r .= $piece;
521 521
             continue;
522 522
         }
523 523
 
524 524
         // Long strings might contain expensive edge cases ...
525
-        if ( 10000 < strlen( $piece ) ) {
525
+        if (10000 < strlen($piece)) {
526 526
             // ... break it up
527
-            foreach ( _split_str_by_whitespace( $piece, 2100 ) as $chunk ) { // 2100: Extra room for scheme and leading and trailing paretheses
528
-                if ( 2101 < strlen( $chunk ) ) {
527
+            foreach (_split_str_by_whitespace($piece, 2100) as $chunk) { // 2100: Extra room for scheme and leading and trailing paretheses
528
+                if (2101 < strlen($chunk)) {
529 529
                     $r .= $chunk; // Too big, no whitespace: bail.
530 530
                 } else {
531
-                    $r .= make_clickable( $chunk );
531
+                    $r .= make_clickable($chunk);
532 532
                 }
533 533
             }
534 534
         } else {
@@ -549,18 +549,18 @@  discard block
 block discarded – undo
549 549
 			~xS'; // The regex is a non-anchored pattern and does not have a single fixed starting character.
550 550
             // Tell PCRE to spend more time optimizing since, when used on a page load, it will probably be used several times.
551 551
 
552
-            $ret = preg_replace_callback( $url_clickable, '_make_url_clickable_cb', $ret );
552
+            $ret = preg_replace_callback($url_clickable, '_make_url_clickable_cb', $ret);
553 553
 
554
-            $ret = preg_replace_callback( '#([\s>])((www|ftp)\.[\w\\x80-\\xff\#$%&~/.\-;:=,?@\[\]+]+)#is', '_make_web_ftp_clickable_cb', $ret );
555
-            $ret = preg_replace_callback( '#([\s>])([.0-9a-z_+-]+)@(([0-9a-z-]+\.)+[0-9a-z]{2,})#i', '_make_email_clickable_cb', $ret );
554
+            $ret = preg_replace_callback('#([\s>])((www|ftp)\.[\w\\x80-\\xff\#$%&~/.\-;:=,?@\[\]+]+)#is', '_make_web_ftp_clickable_cb', $ret);
555
+            $ret = preg_replace_callback('#([\s>])([.0-9a-z_+-]+)@(([0-9a-z-]+\.)+[0-9a-z]{2,})#i', '_make_email_clickable_cb', $ret);
556 556
 
557
-            $ret = substr( $ret, 1, -1 ); // Remove our whitespace padding.
557
+            $ret = substr($ret, 1, -1); // Remove our whitespace padding.
558 558
             $r .= $ret;
559 559
         }
560 560
     }
561 561
 
562 562
     // Cleanup of accidental links within links
563
-    $r = preg_replace( '#(<a([ \r\n\t]+[^>]+?>|>))<a [^>]+?>([^>]+?)</a></a>#i', "$1$3</a>", $r );
563
+    $r = preg_replace('#(<a([ \r\n\t]+[^>]+?>|>))<a [^>]+?>([^>]+?)</a></a>#i', "$1$3</a>", $r);
564 564
     return $r;
565 565
 }
566 566
 
@@ -595,27 +595,27 @@  discard block
 block discarded – undo
595 595
  * @param int $goal The desired chunk length.
596 596
  * @return array Numeric array of chunks.
597 597
  */
598
-function _split_str_by_whitespace( $string, $goal ) {
598
+function _split_str_by_whitespace($string, $goal) {
599 599
     $chunks = array();
600 600
 
601
-    $string_nullspace = strtr( $string, "\r\n\t\v\f ", "\000\000\000\000\000\000" );
601
+    $string_nullspace = strtr($string, "\r\n\t\v\f ", "\000\000\000\000\000\000");
602 602
 
603
-    while ( $goal < strlen( $string_nullspace ) ) {
604
-        $pos = strrpos( substr( $string_nullspace, 0, $goal + 1 ), "\000" );
603
+    while ($goal < strlen($string_nullspace)) {
604
+        $pos = strrpos(substr($string_nullspace, 0, $goal + 1), "\000");
605 605
 
606
-        if ( false === $pos ) {
607
-            $pos = strpos( $string_nullspace, "\000", $goal + 1 );
608
-            if ( false === $pos ) {
606
+        if (false === $pos) {
607
+            $pos = strpos($string_nullspace, "\000", $goal + 1);
608
+            if (false === $pos) {
609 609
                 break;
610 610
             }
611 611
         }
612 612
 
613
-        $chunks[] = substr( $string, 0, $pos + 1 );
614
-        $string = substr( $string, $pos + 1 );
615
-        $string_nullspace = substr( $string_nullspace, $pos + 1 );
613
+        $chunks[] = substr($string, 0, $pos + 1);
614
+        $string = substr($string, $pos + 1);
615
+        $string_nullspace = substr($string_nullspace, $pos + 1);
616 616
     }
617 617
 
618
-    if ( $string ) {
618
+    if ($string) {
619 619
         $chunks[] = $string;
620 620
     }
621 621
 
@@ -693,7 +693,7 @@  discard block
 block discarded – undo
693 693
  */
694 694
 function get_week_from_day($date) {
695 695
     if (!empty($date)) {
696
-       $time = api_strtotime($date,'UTC');
696
+       $time = api_strtotime($date, 'UTC');
697 697
        return date('W', $time);
698 698
     } else {
699 699
         return date('W');
@@ -710,17 +710,17 @@  discard block
 block discarded – undo
710 710
  * @return a reduce string
711 711
  */
712 712
 
713
-function substrwords($text,$maxchar,$end='...')
713
+function substrwords($text, $maxchar, $end = '...')
714 714
 {
715
-	if(strlen($text)>$maxchar)
715
+	if (strlen($text) > $maxchar)
716 716
 	{
717
-		$words=explode(" ",$text);
717
+		$words = explode(" ", $text);
718 718
 		$output = '';
719
-		$i=0;
720
-		while(1)
719
+		$i = 0;
720
+		while (1)
721 721
 		{
722
-			$length = (strlen($output)+strlen($words[$i]));
723
-			if($length>$maxchar)
722
+			$length = (strlen($output) + strlen($words[$i]));
723
+			if ($length > $maxchar)
724 724
 			{
725 725
 				break;
726 726
 			}
@@ -742,7 +742,7 @@  discard block
 block discarded – undo
742 742
 function implode_with_key($glue, $array) {
743 743
     if (!empty($array)) {
744 744
         $string = '';
745
-        foreach($array as $key => $value) {
745
+        foreach ($array as $key => $value) {
746 746
             if (empty($value)) {
747 747
                 $value = 'null';
748 748
             }
@@ -764,13 +764,13 @@  discard block
 block discarded – undo
764 764
 {
765 765
     $file_size = intval($file_size);
766 766
     if ($file_size >= 1073741824) {
767
-        $file_size = round($file_size / 1073741824 * 100) / 100 . 'G';
768
-    } elseif($file_size >= 1048576) {
769
-        $file_size = round($file_size / 1048576 * 100) / 100 . 'M';
770
-    } elseif($file_size >= 1024) {
771
-        $file_size = round($file_size / 1024 * 100) / 100 . 'k';
767
+        $file_size = round($file_size / 1073741824 * 100) / 100.'G';
768
+    } elseif ($file_size >= 1048576) {
769
+        $file_size = round($file_size / 1048576 * 100) / 100.'M';
770
+    } elseif ($file_size >= 1024) {
771
+        $file_size = round($file_size / 1024 * 100) / 100.'k';
772 772
     } else {
773
-        $file_size = $file_size . 'B';
773
+        $file_size = $file_size.'B';
774 774
     }
775 775
     return $file_size;
776 776
 }
@@ -779,18 +779,18 @@  discard block
 block discarded – undo
779 779
 {
780 780
     $year	 = '0000';
781 781
     $month = $day = $hours = $minutes = $seconds = '00';
782
-    if (isset($array['Y']) && (isset($array['F']) || isset($array['M']))  && isset($array['d']) && isset($array['H']) && isset($array['i'])) {
782
+    if (isset($array['Y']) && (isset($array['F']) || isset($array['M'])) && isset($array['d']) && isset($array['H']) && isset($array['i'])) {
783 783
         $year = $array['Y'];
784
-        $month = isset($array['F'])?$array['F']:$array['M'];
785
-        if (intval($month) < 10 ) $month = '0'.$month;
784
+        $month = isset($array['F']) ? $array['F'] : $array['M'];
785
+        if (intval($month) < 10) $month = '0'.$month;
786 786
         $day = $array['d'];
787
-        if (intval($day) < 10 ) $day = '0'.$day;
787
+        if (intval($day) < 10) $day = '0'.$day;
788 788
         $hours = $array['H'];
789
-        if (intval($hours) < 10 ) $hours = '0'.$hours;
789
+        if (intval($hours) < 10) $hours = '0'.$hours;
790 790
         $minutes = $array['i'];
791
-        if (intval($minutes) < 10 ) $minutes = '0'.$minutes;
791
+        if (intval($minutes) < 10) $minutes = '0'.$minutes;
792 792
     }
793
-    if (checkdate($month,$day,$year)) {
793
+    if (checkdate($month, $day, $year)) {
794 794
         $datetime = $year.'-'.$month.'-'.$day.' '.$hours.':'.$minutes.':'.$seconds;
795 795
     }
796 796
     return $datetime;
Please login to merge, or discard this patch.
main/tracking/toolaccess_details.php 1 patch
Spacing   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
 
24 24
 $nameTools = get_lang('ToolName');
25 25
 
26
-$interbreadcrumb[]= array ("url"=>"courseLog.php", "name"=> "Statistics");
26
+$interbreadcrumb[] = array("url"=>"courseLog.php", "name"=> "Statistics");
27 27
 
28 28
 $htmlHeadXtra[] = "<style type='text/css'>
29 29
 /*<![CDATA[*/
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
 td {border-bottom: thin dashed gray;}
41 41
 /*]]>*/
42 42
 </style>";
43
-Display::display_header($nameTools,"Tracking");
43
+Display::display_header($nameTools, "Tracking");
44 44
 ?>
45 45
 
46 46
 <h3>
@@ -59,16 +59,16 @@  discard block
 block discarded – undo
59 59
 // Defining the months of the year to allow translation of the months
60 60
 $MonthsShort = api_get_months_short();
61 61
 
62
-$tool=$_REQUEST['tool'];
63
-$period=$_REQUEST['period'];
64
-$reqdate=$_REQUEST['reqdate'];
62
+$tool = $_REQUEST['tool'];
63
+$period = $_REQUEST['period'];
64
+$reqdate = $_REQUEST['reqdate'];
65 65
 ?>
66 66
 <table width="100%" cellpadding="2" cellspacing="0" border="0">
67 67
 <?php
68 68
     $TABLETRACK_ACCESS = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ACCESS);
69 69
     $courseId = api_get_course_int_id();
70 70
     //stats for the current course
71
-    if(isset($_cid)) {
71
+    if (isset($_cid)) {
72 72
         // to see stats of one course user must be courseAdmin of this course
73 73
         $is_allowedToTrack = $is_courseAdmin;
74 74
         $courseCodeEqualcidIfNeeded = "AND c_id = '$courseId'";
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
         $is_allowedToTrack = $is_platformAdmin;
79 79
         $courseCodeEqualcidIfNeeded = "";
80 80
     }
81
-    if( $is_allowedToTrack) {
81
+    if ($is_allowedToTrack) {
82 82
         // list of all tools
83 83
         if (!isset($tool)) {
84 84
             $sql = "SELECT access_tool, count( access_tool )
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
             echo "<tr>
91 91
                     <td>
92 92
                     ";
93
-            if(isset($_cid)) echo "<b>$_cid : </b>";
93
+            if (isset($_cid)) echo "<b>$_cid : </b>";
94 94
             echo "		<b>".get_lang('ToolList')."</b>
95 95
 					</td>
96 96
                 </tr>
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
                 </tr>";
109 109
             if (is_array($results))
110 110
             {
111
-                for($j = 0 ; $j < count($results) ; $j++)
111
+                for ($j = 0; $j < count($results); $j++)
112 112
                 {
113 113
                         echo "<tr>";
114 114
                         echo "<td><a href='toolaccess_details.php?tool=".urlencode($results[$j][0])."'>".get_lang($results[$j][0])."</a></td>";
@@ -131,12 +131,12 @@  discard block
 block discarded – undo
131 131
             $encodedTool = urlencode($tool);
132 132
             $tool = urldecode($tool);
133 133
 
134
-            if( !isset($reqdate) )
134
+            if (!isset($reqdate))
135 135
                 $reqdate = time();
136 136
             echo "<tr>
137 137
                     <td>
138 138
 					";
139
-            if(isset($_cid)) echo "<b>$_cid : </b>";
139
+            if (isset($_cid)) echo "<b>$_cid : </b>";
140 140
             echo "        <b>".get_lang($tool)."</b>
141 141
 					</td>
142 142
                 </tr>
@@ -145,22 +145,22 @@  discard block
 block discarded – undo
145 145
             /* ------ display ------ */
146 146
             // displayed period
147 147
             echo "<tr><td>";
148
-            switch($period)
148
+            switch ($period)
149 149
             {
150 150
                 case "month" :
151
-                    echo $MonthsLong[date("n", $reqdate)-1].date(" Y", $reqdate);
151
+                    echo $MonthsLong[date("n", $reqdate) - 1].date(" Y", $reqdate);
152 152
                     break;
153 153
                 case "week" :
154
-                    $weeklowreqdate = ($reqdate-(86400*date("w" , $reqdate)));
155
-                    $weekhighreqdate = ($reqdate+(86400*(6-date("w" , $reqdate)) ));
156
-                    echo "<b>".$langFrom."</b> ".date("d " , $weeklowreqdate).$MonthsLong[date("n", $weeklowreqdate)-1].date(" Y" , $weeklowreqdate);
157
-                    echo " <b>".$langTo."</b> ".date("d " , $weekhighreqdate ).$MonthsLong[date("n", $weekhighreqdate)-1].date(" Y" , $weekhighreqdate);
154
+                    $weeklowreqdate = ($reqdate - (86400 * date("w", $reqdate)));
155
+                    $weekhighreqdate = ($reqdate + (86400 * (6 - date("w", $reqdate))));
156
+                    echo "<b>".$langFrom."</b> ".date("d ", $weeklowreqdate).$MonthsLong[date("n", $weeklowreqdate) - 1].date(" Y", $weeklowreqdate);
157
+                    echo " <b>".$langTo."</b> ".date("d ", $weekhighreqdate).$MonthsLong[date("n", $weekhighreqdate) - 1].date(" Y", $weekhighreqdate);
158 158
                     break;
159 159
                 // default == day
160 160
                 default :
161 161
                     $period = "day";
162 162
                 case "day" :
163
-                    echo $DaysLong[date("w" , $reqdate)].date(" d " , $reqdate).$MonthsLong[date("n", $reqdate)-1].date(" Y" , $reqdate);
163
+                    echo $DaysLong[date("w", $reqdate)].date(" d ", $reqdate).$MonthsLong[date("n", $reqdate) - 1].date(" Y", $reqdate);
164 164
                     break;
165 165
             }
166 166
             echo "</tr></td>";
@@ -174,13 +174,13 @@  discard block
 block discarded – undo
174 174
                     &nbsp;&nbsp;&nbsp;||&nbsp;&nbsp;&nbsp;
175 175
 
176 176
                     ";
177
-            switch($period)
177
+            switch ($period)
178 178
             {
179 179
                 case "month" :
180 180
                     // previous and next date must be evaluated
181 181
                     // 30 days should be a good approximation
182
-                    $previousReqDate = mktime(1,1,1,date("m",$reqdate)-1,1,date("Y",$reqdate));
183
-                    $nextReqDate = mktime(1,1,1,date("m",$reqdate)+1,1,date("Y",$reqdate));
182
+                    $previousReqDate = mktime(1, 1, 1, date("m", $reqdate) - 1, 1, date("Y", $reqdate));
183
+                    $nextReqDate = mktime(1, 1, 1, date("m", $reqdate) + 1, 1, date("Y", $reqdate));
184 184
                     echo   "
185 185
                         [<a href='".api_get_self()."?tool=$encodedTool&period=month&reqdate=$previousReqDate' class='specialLink'>$langPreviousMonth</a>]
186 186
                         [<a href='".api_get_self()."?tool=$encodedTool&period=month&reqdate=$nextReqDate' class='specialLink'>$langNextMonth</a>]
@@ -188,8 +188,8 @@  discard block
 block discarded – undo
188 188
                     break;
189 189
                 case "week" :
190 190
                     // previous and next date must be evaluated
191
-                    $previousReqDate = $reqdate - 7*86400;
192
-                    $nextReqDate = $reqdate + 7*86400;
191
+                    $previousReqDate = $reqdate - 7 * 86400;
192
+                    $nextReqDate = $reqdate + 7 * 86400;
193 193
                     echo   "
194 194
                         [<a href='".api_get_self()."?tool=$encodedTool&period=week&reqdate=$previousReqDate' class='specialLink'>$langPreviousWeek</a>]
195 195
                         [<a href='".api_get_self()."?tool=$encodedTool&period=week&reqdate=$nextReqDate' class='specialLink'>$langNextWeek</a>]
@@ -213,7 +213,7 @@  discard block
 block discarded – undo
213 213
                 </tr>
214 214
             ";
215 215
             // display information about this period
216
-            switch($period)
216
+            switch ($period)
217 217
             {
218 218
                 // all days
219 219
                 case "month" :
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
                                 ORDER BY access_date ASC";
227 227
 
228 228
                     $days_array = StatsUtils::daysTab($sql);
229
-                    StatsUtils::makeHitsTable($days_array,$langDay);
229
+                    StatsUtils::makeHitsTable($days_array, $langDay);
230 230
                     break;
231 231
                 // all days
232 232
                 case "week" :
@@ -239,7 +239,7 @@  discard block
 block discarded – undo
239 239
                                 ORDER BY access_date ASC";
240 240
 
241 241
                     $days_array = StatsUtils::daysTab($sql);
242
-                    StatsUtils::makeHitsTable($days_array,$langDay);
242
+                    StatsUtils::makeHitsTable($days_array, $langDay);
243 243
                     break;
244 244
                 // all hours
245 245
                 case "day"  :
@@ -251,8 +251,8 @@  discard block
 block discarded – undo
251 251
                                     AND YEAR(access_date) = YEAR(FROM_UNIXTIME('$reqdate'))
252 252
                                 ORDER BY access_date ASC";
253 253
 
254
-                    $hours_array = StatsUtils::hoursTab($sql,$reqdate);
255
-                    StatsUtils::makeHitsTable($hours_array,$langHour);
254
+                    $hours_array = StatsUtils::hoursTab($sql, $reqdate);
255
+                    StatsUtils::makeHitsTable($hours_array, $langHour);
256 256
                     break;
257 257
             }
258 258
         }
Please login to merge, or discard this patch.
main/tracking/logins_details.php 1 patch
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -75,13 +75,13 @@  discard block
 block discarded – undo
75 75
     // check if uid is tutor of this group
76 76
     $courseId = api_get_course_int_id();
77 77
 
78
-    if (( $is_allowedToTrack || $is_allowedToTrackEverybodyInCourse)) {
78
+    if (($is_allowedToTrack || $is_allowedToTrackEverybodyInCourse)) {
79 79
         if ($is_allowedToTrackEverybodyInCourse) {
80 80
             $sql = "SELECT u.firstname,u.lastname, u.email
81 81
                     FROM $TABLECOURSUSER cu , $TABLEUSER u
82 82
                     WHERE
83 83
                         cu.user_id = u.user_id AND
84
-                        cu.relation_type<>" . COURSE_RELATION_TYPE_RRHH . " AND
84
+                        cu.relation_type<>".COURSE_RELATION_TYPE_RRHH." AND
85 85
                         cu.c_id = '$courseId' AND
86 86
                         u.user_id = '$uInfo'";
87 87
         } else {
@@ -97,21 +97,21 @@  discard block
 block discarded – undo
97 97
             $res[2] == "" ? $res2 = get_lang('NoEmail') : $res2 = Display::encrypted_mailto_link($res[2]);
98 98
 
99 99
             echo "<tr><td>";
100
-            echo $informationsAbout . " : <br>";
100
+            echo $informationsAbout." : <br>";
101 101
             echo "<ul>\n"
102
-            . "<li>" . get_lang('FirstName') . " : " . $res[0] . "</li>\n"
103
-            . "<li>" . get_lang('LastName') . " : " . $res[1] . "</li>\n"
104
-            . "<li>" . get_lang('Email') . " : " . $res2 . "</li>\n"
102
+            . "<li>".get_lang('FirstName')." : ".$res[0]."</li>\n"
103
+            . "<li>".get_lang('LastName')." : ".$res[1]."</li>\n"
104
+            . "<li>".get_lang('Email')." : ".$res2."</li>\n"
105 105
             . "</ul>";
106 106
             echo "</td></tr>";
107 107
             /*             * ***** MENU ******* */
108 108
             echo "<tr>
109 109
                 <td>
110
-                [<a href='userLog.php?uInfo=$uInfo&view=$view'>" . get_lang('Back') . "</a>]
110
+                [<a href='userLog.php?uInfo=$uInfo&view=$view'>".get_lang('Back')."</a>]
111 111
         ";
112 112
             echo "  &nbsp;&nbsp;&nbsp;||&nbsp;&nbsp;&nbsp;
113
-                [<a href='" . api_get_self() . "?uInfo=$uInfo&view=$view&period=week&reqdate=$reqdate' class='specialLink'>" . get_lang('PeriodWeek') . "</a>]
114
-                [<a href='" . api_get_self() . "?uInfo=$uInfo&view=$view&period=month&reqdate=$reqdate' class='specialLink'>" . get_lang('PeriodMonth') . "</a>]
113
+                [<a href='" . api_get_self()."?uInfo=$uInfo&view=$view&period=week&reqdate=$reqdate' class='specialLink'>".get_lang('PeriodWeek')."</a>]
114
+                [<a href='" . api_get_self()."?uInfo=$uInfo&view=$view&period=month&reqdate=$reqdate' class='specialLink'>".get_lang('PeriodMonth')."</a>]
115 115
                 &nbsp;&nbsp;&nbsp;||&nbsp;&nbsp;&nbsp;
116 116
         ";
117 117
             switch ($period) {
@@ -120,8 +120,8 @@  discard block
 block discarded – undo
120 120
                     $previousReqDate = $reqdate - 7 * 86400;
121 121
                     $nextReqDate = $reqdate + 7 * 86400;
122 122
                     echo "
123
-                    [<a href='" . api_get_self() . "?uInfo=$uInfo&view=$view&period=week&reqdate=$previousReqDate' class='specialLink'>" . get_lang('PreviousWeek') . "</a>]
124
-                    [<a href='" . api_get_self() . "?uInfo=$uInfo&view=$view&period=week&reqdate=$nextReqDate' class='specialLink'>" . get_lang('NextWeek') . "</a>]
123
+                    [<a href='" . api_get_self()."?uInfo=$uInfo&view=$view&period=week&reqdate=$previousReqDate' class='specialLink'>".get_lang('PreviousWeek')."</a>]
124
+                    [<a href='" . api_get_self()."?uInfo=$uInfo&view=$view&period=week&reqdate=$nextReqDate' class='specialLink'>".get_lang('NextWeek')."</a>]
125 125
                 ";
126 126
                     break;
127 127
                 default :
@@ -132,8 +132,8 @@  discard block
 block discarded – undo
132 132
                     $previousReqDate = mktime(1, 1, 1, date("m", $reqdate) - 1, 1, date("Y", $reqdate));
133 133
                     $nextReqDate = mktime(1, 1, 1, date("m", $reqdate) + 1, 1, date("Y", $reqdate));
134 134
                     echo "
135
-                    [<a href='" . api_get_self() . "?uInfo=$uInfo&view=$view&period=month&reqdate=$previousReqDate' class='specialLink'>" . get_lang('PreviousMonth') . "</a>]
136
-                    [<a href='" . api_get_self() . "?uInfo=$uInfo&view=$view&period=month&reqdate=$nextReqDate' class='specialLink'>" . get_lang('NextMonth') . "</a>]
135
+                    [<a href='" . api_get_self()."?uInfo=$uInfo&view=$view&period=month&reqdate=$previousReqDate' class='specialLink'>".get_lang('PreviousMonth')."</a>]
136
+                    [<a href='" . api_get_self()."?uInfo=$uInfo&view=$view&period=month&reqdate=$nextReqDate' class='specialLink'>".get_lang('NextMonth')."</a>]
137 137
                 ";
138 138
                     break;
139 139
             }
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
                         AND YEAR(access_date) = YEAR(FROM_UNIXTIME('$reqdate'))
154 154
                         GROUP BY DAYOFMONTH(access_date)
155 155
                         ORDER BY access_date ASC";
156
-                $displayedDate = $MonthsLong[date("n", $reqdate) - 1] . date(" Y", $reqdate);
156
+                $displayedDate = $MonthsLong[date("n", $reqdate) - 1].date(" Y", $reqdate);
157 157
                 break;
158 158
             case "week" :
159 159
                 $sql = "SELECT access_date
@@ -165,24 +165,24 @@  discard block
 block discarded – undo
165 165
                         GROUP BY DAYOFMONTH(access_date)
166 166
                         ORDER BY access_date ASC";
167 167
                 $weeklowreqdate = ($reqdate - (86400 * date("w", $reqdate)));
168
-                $weekhighreqdate = ($reqdate + (86400 * (6 - date("w", $reqdate)) ));
169
-                $displayedDate = get_lang('From') . " " . date("d ", $weeklowreqdate) . $MonthsLong[date("n", $weeklowreqdate) - 1] . date(" Y", $weeklowreqdate)
170
-                        . " " . get_lang('To') . " " . date("d ", $weekhighreqdate) . $MonthsLong[date("n", $weekhighreqdate) - 1] . date(" Y", $weekhighreqdate);
168
+                $weekhighreqdate = ($reqdate + (86400 * (6 - date("w", $reqdate))));
169
+                $displayedDate = get_lang('From')." ".date("d ", $weeklowreqdate).$MonthsLong[date("n", $weeklowreqdate) - 1].date(" Y", $weeklowreqdate)
170
+                        . " ".get_lang('To')." ".date("d ", $weekhighreqdate).$MonthsLong[date("n", $weekhighreqdate) - 1].date(" Y", $weekhighreqdate);
171 171
                 break;
172 172
         }
173 173
         echo "<tr><td>";
174 174
         $results = StatsUtils::getManyResults1Col($sql);
175 175
         /*             * * display of the displayed period  ** */
176 176
         echo "<table width='100%' cellpadding='2' cellspacing='1' border='0' align=center>";
177
-        echo "<td bgcolor='#E6E6E6'>" . $displayedDate . "</td>";
177
+        echo "<td bgcolor='#E6E6E6'>".$displayedDate."</td>";
178 178
         if (is_array($results)) {
179 179
             for ($j = 0; $j < sizeof($results); $j++) {
180 180
                 $beautifulDateTime = api_convert_and_format_date($results[$j], null, date_default_timezone_get());
181 181
                 echo "<tr>";
182
-                echo "<td style='padding-left : 40px;' valign='top'>" . $beautifulDateTime . "</td>";
182
+                echo "<td style='padding-left : 40px;' valign='top'>".$beautifulDateTime."</td>";
183 183
                 echo"</tr>";
184 184
                 // $limit is used to select only results between $results[$j] (current login) and next one
185
-                if ($j == ( sizeof($results) - 1 ))
185
+                if ($j == (sizeof($results) - 1))
186 186
                     $limit = date("Y-m-d H:i:s", $nextReqDate);
187 187
                 else
188 188
                     $limit = $results[$j + 1];
@@ -192,8 +192,8 @@  discard block
 block discarded – undo
192 192
                         FROM $TABLETRACK_ACCESS
193 193
                         WHERE access_user_id = $uInfo
194 194
                             AND access_tool IS NOT NULL
195
-                            AND access_date > '" . $results[$j] . "'
196
-                            AND access_date < '" . $limit . "'
195
+                            AND access_date > '".$results[$j]."'
196
+                            AND access_date < '" . $limit."'
197 197
                             AND c_id = $courseId
198 198
                         GROUP BY access_tool
199 199
                         ORDER BY access_tool ASC";
@@ -204,8 +204,8 @@  discard block
 block discarded – undo
204 204
                     echo "<table width='50%' cellpadding='0' cellspacing='0' border='0'>\n";
205 205
                     for ($k = 0; $k < count($results2); $k++) {
206 206
                         echo "<tr>\n";
207
-                        echo "<td width='70%' style='padding-left : 60px;'>" . get_lang($results2[$k][0]) . "</td>\n";
208
-                        echo "<td width='30%' align='right' style='padding-right : 40px'>" . $results2[$k][1] . " " . get_lang('Visits') . "</td>\n";
207
+                        echo "<td width='70%' style='padding-left : 60px;'>".get_lang($results2[$k][0])."</td>\n";
208
+                        echo "<td width='30%' align='right' style='padding-right : 40px'>".$results2[$k][1]." ".get_lang('Visits')."</td>\n";
209 209
                         echo "</tr>";
210 210
                     }
211 211
                     echo "</table>\n";
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
215 215
             }
216 216
         } else {
217 217
             echo "<tr>";
218
-            echo "<td colspan='2' bgcolor='#eeeeee'>" . get_lang('NoResult') . "</td>";
218
+            echo "<td colspan='2' bgcolor='#eeeeee'>".get_lang('NoResult')."</td>";
219 219
             echo "</tr>";
220 220
         }
221 221
         echo "</table>";
Please login to merge, or discard this patch.
main/tracking/course_log_groups.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
 
99 99
 $action_links = '
100 100
 function action_formatter(cellvalue, options, rowObject) {
101
-    return \'<a href="course_log_tools.php?id_session=0&cidReq='.$course_code.'&gidReq=\'+options.rowId+\'">'.Display::return_icon('2rightarrow.png',get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>'.
101
+    return \'<a href="course_log_tools.php?id_session=0&cidReq='.$course_code.'&gidReq=\'+options.rowId+\'">'.Display::return_icon('2rightarrow.png', get_lang('Edit'), '', ICON_SIZE_SMALL).'</a>'.
102 102
     '\';
103 103
 }';
104 104
 
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
 $htmlHeadXtra[] = '
109 109
 <script>
110 110
 $(function() {
111
-    '.Display::grid_js('group_users',$url, $columns, $column_model, $extra_params, array(), $action_links, true).'
111
+    '.Display::grid_js('group_users', $url, $columns, $column_model, $extra_params, array(), $action_links, true).'
112 112
 });
113 113
 </script>';
114 114
 
Please login to merge, or discard this patch.
main/tracking/course_log_resources.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -45,8 +45,8 @@  discard block
 block discarded – undo
45 45
 
46 46
 // Breadcrumbs.
47 47
 if (isset($_GET['origin']) && $_GET['origin'] == 'resume_session') {
48
-    $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'admin/index.php','name' => get_lang('PlatformAdmin'));
49
-    $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'session/session_list.php','name' => get_lang('SessionList'));
48
+    $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'admin/index.php', 'name' => get_lang('PlatformAdmin'));
49
+    $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'session/session_list.php', 'name' => get_lang('SessionList'));
50 50
     $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'session/resume_session.php?id_session='.api_get_session_id(), 'name' => get_lang('SessionOverview'));
51 51
 }
52 52
 
@@ -76,21 +76,21 @@  discard block
 block discarded – undo
76 76
 echo Display::return_icon('tools_na.png', get_lang('ResourcesTracking'), array(), ICON_SIZE_MEDIUM);
77 77
 echo '<span style="float:right; padding-top:0px;">';
78 78
 echo '<a href="javascript: void(0);" onclick="javascript: window.print();">'.
79
-    Display::return_icon('printer.png', get_lang('Print'),'',ICON_SIZE_MEDIUM).
79
+    Display::return_icon('printer.png', get_lang('Print'), '', ICON_SIZE_MEDIUM).
80 80
 '</a>';
81 81
 
82 82
 $addional_param = '';
83 83
 if (isset($_GET['additional_profile_field'])) {
84
-    $addional_param ='additional_profile_field='.intval($_GET['additional_profile_field']);
84
+    $addional_param = 'additional_profile_field='.intval($_GET['additional_profile_field']);
85 85
 }
86 86
 
87 87
 $users_tracking_per_page = '';
88 88
 if (isset($_GET['users_tracking_per_page'])) {
89
-    $users_tracking_per_page= '&users_tracking_per_page='.intval($_GET['users_tracking_per_page']);
89
+    $users_tracking_per_page = '&users_tracking_per_page='.intval($_GET['users_tracking_per_page']);
90 90
 }
91 91
 
92 92
 echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&export=csv&'.$addional_param.$users_tracking_per_page.'">
93
-'.Display::return_icon('export_csv.png', get_lang('ExportAsCSV'),'',ICON_SIZE_MEDIUM).'</a>';
93
+'.Display::return_icon('export_csv.png', get_lang('ExportAsCSV'), '', ICON_SIZE_MEDIUM).'</a>';
94 94
 
95 95
 echo '</span>';
96 96
 echo '</div>';
Please login to merge, or discard this patch.
main/tracking/courseLogCSV.php 1 patch
Spacing   +51 added lines, -51 removed lines patch added patch discarded remove patch
@@ -53,16 +53,16 @@  discard block
 block discarded – undo
53 53
 if ($view == "00000010")
54 54
     $nameTools = get_lang('ScormAccess');
55 55
 
56
-$interbreadcrumb[] = array("url" => api_get_self() . "?view=0000000", "name" => get_lang('ToolName'));
56
+$interbreadcrumb[] = array("url" => api_get_self()."?view=0000000", "name" => get_lang('ToolName'));
57 57
 
58
-include(api_get_path(LIBRARY_PATH) . "statsUtils.lib.inc.php");
58
+include(api_get_path(LIBRARY_PATH)."statsUtils.lib.inc.php");
59 59
 include("../resourcelinker/resourcelinker.inc.php");
60 60
 
61 61
 $is_allowedToTrack = $is_courseAdmin || $is_platformAdmin || api_is_drh();
62 62
 
63 63
 /* 	MAIN CODE */
64 64
 
65
-$title[0] = get_lang('StatsOfCourse') . " : " . $_course['official_code'];
65
+$title[0] = get_lang('StatsOfCourse')." : ".$_course['official_code'];
66 66
 
67 67
 
68 68
 $courseInfo = api_get_course_info($_course['official_code']);
@@ -94,40 +94,40 @@  discard block
 block discarded – undo
94 94
         $sql = "SELECT $TABLECOURSUSER.user_i, $table_user.lastname, $table_user.firstname
95 95
                 FROM $TABLECOURSUSER, $table_user
96 96
                 WHERE
97
-                    $TABLECOURSUSER.c_id = '" . api_get_course_int_id() . "' AND
97
+                    $TABLECOURSUSER.c_id = '".api_get_course_int_id()."' AND
98 98
                     $TABLECOURSUSER.user_id = $table_user.user_id AND
99
-                    $TABLECOURSUSER.relation_type<>" . COURSE_RELATION_TYPE_RRHH . "
99
+                    $TABLECOURSUSER.relation_type<>".COURSE_RELATION_TYPE_RRHH."
100 100
                 ORDER BY $table_user.lastname";
101 101
         $results = StatsUtils::getManyResults3Col($sql);
102 102
 
103 103
         //BUGFIX: get visual code instead of real course code. Scormpaths use the visual code... (should be fixed in future versions)
104
-        $sql = "SELECT visual_code FROM $TABLECOURSE WHERE code = '" . api_get_course_id() . "'";
104
+        $sql = "SELECT visual_code FROM $TABLECOURSE WHERE code = '".api_get_course_id()."'";
105 105
         $_course['visual_code'] = StatsUtils::getOneResult($sql);
106 106
 
107 107
         if (is_array($results)) {
108 108
             $line = '';
109
-            $title_line = get_lang('Name') . ";" . get_lang('FirstAccess') . ";" . get_lang('LastAccess') . ";" . get_lang('Visited') . "\n";
109
+            $title_line = get_lang('Name').";".get_lang('FirstAccess').";".get_lang('LastAccess').";".get_lang('Visited')."\n";
110 110
 
111 111
             for ($j = 0; $j < count($results); $j++) {
112 112
                 // BEGIN % visited
113 113
                 // sum of all items (= multiple learningpaths + SCORM imported paths)
114
-                $sql = "SELECT COUNT(DISTINCT(iv.lp_item_id)) FROM $tbl_learnpath_item_view iv " .
114
+                $sql = "SELECT COUNT(DISTINCT(iv.lp_item_id)) FROM $tbl_learnpath_item_view iv ".
115 115
                         "INNER JOIN $tbl_learnpath_view v
116
-                        ON iv.lp_view_id = v.id " .
116
+                        ON iv.lp_view_id = v.id ".
117 117
                         "WHERE
118 118
                         	v.c_id = $course_id AND
119 119
                         	iv.c_id = $course_id AND
120
-                		v.user_id = " . $results[$j][0];
120
+                		v.user_id = ".$results[$j][0];
121 121
                 $total_lpath_items = StatsUtils::getOneResult($sql);
122 122
 
123 123
                 // sum of all completed items (= multiple learningpaths + SCORM imported paths)
124
-                $sql = "SELECT COUNT(DISTINCT(iv.lp_item_id)) " .
125
-                        "FROM $tbl_learnpath_item_view iv " .
126
-                        "INNER JOIN $tbl_learnpath_view v ON iv.lp_view_id = v.id " .
124
+                $sql = "SELECT COUNT(DISTINCT(iv.lp_item_id)) ".
125
+                        "FROM $tbl_learnpath_item_view iv ".
126
+                        "INNER JOIN $tbl_learnpath_view v ON iv.lp_view_id = v.id ".
127 127
                         "WHERE
128 128
                         	v.c_id = $course_id AND
129 129
                         	iv.c_id = $course_id AND
130
-                        	v.user_id = " . $results[$j][0] . " " .
130
+                        	v.user_id = ".$results[$j][0]." ".
131 131
                         "AND (status = 'completed' OR status='passed')";
132 132
                 $total_lpath_items_completed = StatsUtils::getOneResult($sql);
133 133
 
@@ -138,23 +138,23 @@  discard block
 block discarded – undo
138 138
                 // BEGIN first/last access
139 139
                 // first access
140 140
                 $sql = "SELECT access_date FROM $TABLETRACK_ACCESS_2
141
-                        WHERE access_user_id = '" . $results[$j][0] . "' AND c_id = '" . $courseId . "' AND access_tool = 'learnpath' AND access_session_id = '" . api_get_session_id() . "'
141
+                        WHERE access_user_id = '".$results[$j][0]."' AND c_id = '".$courseId."' AND access_tool = 'learnpath' AND access_session_id = '".api_get_session_id()."'
142 142
                         ORDER BY access_id ASC LIMIT 1";
143 143
                 $first_access = StatsUtils::getOneResult($sql);
144 144
                 $first_access = empty($first_access) ? "-" : date('d.m.y', strtotime($first_access));
145 145
 
146 146
                 // last access
147
-                $sql = "SELECT access_date FROM $TABLETRACK_ACCESS WHERE access_user_id = '" . $results[$j][0] . "' AND c_id = '" . $courseId . "' AND access_tool = 'learnpath'";
147
+                $sql = "SELECT access_date FROM $TABLETRACK_ACCESS WHERE access_user_id = '".$results[$j][0]."' AND c_id = '".$courseId."' AND access_tool = 'learnpath'";
148 148
                 $last_access = StatsUtils::getOneResult($sql);
149 149
                 $last_access = empty($last_access) ? "-" : date('d.m.y', strtotime($last_access));
150 150
                 // END first/last access
151 151
                 // BEGIN presentation of data
152
-                $line .= $results[$j][1] . " " . $results[$j][2] . ";" . $first_access . ";" . $last_access . ";" . $lpath_pct_completed . "\n";
152
+                $line .= $results[$j][1]." ".$results[$j][2].";".$first_access.";".$last_access.";".$lpath_pct_completed."\n";
153 153
 
154 154
                 // END presentation of data
155 155
             }
156 156
         } else {
157
-            $line = get_lang('NoResult') . "\n";
157
+            $line = get_lang('NoResult')."\n";
158 158
         }
159 159
     }
160 160
 
@@ -166,9 +166,9 @@  discard block
 block discarded – undo
166 166
 
167 167
         $sql = "SELECT count(*)
168 168
                 FROM $TABLECOURSUSER
169
-                WHERE c_id = '" . api_get_course_int_id() . "' AND relation_type<>" . COURSE_RELATION_TYPE_RRHH . "";
169
+                WHERE c_id = '".api_get_course_int_id()."' AND relation_type<>".COURSE_RELATION_TYPE_RRHH."";
170 170
         $count = StatsUtils::getOneResult($sql);
171
-        $title_line = get_lang('CountUsers') . " ; " . $count . "\n";
171
+        $title_line = get_lang('CountUsers')." ; ".$count."\n";
172 172
     }
173 173
 
174 174
     /* 	Access to this course */
@@ -186,7 +186,7 @@  discard block
 block discarded – undo
186 186
                     AND access_tool IS NULL";
187 187
         $count = StatsUtils::getOneResult($sql);
188 188
 
189
-        $line .= get_lang('CountToolAccess') . " ; " . $count . "\n";
189
+        $line .= get_lang('CountToolAccess')." ; ".$count."\n";
190 190
 
191 191
         // last 31 days
192 192
         $sql = "SELECT count(*)
@@ -196,7 +196,7 @@  discard block
 block discarded – undo
196 196
                     AND access_tool IS NULL";
197 197
         $count = StatsUtils::getOneResult($sql);
198 198
 
199
-        $line .= get_lang('Last31days') . " ; " . $count . "\n";
199
+        $line .= get_lang('Last31days')." ; ".$count."\n";
200 200
 
201 201
         // last 7 days
202 202
         $sql = "SELECT count(*)
@@ -206,7 +206,7 @@  discard block
 block discarded – undo
206 206
                     AND access_tool IS NULL";
207 207
         $count = StatsUtils::getOneResult($sql);
208 208
 
209
-        $line .= get_lang('Last7days') . " ; " . $count . "\n";
209
+        $line .= get_lang('Last7days')." ; ".$count."\n";
210 210
 
211 211
         // today
212 212
         $sql = "SELECT count(*)
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
215 215
                     AND ( access_date > CURDATE() )
216 216
                     AND access_tool IS NULL";
217 217
         $count = StatsUtils::getOneResult($sql);
218
-        $line .= get_lang('ThisDay') . " ; " . $count . "\n";
218
+        $line .= get_lang('ThisDay')." ; ".$count."\n";
219 219
     }
220 220
 
221 221
     /* 	Tools */
@@ -224,7 +224,7 @@  discard block
 block discarded – undo
224 224
         $tempView[2] = '0';
225 225
         $title[1] = $nameTools;
226 226
         $line = '';
227
-        $title_line = get_lang('ToolTitleToolnameColumn') . ";" . get_lang('ToolTitleUsersColumn') . ";" . get_lang('ToolTitleCountColumn') . "\n";
227
+        $title_line = get_lang('ToolTitleToolnameColumn').";".get_lang('ToolTitleUsersColumn').";".get_lang('ToolTitleCountColumn')."\n";
228 228
 
229 229
         $sql = "SELECT access_tool, COUNT(DISTINCT access_user_id),count( access_tool )
230 230
                 FROM $TABLETRACK_ACCESS
@@ -236,10 +236,10 @@  discard block
 block discarded – undo
236 236
 
237 237
         if (is_array($results)) {
238 238
             for ($j = 0; $j < count($results); $j++) {
239
-                $line .= $results[$j][0] . "/" . get_lang($results[$j][0]) . ";" . $results[$j][1] . ";" . $results[$j][2] . "\n";
239
+                $line .= $results[$j][0]."/".get_lang($results[$j][0]).";".$results[$j][1].";".$results[$j][2]."\n";
240 240
             }
241 241
         } else {
242
-            $line = get_lang('NoResult') . "\n";
242
+            $line = get_lang('NoResult')."\n";
243 243
         }
244 244
     }
245 245
 
@@ -261,14 +261,14 @@  discard block
 block discarded – undo
261 261
 
262 262
         $title[1] = $nameTools;
263 263
         $line = '';
264
-        $title_line = get_lang('LinksTitleLinkColumn') . ";" . get_lang('LinksTitleUsersColumn') . ";" . get_lang('LinksTitleCountColumn') . "\n";
264
+        $title_line = get_lang('LinksTitleLinkColumn').";".get_lang('LinksTitleUsersColumn').";".get_lang('LinksTitleCountColumn')."\n";
265 265
 
266 266
         if (is_array($results)) {
267 267
             for ($j = 0; $j < count($results); $j++) {
268
-                $line .= $results[$j][1] . "'>" . $results[$j][0] . ";" . $results[$j][2] . ";" . $results[$j][3] . "\n";
268
+                $line .= $results[$j][1]."'>".$results[$j][0].";".$results[$j][2].";".$results[$j][3]."\n";
269 269
             }
270 270
         } else {
271
-            $line = get_lang('NoResult') . "\n";
271
+            $line = get_lang('NoResult')."\n";
272 272
         }
273 273
     }
274 274
 
@@ -287,13 +287,13 @@  discard block
 block discarded – undo
287 287
 
288 288
         $title[1] = $nameTools;
289 289
         $line = '';
290
-        $title_line = get_lang('DocumentsTitleDocumentColumn') . ";" . get_lang('DocumentsTitleUsersColumn') . ";" . get_lang('DocumentsTitleCountColumn') . "\n";
290
+        $title_line = get_lang('DocumentsTitleDocumentColumn').";".get_lang('DocumentsTitleUsersColumn').";".get_lang('DocumentsTitleCountColumn')."\n";
291 291
         if (is_array($results)) {
292 292
             for ($j = 0; $j < count($results); $j++) {
293
-                $line .= $results[$j][0] . ";" . $results[$j][1] . ";" . $results[$j][2] . "\n";
293
+                $line .= $results[$j][0].";".$results[$j][1].";".$results[$j][2]."\n";
294 294
             }
295 295
         } else {
296
-            $line = get_lang('NoResult') . "\n";
296
+            $line = get_lang('NoResult')."\n";
297 297
         }
298 298
     }
299 299
 
@@ -321,10 +321,10 @@  discard block
 block discarded – undo
321 321
                 //echo "<a href='".api_get_self()."?view=".$view."&scormcontopen=".$ar['id']."' class='specialLink'>$lp_title</a>";
322 322
                 if ($ar['id'] == $scormcontopen) { //have to list the students here
323 323
                     $contentId = $ar['id'];
324
-                    $sql2 = "SELECT u.user_id, u.lastname, u.firstname " .
325
-                            "FROM  $tbl_learnpath_view sd " .
326
-                            "INNER JOIN $table_user u " .
327
-                            "ON u.user_id = sd.user_id " .
324
+                    $sql2 = "SELECT u.user_id, u.lastname, u.firstname ".
325
+                            "FROM  $tbl_learnpath_view sd ".
326
+                            "INNER JOIN $table_user u ".
327
+                            "ON u.user_id = sd.user_id ".
328 328
                             "WHERE sd.c_id = $course_id AND sd.lp_id=$contentId group by u.user_id";
329 329
                     //error_log($sql2,0);
330 330
                     $result2 = Database::query($sql2);
@@ -336,28 +336,28 @@  discard block
 block discarded – undo
336 336
                         while ($ar2 != '') {
337 337
 
338 338
                             if (isset($_REQUEST["scormstudentopen"]) && $ar2['user_id'] == $scormstudentopen) {
339
-                                $line .= $ar['id'] . " " . $ar2['user_id'] . " " . api_get_person_name($ar2['firstname'], $ar2['lastname']);
339
+                                $line .= $ar['id']." ".$ar2['user_id']." ".api_get_person_name($ar2['firstname'], $ar2['lastname']);
340 340
                             } else {
341
-                                $line .= $ar['id'] . " " . $ar2['user_id'] . " " . api_get_person_name($ar2['firstname'], $ar2['lastname']);
341
+                                $line .= $ar['id']." ".$ar2['user_id']." ".api_get_person_name($ar2['firstname'], $ar2['lastname']);
342 342
                             }
343 343
 
344 344
                             if ($ar2['user_id'] == $scormstudentopen) { //have to list the student's results
345 345
                                 $studentId = $ar2['user_id'];
346
-                                $sql3 = "SELECT iv.status, iv.score, i.title, iv.total_time " .
347
-                                        "FROM $tbl_learnpath_item i " .
348
-                                        "INNER JOIN $tbl_learnpath_item_view iv ON i.id=iv.lp_item_id " .
349
-                                        "INNER JOIN $tbl_learnpath_view v ON iv.lp_view_id=v.id " .
346
+                                $sql3 = "SELECT iv.status, iv.score, i.title, iv.total_time ".
347
+                                        "FROM $tbl_learnpath_item i ".
348
+                                        "INNER JOIN $tbl_learnpath_item_view iv ON i.id=iv.lp_item_id ".
349
+                                        "INNER JOIN $tbl_learnpath_view v ON iv.lp_view_id=v.id ".
350 350
                                         "WHERE 	i.c_id = $course_id AND
351 351
                                         		iv.c_id = $course_id AND
352 352
                                         		v.c_id = $course_id AND
353 353
                                 				v.user_id=$studentId and v.lp_id=$contentId ORDER BY v.id, i.id";
354 354
                                 $result3 = Database::query($sql3);
355 355
                                 $ar3 = Database::fetch_array($result3);
356
-                                $title_line .= get_lang('ScormTitleColumn') . ";" . get_lang('ScormStatusColumn') . ";" . get_lang('ScormScoreColumn') . ";" . get_lang('ScormTimeColumn');
356
+                                $title_line .= get_lang('ScormTitleColumn').";".get_lang('ScormStatusColumn').";".get_lang('ScormScoreColumn').";".get_lang('ScormTimeColumn');
357 357
                                 while ($ar3['status'] != '') {
358 358
                                     require_once '../newscorm/learnpathItem.class.php';
359 359
                                     $time = learnpathItem::getScormTimeFromParameter('php', $ar3['total_time']);
360
-                                    $line .= $title . ";" . $ar3['status'] . ";" . $ar3['score'] . ";" . $time;
360
+                                    $line .= $title.";".$ar3['status'].";".$ar3['score'].";".$time;
361 361
                                     $ar3 = Database::fetch_array($result3);
362 362
                                 }
363 363
                             }
@@ -377,23 +377,23 @@  discard block
 block discarded – undo
377 377
      * Export to a CSV file
378 378
      * Force the browser to save the file instead of opening it.
379 379
      */
380
-    $len = strlen($title_line . $line);
380
+    $len = strlen($title_line.$line);
381 381
     header('Content-type: application/octet-stream');
382 382
     //header('Content-Type: application/force-download');
383
-    header('Content-length: ' . $len);
384
-    $filename = api_html_entity_decode(str_replace(":", "", str_replace(" ", "_", $title[0] . '_' . $title[1] . '.csv')));
383
+    header('Content-length: '.$len);
384
+    $filename = api_html_entity_decode(str_replace(":", "", str_replace(" ", "_", $title[0].'_'.$title[1].'.csv')));
385 385
     $filename = api_replace_dangerous_char($filename);
386 386
     if (preg_match("/MSIE 5.5/", $_SERVER['HTTP_USER_AGENT'])) {
387
-        header('Content-Disposition: filename= ' . $filename);
387
+        header('Content-Disposition: filename= '.$filename);
388 388
     } else {
389
-        header('Content-Disposition: attachment; filename= ' . $filename);
389
+        header('Content-Disposition: attachment; filename= '.$filename);
390 390
     }
391 391
     if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE')) {
392 392
         header('Pragma: ');
393 393
         header('Cache-Control: ');
394 394
         header('Cache-Control: public'); // IE cannot download from sessions without a cache
395 395
     }
396
-    header('Content-Description: ' . $filename);
396
+    header('Content-Description: '.$filename);
397 397
     header('Content-transfer-encoding: binary');
398 398
 
399 399
     echo api_html_entity_decode($title_line, ENT_COMPAT);
Please login to merge, or discard this patch.