chamilo / chamilo-lms

main/inc/lib/classmanager.lib.php

Spacing +4 added lines, -4 removed lines

@@ -80,7 +80,7 @@ 
         $table_user = Database :: get_main_table(TABLE_MAIN_USER);
         $sql = "SELECT * FROM $table_class_user cu, $table_user u WHERE cu.class_id = '".$class_id."' AND cu.user_id = u.user_id";
         $res = Database::query($sql);
-        $users = array ();
+        $users = array();
         while ($user = Database::fetch_array($res, 'ASSOC')) {
             $users[] = $user;
         }
@@ -117,7 +117,7 @@ 
         $table_course_class = Database :: get_main_table(TABLE_MAIN_COURSE_CLASS);
         $courses = ClassManager :: get_courses($class_id);
         if (count($courses) != 0) {
-            $course_codes = array ();
+            $course_codes = array();
             foreach ($courses as $index => $course) {
                 $course_codes[] = $course['course_code'];
                 $sql = "SELECT DISTINCT user_id FROM $table_class_user t1, $table_course_class t2 WHERE t1.class_id=t2.class_id AND course_code = '".$course['course_code']."' AND user_id = $user_id AND t2.class_id<>'$class_id'";
@@ -142,7 +142,7 @@ 
         $table_course = Database :: get_main_table(TABLE_MAIN_COURSE);
         $sql = "SELECT * FROM $table_class_course cc, $table_course c WHERE cc.class_id = '".$class_id."' AND cc.course_code = c.code";
         $res = Database::query($sql);
-        $courses = array ();
+        $courses = array();
         while ($course = Database::fetch_array($res, 'ASSOC')) {
             $courses[] = $course;
         }
@@ -217,7 +217,7 @@ 
         $table_course_class = Database :: get_main_table(TABLE_MAIN_COURSE_CLASS);
         $sql = "SELECT cl.* FROM $table_class cl, $table_course_class cc WHERE cc.course_code = '".Database::escape_string($course_code)."' AND cc.class_id = cl.id";
         $res = Database::query($sql);
-        $classes = array ();
+        $classes = array();
         while ($class = Database::fetch_array($res, 'ASSOC')) {
             $classes[] = $class;
         }

main/inc/lib/kses-0.2.2/kses.php

Indentation +6 added lines, -6 removed lines

@@ -97,8 +97,8 @@ 
  * @return string
  */
 function kses($string, $allowed_html, $allowed_protocols =
-               array('http', 'https', 'ftp', 'news', 'nntp', 'telnet',
-                     'gopher', 'mailto'))
+                array('http', 'https', 'ftp', 'news', 'nntp', 'telnet',
+                        'gopher', 'mailto'))
 {
     $string = kses_no_null($string);
     $string = kses_js_entities($string);
@@ -218,7 +218,7 @@ 
     // No attributes are allowed for closing elements
 
     return kses_attr("$slash$elem", $attrlist, $allowed_html,
-                   $allowed_protocols);
+                    $allowed_protocols);
 }
 
 /**
@@ -261,11 +261,11 @@ 
     foreach ($attrarr as $arreach)
     {
         if (!@isset($allowed_html[strtolower($element)]
-                              [strtolower($arreach['name'])]))
+                                [strtolower($arreach['name'])]))
             continue; // the attribute is not allowed
 
         $current = $allowed_html[strtolower($element)]
-                              [strtolower($arreach['name'])];
+                                [strtolower($arreach['name'])];
         if ($current == '')
             continue; // the attribute is not allowed
 
@@ -279,7 +279,7 @@ 
             $ok = true;
             foreach ($current as $currkey => $currval)
                 if (!kses_check_attr_val($arreach['value'], $arreach['vless'],
-                                 $currkey, $currval))
+                                    $currkey, $currval))
                 { $ok = false; break; }
 
             if ( strtolower($arreach['name']) == 'style' ) {

Spacing +92 added lines, -92 removed lines

@@ -35,47 +35,47 @@ 
  */
 
 $kses_allowedentitynames = array(
-    'nbsp',    'iexcl',  'cent',    'pound',  'curren', 'yen',
-    'brvbar',  'sect',   'uml',     'copy',   'ordf',   'laquo',
-    'not',     'shy',    'reg',     'macr',   'deg',    'plusmn',
-    'acute',   'micro',  'para',    'middot', 'cedil',  'ordm',
-    'raquo',   'iquest', 'Agrave',  'Aacute', 'Acirc',  'Atilde',
-    'Auml',    'Aring',  'AElig',   'Ccedil', 'Egrave', 'Eacute',
-    'Ecirc',   'Euml',   'Igrave',  'Iacute', 'Icirc',  'Iuml',
-    'ETH',     'Ntilde', 'Ograve',  'Oacute', 'Ocirc',  'Otilde',
-    'Ouml',    'times',  'Oslash',  'Ugrave', 'Uacute', 'Ucirc',
-    'Uuml',    'Yacute', 'THORN',   'szlig',  'agrave', 'aacute',
-    'acirc',   'atilde', 'auml',    'aring',  'aelig',  'ccedil',
-    'egrave',  'eacute', 'ecirc',   'euml',   'igrave', 'iacute',
-    'icirc',   'iuml',   'eth',     'ntilde', 'ograve', 'oacute',
-    'ocirc',   'otilde', 'ouml',    'divide', 'oslash', 'ugrave',
-    'uacute',  'ucirc',  'uuml',    'yacute', 'thorn',  'yuml',
-    'quot',    'amp',    'lt',      'gt',     'apos',   'OElig',
-    'oelig',   'Scaron', 'scaron',  'Yuml',   'circ',   'tilde',
-    'ensp',    'emsp',   'thinsp',  'zwnj',   'zwj',    'lrm',
-    'rlm',     'ndash',  'mdash',   'lsquo',  'rsquo',  'sbquo',
-    'ldquo',   'rdquo',  'bdquo',   'dagger', 'Dagger', 'permil',
-    'lsaquo',  'rsaquo', 'euro',    'fnof',   'Alpha',  'Beta',
-    'Gamma',   'Delta',  'Epsilon', 'Zeta',   'Eta',    'Theta',
-    'Iota',    'Kappa',  'Lambda',  'Mu',     'Nu',     'Xi',
-    'Omicron', 'Pi',     'Rho',     'Sigma',  'Tau',    'Upsilon',
-    'Phi',     'Chi',    'Psi',     'Omega',  'alpha',  'beta',
-    'gamma',   'delta',  'epsilon', 'zeta',   'eta',    'theta',
-    'iota',    'kappa',  'lambda',  'mu',     'nu',     'xi',
-    'omicron', 'pi',     'rho',     'sigmaf', 'sigma',  'tau',
-    'upsilon', 'phi',    'chi',     'psi',    'omega',  'thetasym',
-    'upsih',   'piv',    'bull',    'hellip', 'prime',  'Prime',
-    'oline',   'frasl',  'weierp',  'image',  'real',   'trade',
-    'alefsym', 'larr',   'uarr',    'rarr',   'darr',   'harr',
-    'crarr',   'lArr',   'uArr',    'rArr',   'dArr',   'hArr',
-    'forall',  'part',   'exist',   'empty',  'nabla',  'isin',
-    'notin',   'ni',     'prod',    'sum',    'minus',  'lowast',
-    'radic',   'prop',   'infin',   'ang',    'and',    'or',
-    'cap',     'cup',    'int',     'sim',    'cong',   'asymp',
-    'ne',      'equiv',  'le',      'ge',     'sub',    'sup',
-    'nsub',    'sube',   'supe',    'oplus',  'otimes', 'perp',
-    'sdot',    'lceil',  'rceil',   'lfloor', 'rfloor', 'lang',
-    'rang',    'loz',    'spades',  'clubs',  'hearts', 'diams',
+    'nbsp', 'iexcl', 'cent', 'pound', 'curren', 'yen',
+    'brvbar', 'sect', 'uml', 'copy', 'ordf', 'laquo',
+    'not', 'shy', 'reg', 'macr', 'deg', 'plusmn',
+    'acute', 'micro', 'para', 'middot', 'cedil', 'ordm',
+    'raquo', 'iquest', 'Agrave', 'Aacute', 'Acirc', 'Atilde',
+    'Auml', 'Aring', 'AElig', 'Ccedil', 'Egrave', 'Eacute',
+    'Ecirc', 'Euml', 'Igrave', 'Iacute', 'Icirc', 'Iuml',
+    'ETH', 'Ntilde', 'Ograve', 'Oacute', 'Ocirc', 'Otilde',
+    'Ouml', 'times', 'Oslash', 'Ugrave', 'Uacute', 'Ucirc',
+    'Uuml', 'Yacute', 'THORN', 'szlig', 'agrave', 'aacute',
+    'acirc', 'atilde', 'auml', 'aring', 'aelig', 'ccedil',
+    'egrave', 'eacute', 'ecirc', 'euml', 'igrave', 'iacute',
+    'icirc', 'iuml', 'eth', 'ntilde', 'ograve', 'oacute',
+    'ocirc', 'otilde', 'ouml', 'divide', 'oslash', 'ugrave',
+    'uacute', 'ucirc', 'uuml', 'yacute', 'thorn', 'yuml',
+    'quot', 'amp', 'lt', 'gt', 'apos', 'OElig',
+    'oelig', 'Scaron', 'scaron', 'Yuml', 'circ', 'tilde',
+    'ensp', 'emsp', 'thinsp', 'zwnj', 'zwj', 'lrm',
+    'rlm', 'ndash', 'mdash', 'lsquo', 'rsquo', 'sbquo',
+    'ldquo', 'rdquo', 'bdquo', 'dagger', 'Dagger', 'permil',
+    'lsaquo', 'rsaquo', 'euro', 'fnof', 'Alpha', 'Beta',
+    'Gamma', 'Delta', 'Epsilon', 'Zeta', 'Eta', 'Theta',
+    'Iota', 'Kappa', 'Lambda', 'Mu', 'Nu', 'Xi',
+    'Omicron', 'Pi', 'Rho', 'Sigma', 'Tau', 'Upsilon',
+    'Phi', 'Chi', 'Psi', 'Omega', 'alpha', 'beta',
+    'gamma', 'delta', 'epsilon', 'zeta', 'eta', 'theta',
+    'iota', 'kappa', 'lambda', 'mu', 'nu', 'xi',
+    'omicron', 'pi', 'rho', 'sigmaf', 'sigma', 'tau',
+    'upsilon', 'phi', 'chi', 'psi', 'omega', 'thetasym',
+    'upsih', 'piv', 'bull', 'hellip', 'prime', 'Prime',
+    'oline', 'frasl', 'weierp', 'image', 'real', 'trade',
+    'alefsym', 'larr', 'uarr', 'rarr', 'darr', 'harr',
+    'crarr', 'lArr', 'uArr', 'rArr', 'dArr', 'hArr',
+    'forall', 'part', 'exist', 'empty', 'nabla', 'isin',
+    'notin', 'ni', 'prod', 'sum', 'minus', 'lowast',
+    'radic', 'prop', 'infin', 'ang', 'and', 'or',
+    'cap', 'cup', 'int', 'sim', 'cong', 'asymp',
+    'ne', 'equiv', 'le', 'ge', 'sub', 'sup',
+    'nsub', 'sube', 'supe', 'oplus', 'otimes', 'perp',
+    'sdot', 'lceil', 'rceil', 'lfloor', 'rfloor', 'lang',
+    'rang', 'loz', 'spades', 'clubs', 'hearts', 'diams',
 );
 
 /**
@@ -145,7 +145,7 @@ 
     global $pass_allowed_html, $pass_allowed_protocols;
     $pass_allowed_html = $allowed_html;
     $pass_allowed_protocols = $allowed_protocols;
-    return preg_replace_callback( '%((<!--.*?(-->|$))|(<[^>]*(>|$)|>))%', '_kses_split_callback', $string );
+    return preg_replace_callback('%((<!--.*?(-->|$))|(<[^>]*(>|$)|>))%', '_kses_split_callback', $string);
 }
 
 /**
@@ -153,10 +153,10 @@ 
  *
  * @access private
  */
-function _kses_split_callback( $match )
+function _kses_split_callback($match)
 {
     global $pass_allowed_html, $pass_allowed_protocols;
-    return kses_split2( $match[1], $pass_allowed_html, $pass_allowed_protocols );
+    return kses_split2($match[1], $pass_allowed_html, $pass_allowed_protocols);
 }
 
 /**
@@ -189,9 +189,9 @@ 
 
     if (preg_match('%^<!--(.*?)(-->)?$%', $string, $matches)) {
         $string = str_replace(array('<!--', '-->'), '', $matches[1]);
-        while ( $string != $newstring = kses($string, $allowed_html, $allowed_protocols) )
+        while ($string != $newstring = kses($string, $allowed_html, $allowed_protocols))
             $string = $newstring;
-        if ( $string == '' )
+        if ($string == '')
             return '';
         // prevent multiple dashes in comments
         $string = preg_replace('/--+/', '-', $string);
@@ -282,12 +282,12 @@ 
                                  $currkey, $currval))
                 { $ok = false; break; }
 
-            if ( strtolower($arreach['name']) == 'style' ) {
+            if (strtolower($arreach['name']) == 'style') {
                 $orig_value = $arreach['value'];
 
                 $value = kses_safecss_filter_attr($orig_value);
 
-                if ( empty($value) )
+                if (empty($value))
                     continue;
 
                 $arreach['value'] = $value;
@@ -361,8 +361,8 @@ 
                 if (preg_match('/^\s+/', $attr)) // valueless
                 {
                     $working = 1; $mode = 0;
-                    if(FALSE === array_key_exists($attrname, $attrarr)) {
-                        $attrarr[$attrname] = array ('name' => $attrname, 'value' => '', 'whole' => $attrname, 'vless' => 'y');
+                    if (FALSE === array_key_exists($attrname, $attrarr)) {
+                        $attrarr[$attrname] = array('name' => $attrname, 'value' => '', 'whole' => $attrname, 'vless' => 'y');
                     }
                     $attr = preg_replace('/^\s+/', '', $attr);
                 }
@@ -379,12 +379,12 @@ 
                         $thisval = $match[1];
                     } else {
                         $thisval = $match[1];
-                        if ( in_array(strtolower($attrname), $uris) )
+                        if (in_array(strtolower($attrname), $uris))
                             $thisval = kses_bad_protocol($thisval, $allowed_protocols);
                     }
 
-                    if(FALSE === array_key_exists($attrname, $attrarr)) {
-                        $attrarr[$attrname] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname=\"$thisval\"", 'vless' => 'n');
+                    if (FALSE === array_key_exists($attrname, $attrarr)) {
+                        $attrarr[$attrname] = array('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname=\"$thisval\"", 'vless' => 'n');
                     }
                     $working = 1; $mode = 0;
                     $attr = preg_replace('/^"[^"]*"(\s+|$)/', '', $attr);
@@ -395,11 +395,11 @@ 
                     // 'value'
                 {
                     $thisval = $match[1];
-                    if ( in_array(strtolower($attrname), $uris) )
+                    if (in_array(strtolower($attrname), $uris))
                         $thisval = kses_bad_protocol($thisval, $allowed_protocols);
 
-                    if(FALSE === array_key_exists($attrname, $attrarr)) {
-                        $attrarr[$attrname] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname='$thisval'", 'vless' => 'n');
+                    if (FALSE === array_key_exists($attrname, $attrarr)) {
+                        $attrarr[$attrname] = array('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname='$thisval'", 'vless' => 'n');
                     }
                     $working = 1; $mode = 0;
                     $attr = preg_replace("/^'[^']*'(\s+|$)/", '', $attr);
@@ -410,11 +410,11 @@ 
                     // value
                 {
                     $thisval = $match[1];
-                    if ( in_array(strtolower($attrname), $uris) )
+                    if (in_array(strtolower($attrname), $uris))
                         $thisval = kses_bad_protocol($thisval, $allowed_protocols);
 
-                    if(FALSE === array_key_exists($attrname, $attrarr)) {
-                        $attrarr[$attrname] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname=\"$thisval\"", 'vless' => 'n');
+                    if (FALSE === array_key_exists($attrname, $attrarr)) {
+                        $attrarr[$attrname] = array('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname=\"$thisval\"", 'vless' => 'n');
                     }
                     // We add quotes to conform to W3C's HTML spec.
                     $working = 1; $mode = 0;
@@ -434,7 +434,7 @@ 
     if ($mode == 1 && FALSE === array_key_exists($attrname, $attrarr))
         // special case, for when the attribute list ends with a valueless
         // attribute like "selected"
-        $attrarr[$attrname] = array ('name' => $attrname, 'value' => '', 'whole' => $attrname, 'vless' => 'y');
+        $attrarr[$attrname] = array('name' => $attrname, 'value' => '', 'whole' => $attrname, 'vless' => 'y');
 
     return $attrarr;
 }
@@ -579,12 +579,12 @@ 
 {
     $outarray = array();
 
-    foreach ( (array) $inarray as $inkey => $inval)
+    foreach ((array) $inarray as $inkey => $inval)
     {
         $outkey = strtolower($inkey);
         $outarray[$outkey] = array();
 
-        foreach ( (array) $inval as $inkey2 => $inval2)
+        foreach ((array) $inval as $inkey2 => $inval2)
         {
             $outkey2 = strtolower($inkey2);
             $outarray[$outkey][$outkey2] = $inval2;
@@ -632,9 +632,9 @@ 
 function kses_bad_protocol_once($string, $allowed_protocols)
 {
     $string2 = preg_split('/:|&#0*58;|&#x0*3a;/i', $string, 2);
-    if(isset($string2[1]) && !preg_match('%/\?%',$string2[0]))
+    if (isset($string2[1]) && !preg_match('%/\?%', $string2[0]))
     {
-        $string = kses_bad_protocol_once2($string2[0],$allowed_protocols).trim($string2[1]);
+        $string = kses_bad_protocol_once2($string2[0], $allowed_protocols).trim($string2[1]);
     }
     return $string;
 }
@@ -660,7 +660,7 @@ 
     $string2 = strtolower($string2);
 
     $allowed = false;
-    foreach ( (array) $allowed_protocols as $one_protocol)
+    foreach ((array) $allowed_protocols as $one_protocol)
         if (strtolower($one_protocol) == $string2)
         {
             $allowed = true;
@@ -711,11 +711,11 @@ 
 function kses_named_entities($matches) {
     global $kses_allowedentitynames;
 
-    if ( empty($matches[1]) )
+    if (empty($matches[1]))
         return '';
 
     $i = $matches[1];
-    return ( ( ! in_array($i, $kses_allowedentitynames) ) ? "&amp;$i;" : "&$i;" );
+    return ((!in_array($i, $kses_allowedentitynames)) ? "&amp;$i;" : "&$i;");
 }
 
 /**
@@ -730,12 +730,12 @@ 
  * @return string Correctly encoded entity
  */
 function kses_normalize_entities2($matches) {
-    if ( empty($matches[1]) )
+    if (empty($matches[1]))
         return '';
 
     $i = $matches[1];
     if (kses_valid_unicode($i)) {
-        $i = str_pad(ltrim($i,'0'), 3, '0', STR_PAD_LEFT);
+        $i = str_pad(ltrim($i, '0'), 3, '0', STR_PAD_LEFT);
         $i = "&#$i;";
     } else {
         $i = "&amp;#$i;";
@@ -756,11 +756,11 @@ 
  * @return string Correctly encoded entity
  */
 function kses_normalize_entities3($matches) {
-    if ( empty($matches[1]) )
+    if (empty($matches[1]))
         return '';
 
     $hexchars = $matches[1];
-    return ( ( ! kses_valid_unicode(hexdec($hexchars)) ) ? "&amp;#x$hexchars;" : '&#x'.ltrim($hexchars,'0').';' );
+    return ((!kses_valid_unicode(hexdec($hexchars))) ? "&amp;#x$hexchars;" : '&#x'.ltrim($hexchars, '0').';');
 }
 
 /**
@@ -770,10 +770,10 @@ 
  * @return bool true if the value was a valid Unicode number
  */
 function kses_valid_unicode($i) {
-    return ( $i == 0x9 || $i == 0xa || $i == 0xd ||
+    return ($i == 0x9 || $i == 0xa || $i == 0xd ||
             ($i >= 0x20 && $i <= 0xd7ff) ||
             ($i >= 0xe000 && $i <= 0xfffd) ||
-            ($i >= 0x10000 && $i <= 0x10ffff) );
+            ($i >= 0x10000 && $i <= 0x10ffff));
 }
 
 /**
@@ -800,8 +800,8 @@ 
  * @param array $match preg match
  * @return string
  */
-function _kses_decode_entities_chr( $match ) {
-    return chr( $match[1] );
+function _kses_decode_entities_chr($match) {
+    return chr($match[1]);
 }
 
 /**
@@ -810,24 +810,24 @@ 
  * @param array $match preg match
  * @return string
  */
-function _kses_decode_entities_chr_hexdec( $match ) {
-    return chr( hexdec( $match[1] ) );
+function _kses_decode_entities_chr_hexdec($match) {
+    return chr(hexdec($match[1]));
 }
 
 /**
  * Inline CSS filter
  *
  */
-function kses_safecss_filter_attr( $css ) {
+function kses_safecss_filter_attr($css) {
 
     $css = kses_no_null($css);
-    $css = str_replace(array("\n","\r","\t"), '', $css);
+    $css = str_replace(array("\n", "\r", "\t"), '', $css);
 
-    if ( preg_match( '%[\\(&=}]|/\*%', $css ) ) // remove any inline css containing \ ( & } = or comments
+    if (preg_match('%[\\(&=}]|/\*%', $css)) // remove any inline css containing \ ( & } = or comments
         return '';
 
-    $css_array = explode( ';', trim( $css ) );
-    $allowed_attr = array( 'text-align', 'margin', 'color', 'float',
+    $css_array = explode(';', trim($css));
+    $allowed_attr = array('text-align', 'margin', 'color', 'float',
         'border', 'background', 'background-color', 'border-bottom', 'border-bottom-color',
         'border-bottom-style', 'border-bottom-width', 'border-collapse', 'border-color', 'border-left',
         'border-left-color', 'border-left-style', 'border-left-width', 'border-right', 'border-right-color',
@@ -837,26 +837,26 @@ 
         'font-variant', 'font-weight', 'height', 'letter-spacing', 'line-height', 'margin-bottom',
         'margin-left', 'margin-right', 'margin-top', 'overflow', 'padding', 'padding-bottom',
         'padding-left', 'padding-right', 'padding-top', 'text-decoration', 'text-indent', 'vertical-align',
-        'width' );
+        'width');
 
-    if ( empty($allowed_attr) )
+    if (empty($allowed_attr))
         return $css;
 
     $css = '';
-    foreach ( $css_array as $css_item ) {
-        if ( $css_item == '' )
+    foreach ($css_array as $css_item) {
+        if ($css_item == '')
             continue;
-        $css_item = trim( $css_item );
+        $css_item = trim($css_item);
         $found = false;
-        if ( strpos( $css_item, ':' ) === false ) {
+        if (strpos($css_item, ':') === false) {
             $found = true;
         } else {
-            $parts = split( ':', $css_item );
-            if ( in_array( strtolower( trim( $parts[0] ) ), $allowed_attr ) )
+            $parts = split(':', $css_item);
+            if (in_array(strtolower(trim($parts[0])), $allowed_attr))
                 $found = true;
         }
-        if ( $found ) {
-            if( $css != '' )
+        if ($found) {
+            if ($css != '')
                 $css .= ';';
             $css .= $css_item;
         }

Braces +135 added lines, -84 removed lines

@@ -183,16 +183,19 @@ 
 {
     $string = kses_stripslashes($string);
 
-    if (substr($string, 0, 1) != '<')
-        return '&gt;';
+    if (substr($string, 0, 1) != '<') {
+            return '&gt;';
+    }
     // It matched a ">" character
 
     if (preg_match('%^<!--(.*?)(-->)?$%', $string, $matches)) {
         $string = str_replace(array('<!--', '-->'), '', $matches[1]);
-        while ( $string != $newstring = kses($string, $allowed_html, $allowed_protocols) )
-            $string = $newstring;
-        if ( $string == '' )
-            return '';
+        while ( $string != $newstring = kses($string, $allowed_html, $allowed_protocols) ) {
+                    $string = $newstring;
+        }
+        if ( $string == '' ) {
+                    return '';
+        }
         // prevent multiple dashes in comments
         $string = preg_replace('/--+/', '-', $string);
         // prevent three dashes closing a comment
@@ -201,20 +204,23 @@ 
     }
     // Allow HTML comments
 
-    if (!preg_match('%^<\s*(/\s*)?([a-zA-Z0-9]+)([^>]*)>?$%', $string, $matches))
-        return '';
+    if (!preg_match('%^<\s*(/\s*)?([a-zA-Z0-9]+)([^>]*)>?$%', $string, $matches)) {
+            return '';
+    }
     // It's seriously malformed
 
     $slash = trim($matches[1]);
     $elem = $matches[2];
     $attrlist = $matches[3];
 
-    if (!@isset($allowed_html[strtolower($elem)]))
-        return '';
+    if (!@isset($allowed_html[strtolower($elem)])) {
+            return '';
+    }
     // They are using a not allowed HTML element
 
-    if ($slash != '')
-        return "<$slash$elem>";
+    if ($slash != '') {
+            return "<$slash$elem>";
+    }
     // No attributes are allowed for closing elements
 
     return kses_attr("$slash$elem", $attrlist, $allowed_html,
@@ -241,13 +247,15 @@ 
     // Is there a closing XHTML slash at the end of the attributes?
 
     $xhtml_slash = '';
-    if (preg_match('%\s*/\s*$%', $attr))
-        $xhtml_slash = ' /';
+    if (preg_match('%\s*/\s*$%', $attr)) {
+            $xhtml_slash = ' /';
+    }
 
     // Are any attributes allowed at all for this element?
 
-    if (@count($allowed_html[strtolower($element)]) == 0)
-        return "<$element$xhtml_slash>";
+    if (@count($allowed_html[strtolower($element)]) == 0) {
+            return "<$element$xhtml_slash>";
+    }
 
     // Split it
 
@@ -261,42 +269,52 @@ 
     foreach ($attrarr as $arreach)
     {
         if (!@isset($allowed_html[strtolower($element)]
-                              [strtolower($arreach['name'])]))
-            continue; // the attribute is not allowed
+                              [strtolower($arreach['name'])])) {
+                    continue;
+        }
+        // the attribute is not allowed
 
         $current = $allowed_html[strtolower($element)]
                               [strtolower($arreach['name'])];
-        if ($current == '')
-            continue; // the attribute is not allowed
+        if ($current == '') {
+                    continue;
+        }
+        // the attribute is not allowed
 
-        if (!is_array($current))
-            $attr2 .= ' '.$arreach['whole'];
+        if (!is_array($current)) {
+                    $attr2 .= ' '.$arreach['whole'];
+        }
         // there are no checks
 
         else
         {
             // there are some checks
             $ok = true;
-            foreach ($current as $currkey => $currval)
-                if (!kses_check_attr_val($arreach['value'], $arreach['vless'],
+            foreach ($current as $currkey => $currval) {
+                            if (!kses_check_attr_val($arreach['value'], $arreach['vless'],
                                  $currkey, $currval))
-                { $ok = false; break; }
+                { $ok = false;
+            }
+            break; }
 
             if ( strtolower($arreach['name']) == 'style' ) {
                 $orig_value = $arreach['value'];
 
                 $value = kses_safecss_filter_attr($orig_value);
 
-                if ( empty($value) )
-                    continue;
+                if ( empty($value) ) {
+                                    continue;
+                }
 
                 $arreach['value'] = $value;
 
                 $arreach['whole'] = str_replace($orig_value, $value, $arreach['whole']);
             }
 
-            if ($ok)
-                $attr2 .= ' '.$arreach['whole']; // it passed them
+            if ($ok) {
+                            $attr2 .= ' '.$arreach['whole'];
+            }
+            // it passed them
         } // if !is_array($current)
     } // foreach
 
@@ -351,16 +369,22 @@ 
 
             case 1: // equals sign or valueless ("selected")
 
-                if (preg_match('/^\s*=\s*/', $attr)) // equals sign
+                if (preg_match('/^\s*=\s*/', $attr)) {
+                    // equals sign
                 {
-                    $working = 1; $mode = 2;
+                    $working = 1;
+                }
+                $mode = 2;
                     $attr = preg_replace('/^\s*=\s*/', '', $attr);
                     break;
                 }
 
-                if (preg_match('/^\s+/', $attr)) // valueless
+                if (preg_match('/^\s+/', $attr)) {
+                    // valueless
                 {
-                    $working = 1; $mode = 0;
+                    $working = 1;
+                }
+                $mode = 0;
                     if(FALSE === array_key_exists($attrname, $attrarr)) {
                         $attrarr[$attrname] = array ('name' => $attrname, 'value' => '', 'whole' => $attrname, 'vless' => 'y');
                     }
@@ -371,16 +395,18 @@ 
 
             case 2: // attribute value, a URL after href= for instance
 
-                if (preg_match('%^"([^"]*)"(\s+|/?$)%', $attr, $match))
-                    // "value"
+                if (preg_match('%^"([^"]*)"(\s+|/?$)%', $attr, $match)) {
+                                    // "value"
                 {
                     // MDL-2684 - kses stripping CSS styles that it thinks look like protocols
                     if ($attrname == 'style') {
                         $thisval = $match[1];
+                }
                     } else {
                         $thisval = $match[1];
-                        if ( in_array(strtolower($attrname), $uris) )
-                            $thisval = kses_bad_protocol($thisval, $allowed_protocols);
+                        if ( in_array(strtolower($attrname), $uris) ) {
+                                                    $thisval = kses_bad_protocol($thisval, $allowed_protocols);
+                        }
                     }
 
                     if(FALSE === array_key_exists($attrname, $attrarr)) {
@@ -391,12 +417,14 @@ 
                     break;
                 }
 
-                if (preg_match("%^'([^']*)'(\s+|/?$)%", $attr, $match))
-                    // 'value'
+                if (preg_match("%^'([^']*)'(\s+|/?$)%", $attr, $match)) {
+                                    // 'value'
                 {
                     $thisval = $match[1];
-                    if ( in_array(strtolower($attrname), $uris) )
-                        $thisval = kses_bad_protocol($thisval, $allowed_protocols);
+                }
+                    if ( in_array(strtolower($attrname), $uris) ) {
+                                            $thisval = kses_bad_protocol($thisval, $allowed_protocols);
+                    }
 
                     if(FALSE === array_key_exists($attrname, $attrarr)) {
                         $attrarr[$attrname] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname='$thisval'", 'vless' => 'n');
@@ -406,12 +434,14 @@ 
                     break;
                 }
 
-                if (preg_match("%^([^\s\"']+)(\s+|/?$)%", $attr, $match))
-                    // value
+                if (preg_match("%^([^\s\"']+)(\s+|/?$)%", $attr, $match)) {
+                                    // value
                 {
                     $thisval = $match[1];
-                    if ( in_array(strtolower($attrname), $uris) )
-                        $thisval = kses_bad_protocol($thisval, $allowed_protocols);
+                }
+                    if ( in_array(strtolower($attrname), $uris) ) {
+                                            $thisval = kses_bad_protocol($thisval, $allowed_protocols);
+                    }
 
                     if(FALSE === array_key_exists($attrname, $attrarr)) {
                         $attrarr[$attrname] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname=\"$thisval\"", 'vless' => 'n');
@@ -424,17 +454,20 @@ 
                 break;
         } // switch
 
-        if ($working == 0) // not well formed, remove and try again
+        if ($working == 0) {
+            // not well formed, remove and try again
         {
             $attr = kses_html_error($attr);
+        }
             $mode = 0;
         }
     } // while
 
-    if ($mode == 1 && FALSE === array_key_exists($attrname, $attrarr))
-        // special case, for when the attribute list ends with a valueless
+    if ($mode == 1 && FALSE === array_key_exists($attrname, $attrarr)) {
+            // special case, for when the attribute list ends with a valueless
         // attribute like "selected"
         $attrarr[$attrname] = array ('name' => $attrname, 'value' => '', 'whole' => $attrname, 'vless' => 'y');
+    }
 
     return $attrarr;
 }
@@ -462,16 +495,18 @@ 
             // greater than the given value. This can be used to avoid Buffer Overflows
             // in WWW clients and various Internet servers.
 
-            if (strlen($value) > $checkvalue)
-                $ok = false;
+            if (strlen($value) > $checkvalue) {
+                            $ok = false;
+            }
             break;
 
         case 'minlen':
             // The minlen check makes sure that the attribute value has a length not
             // smaller than the given value.
 
-            if (strlen($value) < $checkvalue)
-                $ok = false;
+            if (strlen($value) < $checkvalue) {
+                            $ok = false;
+            }
             break;
 
         case 'maxval':
@@ -481,20 +516,24 @@ 
             // value is not greater than the given value.
             // This check can be used to avoid Denial of Service attacks.
 
-            if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value))
-                $ok = false;
-            if ($value > $checkvalue)
-                $ok = false;
+            if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value)) {
+                            $ok = false;
+            }
+            if ($value > $checkvalue) {
+                            $ok = false;
+            }
             break;
 
         case 'minval':
             // The minval check checks that the attribute value is a positive integer,
             // and that it is not smaller than the given value.
 
-            if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value))
-                $ok = false;
-            if ($value < $checkvalue)
-                $ok = false;
+            if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value)) {
+                            $ok = false;
+            }
+            if ($value < $checkvalue) {
+                            $ok = false;
+            }
             break;
 
         case 'valueless':
@@ -503,8 +542,9 @@ 
             // is a "y" or a "Y", the attribute must not have a value.
             // If the given value is an "n" or an "N", the attribute must have one.
 
-            if (strtolower($checkvalue) != $vless)
-                $ok = false;
+            if (strtolower($checkvalue) != $vless) {
+                            $ok = false;
+            }
             break;
     } // switch
 
@@ -660,18 +700,20 @@ 
     $string2 = strtolower($string2);
 
     $allowed = false;
-    foreach ( (array) $allowed_protocols as $one_protocol)
-        if (strtolower($one_protocol) == $string2)
+    foreach ( (array) $allowed_protocols as $one_protocol) {
+            if (strtolower($one_protocol) == $string2)
         {
             $allowed = true;
+    }
             break;
         }
 
-    if ($allowed)
-        return "$string2:";
-    else
-        return '';
-}
+    if ($allowed) {
+            return "$string2:";
+    } else {
+            return '';
+    }
+    }
 
 /**
  * Converts and fixes HTML entities.
@@ -711,8 +753,9 @@ 
 function kses_named_entities($matches) {
     global $kses_allowedentitynames;
 
-    if ( empty($matches[1]) )
-        return '';
+    if ( empty($matches[1]) ) {
+            return '';
+    }
 
     $i = $matches[1];
     return ( ( ! in_array($i, $kses_allowedentitynames) ) ? "&amp;$i;" : "&$i;" );
@@ -730,8 +773,9 @@ 
  * @return string Correctly encoded entity
  */
 function kses_normalize_entities2($matches) {
-    if ( empty($matches[1]) )
-        return '';
+    if ( empty($matches[1]) ) {
+            return '';
+    }
 
     $i = $matches[1];
     if (kses_valid_unicode($i)) {
@@ -756,8 +800,9 @@ 
  * @return string Correctly encoded entity
  */
 function kses_normalize_entities3($matches) {
-    if ( empty($matches[1]) )
-        return '';
+    if ( empty($matches[1]) ) {
+            return '';
+    }
 
     $hexchars = $matches[1];
     return ( ( ! kses_valid_unicode(hexdec($hexchars)) ) ? "&amp;#x$hexchars;" : '&#x'.ltrim($hexchars,'0').';' );
@@ -823,8 +868,10 @@ 
     $css = kses_no_null($css);
     $css = str_replace(array("\n","\r","\t"), '', $css);
 
-    if ( preg_match( '%[\\(&=}]|/\*%', $css ) ) // remove any inline css containing \ ( & } = or comments
+    if ( preg_match( '%[\\(&=}]|/\*%', $css ) ) {
+        // remove any inline css containing \ ( & } = or comments
         return '';
+    }
 
     $css_array = explode( ';', trim( $css ) );
     $allowed_attr = array( 'text-align', 'margin', 'color', 'float',
@@ -839,25 +886,29 @@ 
         'padding-left', 'padding-right', 'padding-top', 'text-decoration', 'text-indent', 'vertical-align',
         'width' );
 
-    if ( empty($allowed_attr) )
-        return $css;
+    if ( empty($allowed_attr) ) {
+            return $css;
+    }
 
     $css = '';
     foreach ( $css_array as $css_item ) {
-        if ( $css_item == '' )
-            continue;
+        if ( $css_item == '' ) {
+                    continue;
+        }
         $css_item = trim( $css_item );
         $found = false;
         if ( strpos( $css_item, ':' ) === false ) {
             $found = true;
         } else {
             $parts = split( ':', $css_item );
-            if ( in_array( strtolower( trim( $parts[0] ) ), $allowed_attr ) )
-                $found = true;
+            if ( in_array( strtolower( trim( $parts[0] ) ), $allowed_attr ) ) {
+                            $found = true;
+            }
         }
         if ( $found ) {
-            if( $css != '' )
-                $css .= ';';
+            if( $css != '' ) {
+                            $css .= ';';
+            }
             $css .= $css_item;
         }
     }

main/inc/lib/fileDisplay.lib.php

Spacing +2 added lines, -2 removed lines

@@ -211,7 +211,7 @@ 
     $last_modified = 0;
     $return = 0;
     if (is_dir($dir)) {
-        while(($entry = $dir->read()) !== false)
+        while (($entry = $dir->read()) !== false)
         {
             if ($entry != '.' && $entry != '..')
                 continue;
@@ -284,7 +284,7 @@ 
         'props.session_id'
     );
 
-    $visibility_rule = ' props.visibility ' . ($can_see_invisible ? '<> 2' : '= 1');
+    $visibility_rule = ' props.visibility '.($can_see_invisible ? '<> 2' : '= 1');
 
     $sql = "SELECT SUM(table1.size) FROM (
                 SELECT size

Braces +11 added lines, -8 removed lines

@@ -213,16 +213,19 @@
     if (is_dir($dir)) {
         while(($entry = $dir->read()) !== false)
         {
-            if ($entry != '.' && $entry != '..')
-                continue;
+            if ($entry != '.' && $entry != '..') {
+                            continue;
+            }
 
-            if (!is_dir($dir_name.'/'.$entry))
-                $current_modified = filemtime($dir_name.'/'.$entry);
-            elseif ($do_recursive)
-                $current_modified = recent_modified_file_time($dir_name.'/'.$entry, true);
+            if (!is_dir($dir_name.'/'.$entry)) {
+                            $current_modified = filemtime($dir_name.'/'.$entry);
+            } elseif ($do_recursive) {
+                            $current_modified = recent_modified_file_time($dir_name.'/'.$entry, true);
+            }
 
-            if ($current_modified > $last_modified)
-                $last_modified = $current_modified;
+            if ($current_modified > $last_modified) {
+                            $last_modified = $current_modified;
+            }
         }
 
         $dir->close();

main/inc/lib/agenda.lib.php

Braces +3 added lines, -2 removed lines

@@ -3122,8 +3122,9 @@
         global $DaysShort, $course_path;
         //Handle leap year
         $numberofdays = array (0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
-        if (($year % 400 == 0) or ($year % 4 == 0 and $year % 100 <> 0))
-            $numberofdays[2] = 29;
+        if (($year % 400 == 0) or ($year % 4 == 0 and $year % 100 <> 0)) {
+                    $numberofdays[2] = 29;
+        }
         //Get the first day of the month
         $dayone = getdate(mktime(0, 0, 0, $month, 1, $year));
         //Start the week on monday

Doc Comments +8 added lines, -3 removed lines

@@ -565,7 +565,7 @@ 
      * @param string $color
      * @param bool $addAnnouncement
      *
-     * @return bool
+     * @return null|false
      */
     public function editEvent(
         $id,
@@ -1308,6 +1308,7 @@ 
      *
      * @param int $eventId
      * @param int $courseId
+     * @param integer $sessionId
      * @paraù int $sessionId
      *
      * @return array
@@ -2469,6 +2470,7 @@ 
      * Adds x weeks to a UNIX timestamp
      * @param   int     The timestamp
      * @param   int     The number of weeks to add
+     * @param integer $timestamp
      * @return  int     The new timestamp
      */
     function addWeek($timestamp, $num = 1)
@@ -2480,6 +2482,7 @@ 
      * Adds x months to a UNIX timestamp
      * @param   int     The timestamp
      * @param   int     The number of years to add
+     * @param integer $timestamp
      * @return  int     The new timestamp
      */
     function addMonth($timestamp, $num = 1)
@@ -2498,6 +2501,7 @@ 
      * Adds x years to a UNIX timestamp
      * @param   int     The timestamp
      * @param   int     The number of years to add
+     * @param integer $timestamp
      * @return  int     The new timestamp
      */
     function addYear($timestamp, $num = 1)
@@ -2697,7 +2701,7 @@ 
     /**
      * @param array $courseInfo
      * @param $file
-     * @return array|bool|string
+     * @return false|string
      */
     public function importEventFile($courseInfo, $file)
     {
@@ -2810,7 +2814,7 @@ 
 
     /**
      * Parse filter turns USER:12 to ['users' => [12])] or G:1 ['groups' => [1]]
-     * @param $filter
+     * @param integer $filter
      * @return array
      */
     public function parseAgendaFilter($filter)
@@ -3324,6 +3328,7 @@ 
      * @param	int		user ID of the user
      * @param	string	Optional start date in datetime format (if no start date is given, uses today)
      * @param	string	Optional end date in datetime format (if no date is given, uses one year from now)
+     * @param integer $user_id
      * @return	array	Array of events ordered by start date, in
      * [0]('datestart','dateend','title'),[1]('datestart','dateend','title','link','coursetitle') format,
      * where datestart and dateend are in yyyyMMddhhmmss format.

Spacing +54 added lines, -54 removed lines

@@ -1499,12 +1499,12 @@ 
             }
 
             if (empty($session_id)) {
-                $sessionCondition =  "
+                $sessionCondition = "
                 (
                     agenda.session_id = 0 AND (ip.session_id IS NULL OR ip.session_id = 0)
                 ) ";
             } else {
-                $sessionCondition =  "
+                $sessionCondition = "
                 (
                     agenda.session_id = $session_id AND
                     ip.session_id = $session_id
@@ -1543,13 +1543,13 @@ 
             }
 
             if (empty($session_id)) {
-                $sessionCondition =  "
+                $sessionCondition = "
                 (
                     agenda.session_id = 0 AND
                     (ip.session_id IS NULL OR ip.session_id = 0)
                 ) ";
             } else {
-                $sessionCondition =  "
+                $sessionCondition = "
                 (
                     agenda.session_id = $session_id AND
                     ip.session_id = $session_id
@@ -1601,7 +1601,7 @@ 
             while ($row = Database::fetch_array($result, 'ASSOC')) {
                 $event = array();
                 $event['id'] = 'course_'.$row['id'];
-                $event['unique_id']  = $row['iid'];
+                $event['unique_id'] = $row['iid'];
                 // To avoid doubles
                 if (in_array($event['unique_id'], $eventsAdded)) {
                     continue;
@@ -2151,7 +2151,7 @@ 
             );
 
             $form->addLabel('',
-                '<span id="link-more-attach"><a href="javascript://" onclick="return add_image_form()">'.get_lang('AddOneMoreFile').'</a></span>&nbsp;('.sprintf(get_lang('MaximunFileSizeX'),format_file_size(api_get_setting('message_max_upload_filesize'))).')');
+                '<span id="link-more-attach"><a href="javascript://" onclick="return add_image_form()">'.get_lang('AddOneMoreFile').'</a></span>&nbsp;('.sprintf(get_lang('MaximunFileSizeX'), format_file_size(api_get_setting('message_max_upload_filesize'))).')');
 
 
             //if ($showAttachmentForm) {
@@ -2729,8 +2729,8 @@ 
 
                 $startDateTime = api_get_local_time($start->format('Y-m-d H:i:s'), $currentTimeZone, $start->format('e'));
                 $endDateTime = api_get_local_time($end->format('Y-m-d H:i'), $currentTimeZone, $end->format('e'));
-                $title = api_convert_encoding((string)$event->summary, $charset, 'UTF-8');
-                $description = api_convert_encoding((string)$event->description, $charset, 'UTF-8');
+                $title = api_convert_encoding((string) $event->summary, $charset, 'UTF-8');
+                $description = api_convert_encoding((string) $event->description, $charset, 'UTF-8');
 
                 $id = $this->addEvent(
                     $startDateTime,
@@ -2872,7 +2872,7 @@ 
 							ORDER BY start_date ";
             } else {
                 // if the user is not an administrator of that course
-                if (is_array($group_memberships) && count($group_memberships)>0) {
+                if (is_array($group_memberships) && count($group_memberships) > 0) {
                     $sqlquery = "SELECT	agenda.*, ip.visibility, ip.to_group_id, ip.insert_user_id, ip.ref
 								FROM ".$TABLEAGENDA." agenda,
 									".$TABLE_ITEMPROPERTY." ip
@@ -2902,14 +2902,14 @@ 
                 $agendaday = -1;
                 if ($item['start_date'] != '0000-00-00 00:00:00') {
                     $item['start_date'] = api_get_local_time($item['start_date']);
-                    $item['start_date_tms']  = api_strtotime($item['start_date']);
+                    $item['start_date_tms'] = api_strtotime($item['start_date']);
                     $agendaday = date("j", $item['start_date_tms']);
                 }
                 if ($item['end_date'] != '0000-00-00 00:00:00') {
                     $item['end_date'] = api_get_local_time($item['end_date']);
                 }
 
-                $url  = api_get_path(WEB_CODE_PATH)."calendar/agenda.php?cidReq=".urlencode($array_course_info["code"])."&day=$agendaday&month=$month&year=$year#$agendaday";
+                $url = api_get_path(WEB_CODE_PATH)."calendar/agenda.php?cidReq=".urlencode($array_course_info["code"])."&day=$agendaday&month=$month&year=$year#$agendaday";
 
                 $item['url'] = $url;
                 $item['course_name'] = $array_course_info['title'];
@@ -2921,9 +2921,9 @@ 
         }
 
         // sorting by hour for every day
-        $agendaitems = array ();
+        $agendaitems = array();
         while (list ($agendaday, $tmpitems) = each($items)) {
-            if(!isset($agendaitems[$agendaday])) {
+            if (!isset($agendaitems[$agendaday])) {
                 $agendaitems[$agendaday] = '';
             }
             sort($tmpitems);
@@ -3097,9 +3097,9 @@ 
             $end_year = $start_end_day_of_week['end']['year'];
             // in sql statements you have to use year-month-day for date calculations
             $start_filter = $start_year."-".$start_month."-".$start_day." 00:00:00";
-            $start_filter  = api_get_utc_datetime($start_filter);
+            $start_filter = api_get_utc_datetime($start_filter);
             $end_filter = $end_year."-".$end_month."-".$end_day." 23:59:59";
-            $end_filter  = api_get_utc_datetime($end_filter);
+            $end_filter = api_get_utc_datetime($end_filter);
             $sql = " SELECT * FROM ".$tbl_personal_agenda." WHERE user='".$user_id."' AND date>='".$start_filter."' AND date<='".$end_filter."'";
         }
         // 3. creating the SQL statement for getting the personal agenda items in DAY view
@@ -3107,18 +3107,18 @@ 
             // we are in day view
             // we could use mysql date() function but this is only available from 4.1 and higher
             $start_filter = $year."-".$month."-".$day." 00:00:00";
-            $start_filter  = api_get_utc_datetime($start_filter);
+            $start_filter = api_get_utc_datetime($start_filter);
             $end_filter = $year."-".$month."-".$day." 23:59:59";
-            $end_filter  = api_get_utc_datetime($end_filter);
+            $end_filter = api_get_utc_datetime($end_filter);
             $sql = " SELECT * FROM ".$tbl_personal_agenda." WHERE user='".$user_id."' AND date>='".$start_filter."' AND date<='".$end_filter."'";
         }
 
         $result = Database::query($sql);
         while ($item = Database::fetch_array($result, 'ASSOC')) {
 
-            $time_minute 	= api_convert_and_format_date($item['date'], TIME_NO_SEC_FORMAT);
-            $item['date']   = api_get_local_time($item['date']);
-            $item['start_date_tms']  = api_strtotime($item['date']);
+            $time_minute = api_convert_and_format_date($item['date'], TIME_NO_SEC_FORMAT);
+            $item['date'] = api_get_local_time($item['date']);
+            $item['start_date_tms'] = api_strtotime($item['date']);
             $item['content'] = $item['text'];
 
             // we break the date field in the database into a date and a time part
@@ -3138,7 +3138,7 @@ 
             $second = $agendatime[2];
 
             if ($type == 'month_view') {
-                $item['calendar_type']  = 'personal';
+                $item['calendar_type'] = 'personal';
                 $item['start_date']  	= $item['date'];
                 $agendaitems[$day][] 	= $item;
                 continue;
@@ -3163,7 +3163,7 @@ 
                 // this is the array construction for the DAY view
                 $halfhour = 2 * $agendatime['0'];
                 if ($agendatime['1'] >= '30') {
-                    $halfhour = $halfhour +1;
+                    $halfhour = $halfhour + 1;
                 }
 
                 //Display events by list
@@ -3187,22 +3187,22 @@ 
     {
         global $DaysShort, $course_path;
         //Handle leap year
-        $numberofdays = array (0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
+        $numberofdays = array(0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
         if (($year % 400 == 0) or ($year % 4 == 0 and $year % 100 <> 0))
             $numberofdays[2] = 29;
         //Get the first day of the month
         $dayone = getdate(mktime(0, 0, 0, $month, 1, $year));
         //Start the week on monday
         $startdayofweek = $dayone['wday'] <> 0 ? ($dayone['wday'] - 1) : 6;
-        $g_cc = (isset($_GET['courseCode'])?$_GET['courseCode']:'');
+        $g_cc = (isset($_GET['courseCode']) ? $_GET['courseCode'] : '');
 
-        $next_month = ($month == 1 ? 12 : $month -1);
-        $prev_month = ($month == 12 ? 1 : $month +1);
+        $next_month = ($month == 1 ? 12 : $month - 1);
+        $prev_month = ($month == 12 ? 1 : $month + 1);
 
-        $next_year = ($month == 1 ? $year -1 : $year);
-        $prev_year = ($month == 12 ? $year +1 : $year);
+        $next_year = ($month == 1 ? $year - 1 : $year);
+        $prev_year = ($month == 12 ? $year + 1 : $year);
 
-        if ($show_content)  {
+        if ($show_content) {
             $back_url = Display::url(get_lang('Previous'), api_get_self()."?coursePath=".urlencode($course_path)."&courseCode=".Security::remove_XSS($g_cc)."&action=view&view=month&month=".$next_month."&year=".$next_year);
             $next_url = Display::url(get_lang('Next'), api_get_self()."?coursePath=".urlencode($course_path)."&courseCode=".Security::remove_XSS($g_cc)."&action=view&view=month&month=".$prev_month."&year=".$prev_year);
         } else {
@@ -3219,7 +3219,7 @@ 
         $html .= '</div>';
         $html .= '<table id="agenda_list2" class="table table-bordered">';
         $html .= '<tr>';
-        for ($ii = 1; $ii < 8; $ii ++) {
+        for ($ii = 1; $ii < 8; $ii++) {
             $html .= '<td class="weekdays">'.$DaysShort[$ii % 7].'</td>';
         }
         $html .= '</tr>';
@@ -3228,7 +3228,7 @@ 
         $today = getdate();
         while ($curday <= $numberofdays[$month]) {
             $html .= "<tr>";
-            for ($ii = 0; $ii < 7; $ii ++) {
+            for ($ii = 0; $ii < 7; $ii++) {
                 if (($curday == -1) && ($ii == $startdayofweek)) {
                     $curday = 1;
                 }
@@ -3242,21 +3242,21 @@ 
                     $html .= "<td ".$class.">".$dayheader;
 
                     if (!empty($agendaitems[$curday])) {
-                        $items =  $agendaitems[$curday];
-                        $items =  msort($items, 'start_date_tms');
+                        $items = $agendaitems[$curday];
+                        $items = msort($items, 'start_date_tms');
 
-                        foreach($items  as $value) {
+                        foreach ($items  as $value) {
                             $value['title'] = Security::remove_XSS($value['title']);
                             $start_time = api_format_date($value['start_date'], TIME_NO_SEC_FORMAT);
                             $end_time = '';
 
                             if (!empty($value['end_date']) && $value['end_date'] != '0000-00-00 00:00:00') {
-                                $end_time    = '-&nbsp;<i>'.api_format_date($value['end_date'], DATE_TIME_FORMAT_LONG).'</i>';
+                                $end_time = '-&nbsp;<i>'.api_format_date($value['end_date'], DATE_TIME_FORMAT_LONG).'</i>';
                             }
                             $complete_time = '<i>'.api_format_date($value['start_date'], DATE_TIME_FORMAT_LONG).'</i>&nbsp;'.$end_time;
                             $time = '<i>'.$start_time.'</i>';
 
-                            switch($value['calendar_type']) {
+                            switch ($value['calendar_type']) {
                                 case 'personal':
                                     $bg_color = '#D0E7F4';
                                     $icon = Display::return_icon('user.png', get_lang('MyAgenda'), array(), ICON_SIZE_SMALL);
@@ -3308,7 +3308,7 @@ 
                         }
                     }
                     $html .= "</td>";
-                    $curday ++;
+                    $curday++;
                 } else {
                     $html .= "<td></td>";
                 }
@@ -3329,18 +3329,18 @@ 
      * where datestart and dateend are in yyyyMMddhhmmss format.
      * @TODO Implement really personal events (from user DB) and global events (from main DB)
      */
-    public static function get_personal_agenda_items_between_dates($user_id, $date_start='', $date_end='')
+    public static function get_personal_agenda_items_between_dates($user_id, $date_start = '', $date_end = '')
     {
-        $items = array ();
+        $items = array();
         if ($user_id != strval(intval($user_id))) { return $items; }
-        if (empty($date_start)) { $date_start = date('Y-m-d H:i:s');}
-        if (empty($date_end))   { $date_end = date('Y-m-d H:i:s',mktime(0, 0, 0, date("m"),   date("d"),   date("Y")+1));}
+        if (empty($date_start)) { $date_start = date('Y-m-d H:i:s'); }
+        if (empty($date_end)) { $date_end = date('Y-m-d H:i:s', mktime(0, 0, 0, date("m"), date("d"), date("Y") + 1)); }
         $expr = '/\d{4}-\d{2}-\d{2}\ \d{2}:\d{2}:\d{2}/';
-        if(!preg_match($expr,$date_start)) { return $items; }
-        if(!preg_match($expr,$date_end)) { return $items; }
+        if (!preg_match($expr, $date_start)) { return $items; }
+        if (!preg_match($expr, $date_end)) { return $items; }
 
         // get agenda-items for every course
-        $courses = api_get_user_courses($user_id,false);
+        $courses = api_get_user_courses($user_id, false);
         foreach ($courses as $id => $course) {
             $c = api_get_course_info_by_id($course['real_id']);
             //databases of the courses
@@ -3364,9 +3364,9 @@ 
                     " ORDER BY start_date ";
             } else {
                 // if the user is not an administrator of that course, then...
-                if (is_array($group_memberships) && count($group_memberships)>0)
+                if (is_array($group_memberships) && count($group_memberships) > 0)
                 {
-                    $sqlquery = "SELECT " .
+                    $sqlquery = "SELECT ".
                         "DISTINCT agenda.*, ip.visibility, ip.to_group_id, ip.insert_user_id, ip.ref ".
                         " FROM ".$t_a." agenda, ".
                         $t_ip." ip ".
@@ -3394,13 +3394,13 @@ 
 
             $result = Database::query($sqlquery);
             while ($item = Database::fetch_array($result)) {
-                $agendaday = date("j",strtotime($item['start_date']));
-                $month = date("n",strtotime($item['start_date']));
-                $year = date("Y",strtotime($item['start_date']));
+                $agendaday = date("j", strtotime($item['start_date']));
+                $month = date("n", strtotime($item['start_date']));
+                $year = date("Y", strtotime($item['start_date']));
                 $URL = api_get_path(WEB_PATH)."main/calendar/agenda.php?cidReq=".urlencode($course["code"])."&day=$agendaday&month=$month&year=$year#$agendaday";
-                list($year,$month,$day,$hour,$min,$sec) = split('[-: ]',$item['start_date']);
+                list($year, $month, $day, $hour, $min, $sec) = split('[-: ]', $item['start_date']);
                 $start_date = $year.$month.$day.$hour.$min;
-                list($year,$month,$day,$hour,$min,$sec) = split('[-: ]',$item['end_date']);
+                list($year, $month, $day, $hour, $min, $sec) = split('[-: ]', $item['end_date']);
                 $end_date = $year.$month.$day.$hour.$min;
 
                 $items[] = array(
@@ -3429,7 +3429,7 @@ 
         $user = api_get_user_id();
         $sql = " SELECT * FROM ".$tbl_personal_agenda." WHERE id=".$id." AND user = ".$user;
         $result = Database::query($sql);
-        if(Database::num_rows($result)==1) {
+        if (Database::num_rows($result) == 1) {
             $item = Database::fetch_array($result);
         } else {
             $item = null;
@@ -3451,9 +3451,9 @@ 
         // step 2: we which day this is (0=sunday, 1=monday, ...)
         $number_day_in_week = date('w', $random_day_in_week);
         // step 3: we calculate the timestamp of the monday of the week we are in
-        $start_timestamp = $random_day_in_week - (($number_day_in_week -1) * 24 * 60 * 60);
+        $start_timestamp = $random_day_in_week - (($number_day_in_week - 1) * 24 * 60 * 60);
         // step 4: we calculate the timestamp of the sunday of the week we are in
-        $end_timestamp = $random_day_in_week + ((7 - $number_day_in_week +1) * 24 * 60 * 60) - 3600;
+        $end_timestamp = $random_day_in_week + ((7 - $number_day_in_week + 1) * 24 * 60 * 60) - 3600;
         // step 5: calculating the start_day, end_day, start_month, end_month, start_year, end_year
         $start_day = date('j', $start_timestamp);
         $start_month = date('n', $start_timestamp);

main/inc/lib/zombie/zombie_manager.class.php

Spacing +3 added lines, -3 removed lines

@@ -79,7 +79,7 @@ 
         $count = intval($count);
         $from = intval($from);
 
-        $sql .=  " ORDER BY $column $direction";
+        $sql .= " ORDER BY $column $direction";
         $sql .= " LIMIT $count, $from ";
 
         $result = Database::query($sql);
@@ -93,8 +93,8 @@ 
     static function deactivate_zombies($ceiling)
     {
         $zombies = self::list_zombies($ceiling);
-        $ids  = array();
-        foreach($zombies as $zombie) {
+        $ids = array();
+        foreach ($zombies as $zombie) {
             $ids[] = $zombie['user_id'];
         }
         UserManager::deactivate_users($ids);

main/inc/lib/userportal.lib.php

Indentation +17 added lines, -17 removed lines

@@ -248,17 +248,17 @@ 
                 }
             }
 
-			if (trim($home_top_temp) == '' && api_is_platform_admin()) {
-				$home_top_temp = '<div class="welcome-mascot">' . get_lang('PortalHomepageDefaultIntroduction') . '</div>';
-			} else {
-				$home_top_temp = '<div class="welcome-home-top-temp">' . $home_top_temp . '</div>';
-			}
-			$open = str_replace('{rel_path}', api_get_path(REL_PATH), $home_top_temp);
-			$html = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
-		}
-
-		return $html;
-	}
+            if (trim($home_top_temp) == '' && api_is_platform_admin()) {
+                $home_top_temp = '<div class="welcome-mascot">' . get_lang('PortalHomepageDefaultIntroduction') . '</div>';
+            } else {
+                $home_top_temp = '<div class="welcome-home-top-temp">' . $home_top_temp . '</div>';
+            }
+            $open = str_replace('{rel_path}', api_get_path(REL_PATH), $home_top_temp);
+            $html = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
+        }
+
+        return $html;
+    }
 
     function return_notice()
     {
@@ -509,7 +509,7 @@ 
                     $thereIsSubCat = true;
                 } elseif (api_get_setting('show_empty_course_categories') == 'true') {
                     /* End changed code to eliminate the (0 courses) after empty categories. */
-                      $htmlListCat .= '<li>';
+                        $htmlListCat .= '<li>';
                     $htmlListCat .= $catLine['name'];
                     $htmlListCat .= "</li>";
                     $thereIsSubCat = true;
@@ -639,11 +639,11 @@ 
     }
 
     /**
-    * retrieves all the courses that the user has already subscribed to
-    * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University, Belgium
-    * @param int $user_id: the id of the user
-    * @return array an array containing all the information of the courses of the given user
-    */
+     * retrieves all the courses that the user has already subscribed to
+     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University, Belgium
+     * @param int $user_id: the id of the user
+     * @return array an array containing all the information of the courses of the given user
+     */
     public function get_courses_of_user($user_id)
     {
         $table_course = Database::get_main_table(TABLE_MAIN_COURSE);

Braces +1 added lines, -1 removed lines

@@ -338,7 +338,7 @@
 
         if (empty($certificatesItem) && empty($searchItem)) {
             return null;
-        }else{
+        } else{
             $content.= $certificatesItem;
             $content.= $searchItem;
         }

Doc Comments +8 added lines, -7 removed lines

@@ -657,6 +657,7 @@ 
     * retrieves all the courses that the user has already subscribed to
     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University, Belgium
     * @param int $user_id: the id of the user
+    * @param integer $user_id
     * @return array an array containing all the information of the courses of the given user
     */
     public function get_courses_of_user($user_id)
@@ -707,13 +708,13 @@ 
 
     /**
      * @todo use the template system
-     * @param $title
-     * @param $content
+     * @param string|null $title
+     * @param string $content
      * @param string $id
      * @param array $params
      * @param string $idAccordion
      * @param string $idCollapse
-     * @return null|string
+     * @return string
      */
     public function show_right_block(
         $title,
@@ -937,7 +938,7 @@ 
     }
 
     /**
-     * @return null|string
+     * @return string
      */
     public function return_course_block()
     {
@@ -1590,8 +1591,8 @@ 
 
     /**
      * Return HTML code for personal user course category
-     * @param $id
-     * @param $title
+     * @param integer $id
+     * @param string $title
      * @return string
      */
     private static function getHtmlForUserCategory($id, $title)
@@ -1612,7 +1613,7 @@ 
     /**
      * return HTML code for course display in session view
      * @param array $courseInfo
-     * @param $userCategoryId
+     * @param integer $userCategoryId
      * @param bool $displayButton
      * @param $loadDirs
      * @return string

Spacing +78 added lines, -78 removed lines

@@ -44,7 +44,7 @@ 
     {
         $exercise_list = array();
         if (!empty($personal_course_list)) {
-            foreach($personal_course_list as  $course_item) {
+            foreach ($personal_course_list as  $course_item) {
                 $course_code = $course_item['c'];
                 $session_id = $course_item['id_session'];
 
@@ -53,10 +53,10 @@ 
                     $session_id
                 );
 
-                foreach($exercises as $exercise_item) {
-                    $exercise_item['course_code']     = $course_code;
-                    $exercise_item['session_id']     = $session_id;
-                    $exercise_item['tms']     = api_strtotime($exercise_item['end_time'], 'UTC');
+                foreach ($exercises as $exercise_item) {
+                    $exercise_item['course_code'] = $course_code;
+                    $exercise_item['session_id'] = $session_id;
+                    $exercise_item['tms'] = api_strtotime($exercise_item['end_time'], 'UTC');
 
                     $exercise_list[] = $exercise_item;
                 }
@@ -171,7 +171,7 @@ 
                 }
             }
 
-            if ($show_menu && ($show_create_link || $show_course_link )) {
+            if ($show_menu && ($show_create_link || $show_course_link)) {
                 $show_menu = true;
             } else {
                 $show_menu = false;
@@ -183,14 +183,14 @@ 
         if ($show_menu) {
             $html .= '<ul class="nav nav-pills nav-stacked">';
             if ($show_create_link) {
-                $html .= '<li class="add-course"><a href="' . api_get_path(WEB_CODE_PATH) . 'create_course/add_course.php">'.Display::return_icon('new-course.png',  get_lang('CourseCreate')).(api_get_setting('course_validation') == 'true' ? get_lang('CreateCourseRequest') : get_lang('CourseCreate')).'</a></li>';
+                $html .= '<li class="add-course"><a href="'.api_get_path(WEB_CODE_PATH).'create_course/add_course.php">'.Display::return_icon('new-course.png', get_lang('CourseCreate')).(api_get_setting('course_validation') == 'true' ? get_lang('CreateCourseRequest') : get_lang('CourseCreate')).'</a></li>';
             }
 
             if ($show_course_link) {
                 if (!api_is_drh() && !api_is_session_admin()) {
-                    $html .=  '<li class="list-course"><a href="'. api_get_path(WEB_CODE_PATH) . 'auth/courses.php">'. Display::return_icon('catalog-course.png', get_lang('CourseCatalog')) .get_lang('CourseCatalog').'</a></li>';
+                    $html .= '<li class="list-course"><a href="'.api_get_path(WEB_CODE_PATH).'auth/courses.php">'.Display::return_icon('catalog-course.png', get_lang('CourseCatalog')).get_lang('CourseCatalog').'</a></li>';
                 } else {
-                    $html .= '<li><a href="' . api_get_path(WEB_CODE_PATH) . 'dashboard/index.php">'.get_lang('Dashboard').'</a></li>';
+                    $html .= '<li><a href="'.api_get_path(WEB_CODE_PATH).'dashboard/index.php">'.get_lang('Dashboard').'</a></li>';
                 }
             }
             $html .= '</ul>';
@@ -214,7 +214,7 @@ 
         $html = '';
 
         if (!empty($_GET['include']) && preg_match('/^[a-zA-Z0-9_-]*\.html$/', $_GET['include'])) {
-            $open = @(string)file_get_contents(api_get_path(SYS_PATH).$this->home.$_GET['include']);
+            $open = @(string) file_get_contents(api_get_path(SYS_PATH).$this->home.$_GET['include']);
             $html = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
         } else {
             // Hiding home top when user not connected.
@@ -244,15 +244,15 @@ 
                     $home_top_temp = file_get_contents($this->home.'home_top.html');
                 } else {
                     if (file_exists($this->default_home.'home_top.html')) {
-                        $home_top_temp = file_get_contents($this->default_home . 'home_top.html');
+                        $home_top_temp = file_get_contents($this->default_home.'home_top.html');
                     }
                 }
             }
 
 			if (trim($home_top_temp) == '' && api_is_platform_admin()) {
-				$home_top_temp = '<div class="welcome-mascot">' . get_lang('PortalHomepageDefaultIntroduction') . '</div>';
+				$home_top_temp = '<div class="welcome-mascot">'.get_lang('PortalHomepageDefaultIntroduction').'</div>';
 			} else {
-				$home_top_temp = '<div class="welcome-home-top-temp">' . $home_top_temp . '</div>';
+				$home_top_temp = '<div class="welcome-home-top-temp">'.$home_top_temp.'</div>';
 			}
 			$open = str_replace('{rel_path}', api_get_path(REL_PATH), $home_top_temp);
 			$html = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
@@ -268,9 +268,9 @@ 
 
         $html = '';
         // Notice
-        $home_notice = @(string)file_get_contents($sys_path.$this->home.'home_notice_'.$user_selected_language.'.html');
+        $home_notice = @(string) file_get_contents($sys_path.$this->home.'home_notice_'.$user_selected_language.'.html');
         if (empty($home_notice)) {
-            $home_notice = @(string)file_get_contents($sys_path.$this->home.'home_notice.html');
+            $home_notice = @(string) file_get_contents($sys_path.$this->home.'home_notice.html');
         }
 
         if (!empty($home_notice)) {
@@ -302,7 +302,7 @@ 
         }
 
         $html = null;
-        $home_menu = @(string)file_get_contents($sys_path.$this->home.'home_menu_'.$user_selected_language.'.html');
+        $home_menu = @(string) file_get_contents($sys_path.$this->home.'home_menu_'.$user_selected_language.'.html');
         if (!empty($home_menu)) {
             $home_menu_content = '<ul class="nav nav-pills nav-stacked">';
             $home_menu_content .= api_to_system_encoding($home_menu, api_detect_encoding(strip_tags($home_menu)));
@@ -332,9 +332,9 @@ 
         if (!api_is_anonymous()) {
             $certificatesItem = Display::tag(
                 'li',
-                Display::url(Display::return_icon('graduation.png',get_lang('MyCertificates'),null,ICON_SIZE_SMALL).
+                Display::url(Display::return_icon('graduation.png', get_lang('MyCertificates'), null, ICON_SIZE_SMALL).
                     get_lang('MyCertificates'),
-                    api_get_path(WEB_CODE_PATH) . "gradebook/my_certificates.php"
+                    api_get_path(WEB_CODE_PATH)."gradebook/my_certificates.php"
                 )
             );
         }
@@ -344,29 +344,29 @@ 
         if (api_get_setting('allow_public_certificates') == 'true') {
             $searchItem = Display::tag(
                 'li',
-                Display::url(Display::return_icon('search_graduation.png',get_lang('Search'),null,ICON_SIZE_SMALL).
+                Display::url(Display::return_icon('search_graduation.png', get_lang('Search'), null, ICON_SIZE_SMALL).
                     get_lang('Search'),
-                    api_get_path(WEB_CODE_PATH) . "gradebook/search.php"
+                    api_get_path(WEB_CODE_PATH)."gradebook/search.php"
                 )
             );
         }
 
         if (empty($certificatesItem) && empty($searchItem)) {
             return null;
-        }else{
-            $content.= $certificatesItem;
-            $content.= $searchItem;
+        } else {
+            $content .= $certificatesItem;
+            $content .= $searchItem;
         }
 
         if (api_get_setting('allow_skills_tool') == 'true') {
 
-            $content .= Display::tag('li', Display::url(Display::return_icon('skill-badges.png',get_lang('MySkills'),null,ICON_SIZE_SMALL).get_lang('MySkills'), api_get_path(WEB_CODE_PATH).'social/my_skills_report.php'));
+            $content .= Display::tag('li', Display::url(Display::return_icon('skill-badges.png', get_lang('MySkills'), null, ICON_SIZE_SMALL).get_lang('MySkills'), api_get_path(WEB_CODE_PATH).'social/my_skills_report.php'));
             $allowSkillsManagement = api_get_setting('allow_hr_skills_management') == 'true';
             if (($allowSkillsManagement && api_is_drh()) || api_is_platform_admin()) {
                 $content .= Display::tag('li',
                     Display::url(Display::return_icon('edit-skill.png', get_lang('MySkills'), null,
-                            ICON_SIZE_SMALL) . get_lang('ManageSkills'),
-                        api_get_path(WEB_CODE_PATH) . 'admin/skills_wheel.php'));
+                            ICON_SIZE_SMALL).get_lang('ManageSkills'),
+                        api_get_path(WEB_CODE_PATH).'admin/skills_wheel.php'));
             }
         }
         $content .= '</ul>';
@@ -465,7 +465,7 @@ 
                     FROM $main_category_table t1
                     LEFT JOIN $main_category_table t2 ON t1.code=t2.parent_id
                     LEFT JOIN $main_course_table t3 ON (t3.category_code = t1.code $platform_visible_courses)
-                    WHERE t1.parent_id ". (empty ($category) ? "IS NULL" : "='$category'")."
+                    WHERE t1.parent_id ".(empty ($category) ? "IS NULL" : "='$category'")."
                     GROUP BY t1.name,t1.code,t1.parent_id,t1.children_count ORDER BY t1.tree_pos, t1.name";
 
         // Showing only the category of courses of the current access_url_id
@@ -542,10 +542,10 @@ 
         }
         $result .= $htmlTitre;
         if ($thereIsSubCat) {
-            $result .=  $htmlListCat;
+            $result .= $htmlListCat;
         }
         while ($categoryName = Database::fetch_array($resCats)) {
-            $result .= '<h3>' . $categoryName['name'] . "</h3>\n";
+            $result .= '<h3>'.$categoryName['name']."</h3>\n";
         }
         $numrows = Database::num_rows($sql_result_courses);
         $courses_list_string = '';
@@ -643,12 +643,12 @@ 
         if ($courses_shown > 0) {
             // Only display the list of courses and categories if there was more than
                     // 0 courses visible to the world (we're in the anonymous list here).
-            $result .=  $courses_list_string;
+            $result .= $courses_list_string;
         }
         if ($category != '') {
-            $result .=  '<p><a href="'.api_get_self().'"> ' .
+            $result .= '<p><a href="'.api_get_self().'"> '.
                 Display :: return_icon('back.png', get_lang('BackToHomePage')).
-                get_lang('BackToHomePage') . '</a></p>';
+                get_lang('BackToHomePage').'</a></p>';
         }
         return $result;
     }
@@ -725,14 +725,14 @@ 
     ) {
         if (!empty($idAccordion)) {
             $html = null;
-            $html .= '<div class="panel-group" id="'.$idAccordion.'" role="tablist" aria-multiselectable="true">' . PHP_EOL;
-            $html .= '<div class="panel panel-default" id="'.$id.'">' . PHP_EOL;
-            $html .= '<div class="panel-heading" role="tab"><h4 class="panel-title">' . PHP_EOL;
-            $html .= '<a role="button" data-toggle="collapse" data-parent="#'.$idAccordion.'" href="#'.$idCollapse.'" aria-expanded="true" aria-controls="'.$idCollapse.'">'.$title.'</a>' . PHP_EOL;
-            $html .= '</h4></div>' . PHP_EOL;
-            $html .= '<div id="'.$idCollapse.'" class="panel-collapse collapse in" role="tabpanel">' . PHP_EOL;
-            $html .= '<div class="panel-body">'.$content.'</div>' . PHP_EOL;
-            $html .= '</div></div></div>' . PHP_EOL;
+            $html .= '<div class="panel-group" id="'.$idAccordion.'" role="tablist" aria-multiselectable="true">'.PHP_EOL;
+            $html .= '<div class="panel panel-default" id="'.$id.'">'.PHP_EOL;
+            $html .= '<div class="panel-heading" role="tab"><h4 class="panel-title">'.PHP_EOL;
+            $html .= '<a role="button" data-toggle="collapse" data-parent="#'.$idAccordion.'" href="#'.$idCollapse.'" aria-expanded="true" aria-controls="'.$idCollapse.'">'.$title.'</a>'.PHP_EOL;
+            $html .= '</h4></div>'.PHP_EOL;
+            $html .= '<div id="'.$idCollapse.'" class="panel-collapse collapse in" role="tabpanel">'.PHP_EOL;
+            $html .= '<div class="panel-body">'.$content.'</div>'.PHP_EOL;
+            $html .= '</div></div></div>'.PHP_EOL;
 
         } else {
             if (!empty($id)) {
@@ -741,9 +741,9 @@ 
             $params['class'] = 'panel panel-default';
             $html = null;
             if (!empty($title)) {
-                $html .= '<div class="panel-heading">'.$title.'</div>' . PHP_EOL;
+                $html .= '<div class="panel-heading">'.$title.'</div>'.PHP_EOL;
             }
-            $html.= '<div class="panel-body">'.$content.'</div>' . PHP_EOL;
+            $html .= '<div class="panel-body">'.$content.'</div>'.PHP_EOL;
             $html = Display::div($html, $params);
         }
         return $html;
@@ -789,7 +789,7 @@ 
             $usergroup_list = $usergroup->get_usergroup_by_user(api_get_user_id());
             $classes = '';
             if (!empty($usergroup_list)) {
-                foreach($usergroup_list as $group_id) {
+                foreach ($usergroup_list as $group_id) {
                     $data = $usergroup->get($group_id);
                     $data['name'] = Display::url($data['name'], api_get_path(WEB_CODE_PATH).'user/classes.php?id='.$data['id']);
                     $classes .= Display::tag('li', $data['name']);
@@ -798,7 +798,7 @@ 
             if (api_is_platform_admin()) {
                 $classes .= Display::tag(
                     'li',
-                    Display::url(get_lang('AddClasses') ,api_get_path(WEB_CODE_PATH).'admin/usergroups.php?action=add')
+                    Display::url(get_lang('AddClasses'), api_get_path(WEB_CODE_PATH).'admin/usergroups.php?action=add')
                 );
             }
             if (!empty($classes)) {
@@ -820,11 +820,11 @@ 
             $content = null;
 
             if (api_get_setting('allow_social_tool') == 'true') {
-                $content .= '<a style="text-align:center" href="' . api_get_path(WEB_PATH) . 'main/social/home.php">
-                <img class="img-circle" src="' . $userPicture . '" ></a>';
+                $content .= '<a style="text-align:center" href="'.api_get_path(WEB_PATH).'main/social/home.php">
+                <img class="img-circle" src="' . $userPicture.'" ></a>';
             } else {
-                $content .= '<a style="text-align:center" href="' . api_get_path(WEB_PATH) . 'main/auth/profile.php">
-                <img class="img-circle" title="' . get_lang('EditProfile') . '" src="' . $userPicture. '" ></a>';
+                $content .= '<a style="text-align:center" href="'.api_get_path(WEB_PATH).'main/auth/profile.php">
+                <img class="img-circle" title="' . get_lang('EditProfile').'" src="'.$userPicture.'" ></a>';
             }
 
             $html = self::show_right_block(
@@ -876,12 +876,12 @@ 
             if (api_get_setting('allow_social_tool') == 'true') {
                 $link = '?f=social';
             }
-            $profile_content .= '<li class="inbox-message-social"><a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php'.$link.'">'.Display::return_icon('inbox.png',get_lang('Inbox'),null,ICON_SIZE_SMALL).get_lang('Inbox').$cant_msg.' </a></li>';
-            $profile_content .= '<li class="new-message-social"><a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php'.$link.'">'.Display::return_icon('new-message.png',get_lang('Compose'),null,ICON_SIZE_SMALL).get_lang('Compose').' </a></li>';
+            $profile_content .= '<li class="inbox-message-social"><a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php'.$link.'">'.Display::return_icon('inbox.png', get_lang('Inbox'), null, ICON_SIZE_SMALL).get_lang('Inbox').$cant_msg.' </a></li>';
+            $profile_content .= '<li class="new-message-social"><a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php'.$link.'">'.Display::return_icon('new-message.png', get_lang('Compose'), null, ICON_SIZE_SMALL).get_lang('Compose').' </a></li>';
 
             if (api_get_setting('allow_social_tool') == 'true') {
                 $total_invitations = Display::badge($total_invitations);
-                $profile_content .= '<li class="invitations-social"><a href="'.api_get_path(WEB_PATH).'main/social/invitations.php">'.Display::return_icon('invitations.png',get_lang('PendingInvitations'),null,ICON_SIZE_SMALL).get_lang('PendingInvitations').$total_invitations.'</a></li>';
+                $profile_content .= '<li class="invitations-social"><a href="'.api_get_path(WEB_PATH).'main/social/invitations.php">'.Display::return_icon('invitations.png', get_lang('PendingInvitations'), null, ICON_SIZE_SMALL).get_lang('PendingInvitations').$total_invitations.'</a></li>';
             }
 
             if (isset($_configuration['allow_my_files_link_in_homepage']) && $_configuration['allow_my_files_link_in_homepage']) {
@@ -897,7 +897,7 @@ 
 
         $editProfileUrl = Display::getProfileEditionLink($user_id);
 
-        $profile_content .= '<li class="profile-social"><a href="' . $editProfileUrl . '">'.Display::return_icon('edit-profile.png',get_lang('EditProfile'),null,ICON_SIZE_SMALL).get_lang('EditProfile').'</a></li>';
+        $profile_content .= '<li class="profile-social"><a href="'.$editProfileUrl.'">'.Display::return_icon('edit-profile.png', get_lang('EditProfile'), null, ICON_SIZE_SMALL).get_lang('EditProfile').'</a></li>';
         $profile_content .= '</ul>';
         $html = self::show_right_block(
             get_lang('Profile'),
@@ -972,17 +972,17 @@ 
         if ($show_create_link) {
             $my_account_content .= '<li class="add-course"><a href="main/create_course/add_course.php">';
             if (api_get_setting('course_validation') == 'true' && !api_is_platform_admin()) {
-                $my_account_content .= Display::return_icon('new-course.png',get_lang('CreateCourseRequest'),null,ICON_SIZE_SMALL);
+                $my_account_content .= Display::return_icon('new-course.png', get_lang('CreateCourseRequest'), null, ICON_SIZE_SMALL);
                 $my_account_content .= get_lang('CreateCourseRequest');
             } else {
-                $my_account_content .= Display::return_icon('new-course.png',get_lang('CourseCreate'),null,ICON_SIZE_SMALL);
+                $my_account_content .= Display::return_icon('new-course.png', get_lang('CourseCreate'), null, ICON_SIZE_SMALL);
                 $my_account_content .= get_lang('CourseCreate');
             }
             $my_account_content .= '</a></li>';
 
             if (SessionManager::allowToManageSessions()) {
                 $my_account_content .= '<li class="add-course"><a href="main/session/session_add.php">';
-                $my_account_content .= Display::return_icon('session.png',get_lang('AddSession'),null,ICON_SIZE_SMALL);
+                $my_account_content .= Display::return_icon('session.png', get_lang('AddSession'), null, ICON_SIZE_SMALL);
                 $my_account_content .= get_lang('AddSession');
                 $my_account_content .= '</a></li>';
             }
@@ -990,21 +990,21 @@ 
 
         //Sort courses
         $url = api_get_path(WEB_CODE_PATH).'auth/courses.php?action=sortmycourses';
-        $img_order= Display::return_icon('order-course.png',get_lang('SortMyCourses'),null,ICON_SIZE_SMALL);
+        $img_order = Display::return_icon('order-course.png', get_lang('SortMyCourses'), null, ICON_SIZE_SMALL);
         $my_account_content .= '<li class="order-course">'.Display::url($img_order.get_lang('SortMyCourses'), $url, array('class' => 'sort course')).'</li>';
 
         // Session history
         if (isset($_GET['history']) && intval($_GET['history']) == 1) {
-            $my_account_content .= '<li class="history-course"><a href="user_portal.php">'.Display::return_icon('history-course.png',get_lang('DisplayTrainingList'),null,ICON_SIZE_SMALL).get_lang('DisplayTrainingList').'</a></li>';
+            $my_account_content .= '<li class="history-course"><a href="user_portal.php">'.Display::return_icon('history-course.png', get_lang('DisplayTrainingList'), null, ICON_SIZE_SMALL).get_lang('DisplayTrainingList').'</a></li>';
         } else {
-            $my_account_content .= '<li class="history-course"><a href="user_portal.php?history=1" >'.Display::return_icon('history-course.png',get_lang('HistoryTrainingSessions'),null,ICON_SIZE_SMALL).get_lang('HistoryTrainingSessions').'</a></li>';
+            $my_account_content .= '<li class="history-course"><a href="user_portal.php?history=1" >'.Display::return_icon('history-course.png', get_lang('HistoryTrainingSessions'), null, ICON_SIZE_SMALL).get_lang('HistoryTrainingSessions').'</a></li>';
         }
 
         // Course catalog
 
         if ($show_course_link) {
             if (!api_is_drh()) {
-                $my_account_content .= '<li class="list-course"><a href="main/auth/courses.php" >'.Display::return_icon('catalog-course.png',get_lang('CourseCatalog'),null,ICON_SIZE_SMALL).get_lang('CourseCatalog').'</a></li>';
+                $my_account_content .= '<li class="list-course"><a href="main/auth/courses.php" >'.Display::return_icon('catalog-course.png', get_lang('CourseCatalog'), null, ICON_SIZE_SMALL).get_lang('CourseCatalog').'</a></li>';
             } else {
                 $my_account_content .= '<li><a href="main/dashboard/index.php">'.get_lang('Dashboard').'</a></li>';
             }
@@ -1183,10 +1183,10 @@ 
 
                             $extra_info = !empty($session_box['coach']) ? $session_box['coach'] : null;
                             $extra_info .= !empty($session_box['coach'])
-                                ? ' - ' . $session_box['dates']
+                                ? ' - '.$session_box['dates']
                                 : $session_box['dates'];
                             $extra_info .= isset($session_box['duration'])
-                                ? ' ' . $session_box['duration']
+                                ? ' '.$session_box['duration']
                                 : null;
 
                             $params['extra_fields'] = $session_box['extra_fields'];
@@ -1308,8 +1308,8 @@ 
                                 $sessionParams['course_list_session_style'] = $coursesListSessionStyle;
                                 $sessionParams['title'] = $session_box['title'];
                                 $sessionParams['subtitle'] = (!empty($session_box['coach'])
-                                    ? $session_box['coach'] . ' | '
-                                    : '') . $session_box['dates'];
+                                    ? $session_box['coach'].' | '
+                                    : '').$session_box['dates'];
                                 $sessionParams['show_actions'] = api_is_platform_admin();
                                 $sessionParams['courses'] = $html_courses_session;
                                 $sessionParams['show_simple_session_info'] = false;
@@ -1359,14 +1359,14 @@ 
                                 !empty($session_category_start_date) &&
                                 $session_category_start_date != '0000-00-00'
                             ) {
-                                $categoryParams['subtitle'] = get_lang('From') . ' ' . $session_category_start_date;
+                                $categoryParams['subtitle'] = get_lang('From').' '.$session_category_start_date;
                             }
 
                             if (
                                 !empty($session_category_end_date) &&
                                 $session_category_end_date != '0000-00-00'
                             ) {
-                                $categoryParams['subtitle'] = get_lang('Until') . ' ' . $session_category_end_date;
+                                $categoryParams['subtitle'] = get_lang('Until').' '.$session_category_end_date;
                             }
                         }
 
@@ -1440,7 +1440,7 @@ 
         if ($load_history) {
             $html .= Display::page_subheader(get_lang('HistoryTrainingSession'));
             if (empty($session_categories)) {
-                $html .=  get_lang('YouDoNotHaveAnySessionInItsHistory');
+                $html .= get_lang('YouDoNotHaveAnySessionInItsHistory');
             }
         }
 
@@ -1513,7 +1513,7 @@ 
                     } else {
                         $htmlCategory .= '<div class="session-view-row" >';
                     }
-                    $coursesInfo =  $listCourse['course'];
+                    $coursesInfo = $listCourse['course'];
 
                     $htmlCategory .= self::getHtmlForCourse(
                         $coursesInfo,
@@ -1530,7 +1530,7 @@ 
                             $listCategorySession['catSessionName']
                         );
                         // list of session
-                        $htmlSession = '';    // start
+                        $htmlSession = ''; // start
                         foreach ($listCategorySession['sessionList'] as $k => $listSession) {
                             // add session
                             $htmlSession .= '<div class="session-view-row">';
@@ -1547,8 +1547,8 @@ 
                         $htmlSessionCategory .= $htmlSession;
                     }
                     $htmlSessionCategory .= '</div>'; // end session cat block
-                    $htmlCategory .=  $htmlSessionCategory .'</div>' ;
-                    $htmlCategory .= '';   // end course block
+                    $htmlCategory .= $htmlSessionCategory.'</div>';
+                    $htmlCategory .= ''; // end course block
                 }
                 $userCategoryHtml .= $htmlCategory;
             }
@@ -1573,11 +1573,11 @@ 
                 }
             }
             $htmlCategory .= '';
-            $userCategoryHtml .= $htmlCategory;   // end user cat block
+            $userCategoryHtml .= $htmlCategory; // end user cat block
             if ($userCategoryId != 0) {
                 $userCategoryHtml .= '</div>';
             }
-            $html .= $userCategoryHtml;   //
+            $html .= $userCategoryHtml; //
         }
         $html .= '</div>';
 
@@ -1718,11 +1718,11 @@ 
         $html = '';
 
         if ($categorySessionId == 0) {
-            $class1 = 'session-view-lvl-2';    // session
-            $class2 = 'session-view-lvl-4';    // got to course in session link
+            $class1 = 'session-view-lvl-2'; // session
+            $class2 = 'session-view-lvl-4'; // got to course in session link
         } else {
-            $class1 = 'session-view-lvl-3';    // session
-            $class2 = 'session-view-lvl-5';    // got to course in session link
+            $class1 = 'session-view-lvl-3'; // session
+            $class2 = 'session-view-lvl-5'; // got to course in session link
         }
 
         $icon = Display::return_icon(
@@ -1750,7 +1750,7 @@ 
         if ($listA['userCatTitle'] == $listB['userCatTitle']) {
             if ($listA['title'] == $listB['title']) {
                 return 0;
-            } else if($listA['title'] > $listB['title']) {
+            } else if ($listA['title'] > $listB['title']) {
                 return 1;
             } else {
                 return -1;
@@ -1771,7 +1771,7 @@ 
     {
         if ($listA['title'] == $listB['title']) {
             return 0;
-        } else if($listA['title'] > $listB['title']) {
+        } else if ($listA['title'] > $listB['title']) {
             return 1;
         } else {
             return -1;

main/tracking/lp_results_by_user.php

Braces +2 added lines, -1 removed lines

@@ -73,8 +73,9 @@
 //$form->addElement('submit','submit',get_lang('Filter'));
 $form->addButtonFilter(get_lang('Filter'));
 
-if (!empty($_REQUEST['course_code']))
+if (!empty($_REQUEST['course_code'])) {
     $selected_course = $_REQUEST['course_code'];
+}
 if (!empty($selected_course)) {
     $selected_course = api_get_course_info($selected_course);
     $course_list = array($selected_course);

Indentation +102 added lines, -102 removed lines

@@ -16,34 +16,34 @@ 
 $is_allowedToTrack = $is_courseAdmin || $is_platformAdmin || $is_courseCoach || $is_sessionAdmin;
 
 if (!$is_allowedToTrack) {
-	Display :: display_header(null);
-	api_not_allowed();
-	Display :: display_footer();
+    Display :: display_header(null);
+    api_not_allowed();
+    Display :: display_footer();
 }
 
 $export_to_csv = false;
 if (isset($_GET['export'])) {
-	$export_to_csv = true;
+    $export_to_csv = true;
 }
 
 if (api_is_platform_admin() ) {
-	$global = true;
+    $global = true;
 } else {
-	$global = false;
+    $global = false;
 }
 
 if ($global) {
-	$temp_course_list = CourseManager :: get_courses_list();
-	foreach($temp_course_list  as $temp_course_item) {
-		$course_item = CourseManager ::get_course_information($temp_course_item['code']);
+    $temp_course_list = CourseManager :: get_courses_list();
+    foreach($temp_course_list  as $temp_course_item) {
+        $course_item = CourseManager ::get_course_information($temp_course_item['code']);
         $course_list[] = array(
             'code' => $course_item['code'],
             'title' => $course_item['title'],
         );
-	}
+    }
 } else {
     $current_course['code'] = $_course['id'];
-	$course_list = array($current_course);
+    $course_list = array($current_course);
 }
 
 $new_course_select = array();
@@ -54,20 +54,20 @@ 
 $form = new FormValidator('search_simple', 'POST', '', '', null, false);
 $form->addElement('select','course_code',get_lang('Course'), $new_course_select);
 if ($global) {
-	$form->addElement('hidden','view','admin');
+    $form->addElement('hidden','view','admin');
 } else {
-	//Get exam lists
+    //Get exam lists
     $course_id = api_get_course_int_id();
-	$t_quiz = Database::get_course_table(TABLE_QUIZ_TEST);
-	$sqlExercices = "SELECT quiz.title,id FROM ".$t_quiz." AS quiz
+    $t_quiz = Database::get_course_table(TABLE_QUIZ_TEST);
+    $sqlExercices = "SELECT quiz.title,id FROM ".$t_quiz." AS quiz
 	                 WHERE c_id = $course_id AND active='1'
 	                 ORDER BY quiz.title ASC";
-	$resultExercices = Database::query($sqlExercices);
-	$exercise_list[0] = get_lang('All');
-	while($a_exercices = Database::fetch_array($resultExercices)) {
-		$exercise_list[$a_exercices['id']] = $a_exercices['title'];
-	}
-	$form->addElement('select', 'exercise_id', get_lang('Exercise'), $exercise_list);
+    $resultExercices = Database::query($sqlExercices);
+    $exercise_list[0] = get_lang('All');
+    while($a_exercices = Database::fetch_array($resultExercices)) {
+        $exercise_list[$a_exercices['id']] = $a_exercices['title'];
+    }
+    $form->addElement('select', 'exercise_id', get_lang('Exercise'), $exercise_list);
 }
 
 //$form->addElement('submit','submit',get_lang('Filter'));
@@ -81,9 +81,9 @@ 
 }
 
 if (!$export_to_csv) {
-	Display :: display_header(get_lang('Reporting'));
-	echo '<div class="actions" style ="font-size:10pt;">';
-	if ($global) {
+    Display :: display_header(get_lang('Reporting'));
+    echo '<div class="actions" style ="font-size:10pt;">';
+    if ($global) {
 
         echo '<div style="float:right"> <a href="'.api_get_self().'?export=1&score='.$filter_score.'&exercise_id='.$exercise_id.'">
                 '.Display::return_icon('csv.gif').'
@@ -93,81 +93,81 @@ 
                 &nbsp;'.get_lang('Print').'</a>
                 	</div>';
 
-		$menu_items[] = '<a href="'.api_get_path(WEB_CODE_PATH).'mySpace/?view=teacher">'.get_lang('TeacherInterface').'</a>';
+        $menu_items[] = '<a href="'.api_get_path(WEB_CODE_PATH).'mySpace/?view=teacher">'.get_lang('TeacherInterface').'</a>';
         if (api_is_platform_admin()) {
-		  $menu_items[] = '<a href="'.api_get_path(WEB_CODE_PATH).'mySpace/?view=admin">'.get_lang('AdminInterface').'</a>';
+            $menu_items[] = '<a href="'.api_get_path(WEB_CODE_PATH).'mySpace/?view=admin">'.get_lang('AdminInterface').'</a>';
         } else {
             $menu_items[] = '<a href="'.api_get_path(WEB_CODE_PATH).'mySpace/?view=coach">'.get_lang('AdminInterface').'</a>';
         }
-		$menu_items[] = get_lang('ExamTracking');
-		$nb_menu_items = count($menu_items);
-		if($nb_menu_items>1) {
-			foreach($menu_items as $key=> $item) {
-				echo $item;
-				if($key!=$nb_menu_items-1) {
-					echo ' | ';
-				}
-			}
-			echo '<br />';
-		}
-	} else {
-	    echo '<a href="courseLog.php?'.api_get_cidreq().'&studentlist=true">'.get_lang('StudentsTracking').'</a>&nbsp;|
+        $menu_items[] = get_lang('ExamTracking');
+        $nb_menu_items = count($menu_items);
+        if($nb_menu_items>1) {
+            foreach($menu_items as $key=> $item) {
+                echo $item;
+                if($key!=$nb_menu_items-1) {
+                    echo ' | ';
+                }
+            }
+            echo '<br />';
+        }
+    } else {
+        echo '<a href="courseLog.php?'.api_get_cidreq().'&studentlist=true">'.get_lang('StudentsTracking').'</a>&nbsp;|
 		     <a href="courseLog.php?'.api_get_cidreq().'&studentlist=false">'.get_lang('CourseTracking').'</a>&nbsp;|&nbsp';
         echo '<a href="courseLog.php?'.api_get_cidreq().'&studentlist=resources">'.get_lang('ResourcesTracking').'</a>';
-		echo ' | '.get_lang('ExamTracking').'';
+        echo ' | '.get_lang('ExamTracking').'';
         echo '<a href="'.api_get_self().'?export=1&score='.$filter_score.'&exercise_id='.$exercise_id.'">
             '.Display::return_icon('excel.gif').'
             &nbsp;'.get_lang('ExportAsXLS').'</a><br /><br />';
 
-	}
+    }
     echo '</div>';
-	echo '<br /><br />';
-	$form->display();
+    echo '<br /><br />';
+    $form->display();
 }
 $main_result = array();
 $session_id = 0;
 $user_list = array();
 // Getting course list
 foreach ($course_list  as $current_course ) {
-	$course_info = api_get_course_info($current_course['code']);
-	$_course = $course_info;
-
-	// Getting LP list
-	$list = new LearnpathList('', $current_course['code'], $session_id);
-	$lp_list = $list->get_flat_list();
-
-	// Looping LPs
-	$lps = array();
-	foreach ($lp_list as $lp_id =>$lp) {
-		$exercise_list = Event::get_all_exercises_from_lp($lp_id, $course_info['real_id']);
-		$attempt_result = array();
-		// Looping Chamilo Exercises in LP
-		foreach ($exercise_list as $exercise) {
-			$exercise_stats = Event::get_all_exercise_event_from_lp(
-				$exercise['path'],
-				$course_info['real_id'],
-				$session_id
-			);
-			// Looping Exercise Attempts
-			foreach ($exercise_stats as $stats) {
-				$attempt_result[$exercise['id']]['users'][$stats['exe_user_id']][$stats['exe_id']] = $stats;
-				$user_list[$stats['exe_user_id']] = $stats['exe_user_id'];
-			}
-			$exercise_list_name[$exercise['id']] = $exercise['title'];
-		}
-		$lps[$lp_id] = array('lp_name' =>$lp['lp_name'], 'exercises' =>$attempt_result);
-		$lp_list_name[$lp_id] = $lp['lp_name'];
-	}
-	$main_result[$current_course['code']] = $lps;
+    $course_info = api_get_course_info($current_course['code']);
+    $_course = $course_info;
+
+    // Getting LP list
+    $list = new LearnpathList('', $current_course['code'], $session_id);
+    $lp_list = $list->get_flat_list();
+
+    // Looping LPs
+    $lps = array();
+    foreach ($lp_list as $lp_id =>$lp) {
+        $exercise_list = Event::get_all_exercises_from_lp($lp_id, $course_info['real_id']);
+        $attempt_result = array();
+        // Looping Chamilo Exercises in LP
+        foreach ($exercise_list as $exercise) {
+            $exercise_stats = Event::get_all_exercise_event_from_lp(
+                $exercise['path'],
+                $course_info['real_id'],
+                $session_id
+            );
+            // Looping Exercise Attempts
+            foreach ($exercise_stats as $stats) {
+                $attempt_result[$exercise['id']]['users'][$stats['exe_user_id']][$stats['exe_id']] = $stats;
+                $user_list[$stats['exe_user_id']] = $stats['exe_user_id'];
+            }
+            $exercise_list_name[$exercise['id']] = $exercise['title'];
+        }
+        $lps[$lp_id] = array('lp_name' =>$lp['lp_name'], 'exercises' =>$attempt_result);
+        $lp_list_name[$lp_id] = $lp['lp_name'];
+    }
+    $main_result[$current_course['code']] = $lps;
 }
 
 if (!empty($user_list)) {
     foreach($user_list as $user_id) {
         $user_data = api_get_user_info($user_id);
-		$user_list_name[$user_id] = api_get_person_name(
-			$user_data['firstname'],
-			$user_data['lastname']
-		);
+        $user_list_name[$user_id] = api_get_person_name(
+            $user_data['firstname'],
+            $user_data['lastname']
+        );
     }
 }
 $export_array =  array();
@@ -207,15 +207,15 @@ 
                         $html_result .= Display::tag('td', $result);
 
                         $html_result .= '</tr>';
-						$export_array[] = array(
-							$course_code,
-							$lp_list_name[$lp_id],
-							$exercise_list_name[$exercise_id],
-							$user_list_name[$user_id],
-							$attempt,
-							api_get_local_time($attempt_data['exe_date']),
-							$result,
-						);
+                        $export_array[] = array(
+                            $course_code,
+                            $lp_list_name[$lp_id],
+                            $exercise_list_name[$exercise_id],
+                            $user_list_name[$user_id],
+                            $attempt,
+                            api_get_local_time($attempt_data['exe_date']),
+                            $result,
+                        );
                         $attempt++;
                     }
                 }
@@ -226,30 +226,30 @@ 
 }
 
 if (!$export_to_csv) {
-	echo $html_result;
+    echo $html_result;
 }
 $filename = 'learning_path_results-'.date('Y-m-d-h:i:s').'.xls';
 if ($export_to_csv) {
     export_complete_report_csv($filename, $export_array);
-	exit;
+    exit;
 }
 
 function export_complete_report_csv($filename, $array)
 {
-	$header[] = array(
-		get_lang('Course'),
-		get_lang('LearningPath'),
-		get_lang('Exercise'),
-		get_lang('User'),
-		get_lang('Attempt'),
-		get_lang('Date'),
-		get_lang('Results'),
-	);
-	if (!empty($array)) {
-		$array = array_merge($header, $array);
-		Export :: arrayToCsv($array, $filename);
-	}
-	exit;
+    $header[] = array(
+        get_lang('Course'),
+        get_lang('LearningPath'),
+        get_lang('Exercise'),
+        get_lang('User'),
+        get_lang('Attempt'),
+        get_lang('Date'),
+        get_lang('Results'),
+    );
+    if (!empty($array)) {
+        $array = array_merge($header, $array);
+        Export :: arrayToCsv($array, $filename);
+    }
+    exit;
 
 }
 Display :: display_footer();

Spacing +16 added lines, -16 removed lines

@@ -26,7 +26,7 @@ 
 	$export_to_csv = true;
 }
 
-if (api_is_platform_admin() ) {
+if (api_is_platform_admin()) {
 	$global = true;
 } else {
 	$global = false;
@@ -34,7 +34,7 @@ 
 
 if ($global) {
 	$temp_course_list = CourseManager :: get_courses_list();
-	foreach($temp_course_list  as $temp_course_item) {
+	foreach ($temp_course_list  as $temp_course_item) {
 		$course_item = CourseManager ::get_course_information($temp_course_item['code']);
         $course_list[] = array(
             'code' => $course_item['code'],
@@ -47,14 +47,14 @@ 
 }
 
 $new_course_select = array();
-foreach($course_list as $data) {
+foreach ($course_list as $data) {
     $new_course_select[$data['code']] = $data['title'];
 }
 
 $form = new FormValidator('search_simple', 'POST', '', '', null, false);
-$form->addElement('select','course_code',get_lang('Course'), $new_course_select);
+$form->addElement('select', 'course_code', get_lang('Course'), $new_course_select);
 if ($global) {
-	$form->addElement('hidden','view','admin');
+	$form->addElement('hidden', 'view', 'admin');
 } else {
 	//Get exam lists
     $course_id = api_get_course_int_id();
@@ -64,7 +64,7 @@ 
 	                 ORDER BY quiz.title ASC";
 	$resultExercices = Database::query($sqlExercices);
 	$exercise_list[0] = get_lang('All');
-	while($a_exercices = Database::fetch_array($resultExercices)) {
+	while ($a_exercices = Database::fetch_array($resultExercices)) {
 		$exercise_list[$a_exercices['id']] = $a_exercices['title'];
 	}
 	$form->addElement('select', 'exercise_id', get_lang('Exercise'), $exercise_list);
@@ -87,7 +87,7 @@ 
 
         echo '<div style="float:right"> <a href="'.api_get_self().'?export=1&score='.$filter_score.'&exercise_id='.$exercise_id.'">
                 '.Display::return_icon('csv.gif').'
-                &nbsp;'.get_lang('ExportAsCSV').'</a>' .
+                &nbsp;'.get_lang('ExportAsCSV').'</a>'.
                 '<a href="javascript: void(0);" onclick="javascript: window.print()">
                 '.Display::return_icon('printmgr.gif').'
                 &nbsp;'.get_lang('Print').'</a>
@@ -101,10 +101,10 @@ 
         }
 		$menu_items[] = get_lang('ExamTracking');
 		$nb_menu_items = count($menu_items);
-		if($nb_menu_items>1) {
-			foreach($menu_items as $key=> $item) {
+		if ($nb_menu_items > 1) {
+			foreach ($menu_items as $key=> $item) {
 				echo $item;
-				if($key!=$nb_menu_items-1) {
+				if ($key != $nb_menu_items - 1) {
 					echo ' | ';
 				}
 			}
@@ -128,7 +128,7 @@ 
 $session_id = 0;
 $user_list = array();
 // Getting course list
-foreach ($course_list  as $current_course ) {
+foreach ($course_list  as $current_course) {
 	$course_info = api_get_course_info($current_course['code']);
 	$_course = $course_info;
 
@@ -162,7 +162,7 @@ 
 }
 
 if (!empty($user_list)) {
-    foreach($user_list as $user_id) {
+    foreach ($user_list as $user_id) {
         $user_data = api_get_user_info($user_id);
 		$user_list_name[$user_id] = api_get_person_name(
 			$user_data['firstname'],
@@ -170,7 +170,7 @@ 
 		);
     }
 }
-$export_array =  array();
+$export_array = array();
 if (!empty($main_result)) {
 
     $html_result .= '<table  class="data_table">';
@@ -193,9 +193,9 @@ 
 
             foreach ($exercises as $exercise_id => $exercise_data) {
                 $users = $exercise_data['users'];
-                foreach($users as $user_id => $attempts) {
+                foreach ($users as $user_id => $attempts) {
                     $attempt = 1;
-                    foreach($attempts as $exe_id => $attempt_data) {
+                    foreach ($attempts as $exe_id => $attempt_data) {
                         $html_result .= '<tr colspan="">';
                         $html_result .= Display::tag('td', $course_code);
                         $html_result .= Display::tag('td', $lp_list_name[$lp_id]);
@@ -222,7 +222,7 @@ 
             }
         }
     }
-    $html_result .='</table>';
+    $html_result .= '</table>';
 }
 
 if (!$export_to_csv) {

main/tracking/toolaccess_details.php

Spacing +28 added lines, -28 removed lines

@@ -23,7 +23,7 @@ 
 
 $nameTools = get_lang('ToolName');
 
-$interbreadcrumb[]= array ("url"=>"courseLog.php", "name"=> "Statistics");
+$interbreadcrumb[] = array("url"=>"courseLog.php", "name"=> "Statistics");
 
 $htmlHeadXtra[] = "<style type='text/css'>
 /*<![CDATA[*/
@@ -40,7 +40,7 @@ 
 td {border-bottom: thin dashed gray;}
 /*]]>*/
 </style>";
-Display::display_header($nameTools,"Tracking");
+Display::display_header($nameTools, "Tracking");
 ?>
 
 <h3>
@@ -59,16 +59,16 @@ 
 // Defining the months of the year to allow translation of the months
 $MonthsShort = api_get_months_short();
 
-$tool=$_REQUEST['tool'];
-$period=$_REQUEST['period'];
-$reqdate=$_REQUEST['reqdate'];
+$tool = $_REQUEST['tool'];
+$period = $_REQUEST['period'];
+$reqdate = $_REQUEST['reqdate'];
 ?>
 <table width="100%" cellpadding="2" cellspacing="0" border="0">
 <?php
     $TABLETRACK_ACCESS = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ACCESS);
     $courseId = api_get_course_int_id();
     //stats for the current course
-    if(isset($_cid)) {
+    if (isset($_cid)) {
         // to see stats of one course user must be courseAdmin of this course
         $is_allowedToTrack = $is_courseAdmin;
         $courseCodeEqualcidIfNeeded = "AND c_id = '$courseId'";
@@ -78,7 +78,7 @@ 
         $is_allowedToTrack = $is_platformAdmin;
         $courseCodeEqualcidIfNeeded = "";
     }
-    if( $is_allowedToTrack) {
+    if ($is_allowedToTrack) {
         // list of all tools
         if (!isset($tool)) {
             $sql = "SELECT access_tool, count( access_tool )
@@ -90,7 +90,7 @@ 
             echo "<tr>
                     <td>
                     ";
-            if(isset($_cid)) echo "<b>$_cid : </b>";
+            if (isset($_cid)) echo "<b>$_cid : </b>";
             echo "		<b>".get_lang('ToolList')."</b>
 					</td>
                 </tr>
@@ -108,7 +108,7 @@ 
                 </tr>";
             if (is_array($results))
             {
-                for($j = 0 ; $j < count($results) ; $j++)
+                for ($j = 0; $j < count($results); $j++)
                 {
                         echo "<tr>";
                         echo "<td><a href='toolaccess_details.php?tool=".urlencode($results[$j][0])."'>".get_lang($results[$j][0])."</a></td>";
@@ -131,12 +131,12 @@ 
             $encodedTool = urlencode($tool);
             $tool = urldecode($tool);
 
-            if( !isset($reqdate) )
+            if (!isset($reqdate))
                 $reqdate = time();
             echo "<tr>
                     <td>
 					";
-            if(isset($_cid)) echo "<b>$_cid : </b>";
+            if (isset($_cid)) echo "<b>$_cid : </b>";
             echo "        <b>".get_lang($tool)."</b>
 					</td>
                 </tr>
@@ -145,22 +145,22 @@ 
             /* ------ display ------ */
             // displayed period
             echo "<tr><td>";
-            switch($period)
+            switch ($period)
             {
                 case "month" :
-                    echo $MonthsLong[date("n", $reqdate)-1].date(" Y", $reqdate);
+                    echo $MonthsLong[date("n", $reqdate) - 1].date(" Y", $reqdate);
                     break;
                 case "week" :
-                    $weeklowreqdate = ($reqdate-(86400*date("w" , $reqdate)));
-                    $weekhighreqdate = ($reqdate+(86400*(6-date("w" , $reqdate)) ));
-                    echo "<b>".$langFrom."</b> ".date("d " , $weeklowreqdate).$MonthsLong[date("n", $weeklowreqdate)-1].date(" Y" , $weeklowreqdate);
-                    echo " <b>".$langTo."</b> ".date("d " , $weekhighreqdate ).$MonthsLong[date("n", $weekhighreqdate)-1].date(" Y" , $weekhighreqdate);
+                    $weeklowreqdate = ($reqdate - (86400 * date("w", $reqdate)));
+                    $weekhighreqdate = ($reqdate + (86400 * (6 - date("w", $reqdate))));
+                    echo "<b>".$langFrom."</b> ".date("d ", $weeklowreqdate).$MonthsLong[date("n", $weeklowreqdate) - 1].date(" Y", $weeklowreqdate);
+                    echo " <b>".$langTo."</b> ".date("d ", $weekhighreqdate).$MonthsLong[date("n", $weekhighreqdate) - 1].date(" Y", $weekhighreqdate);
                     break;
                 // default == day
                 default :
                     $period = "day";
                 case "day" :
-                    echo $DaysLong[date("w" , $reqdate)].date(" d " , $reqdate).$MonthsLong[date("n", $reqdate)-1].date(" Y" , $reqdate);
+                    echo $DaysLong[date("w", $reqdate)].date(" d ", $reqdate).$MonthsLong[date("n", $reqdate) - 1].date(" Y", $reqdate);
                     break;
             }
             echo "</tr></td>";
@@ -174,13 +174,13 @@ 
                     &nbsp;&nbsp;&nbsp;||&nbsp;&nbsp;&nbsp;
 
                     ";
-            switch($period)
+            switch ($period)
             {
                 case "month" :
                     // previous and next date must be evaluated
                     // 30 days should be a good approximation
-                    $previousReqDate = mktime(1,1,1,date("m",$reqdate)-1,1,date("Y",$reqdate));
-                    $nextReqDate = mktime(1,1,1,date("m",$reqdate)+1,1,date("Y",$reqdate));
+                    $previousReqDate = mktime(1, 1, 1, date("m", $reqdate) - 1, 1, date("Y", $reqdate));
+                    $nextReqDate = mktime(1, 1, 1, date("m", $reqdate) + 1, 1, date("Y", $reqdate));
                     echo   "
                         [<a href='".api_get_self()."?tool=$encodedTool&period=month&reqdate=$previousReqDate' class='specialLink'>$langPreviousMonth</a>]
                         [<a href='".api_get_self()."?tool=$encodedTool&period=month&reqdate=$nextReqDate' class='specialLink'>$langNextMonth</a>]
@@ -188,8 +188,8 @@ 
                     break;
                 case "week" :
                     // previous and next date must be evaluated
-                    $previousReqDate = $reqdate - 7*86400;
-                    $nextReqDate = $reqdate + 7*86400;
+                    $previousReqDate = $reqdate - 7 * 86400;
+                    $nextReqDate = $reqdate + 7 * 86400;
                     echo   "
                         [<a href='".api_get_self()."?tool=$encodedTool&period=week&reqdate=$previousReqDate' class='specialLink'>$langPreviousWeek</a>]
                         [<a href='".api_get_self()."?tool=$encodedTool&period=week&reqdate=$nextReqDate' class='specialLink'>$langNextWeek</a>]
@@ -213,7 +213,7 @@ 
                 </tr>
             ";
             // display information about this period
-            switch($period)
+            switch ($period)
             {
                 // all days
                 case "month" :
@@ -226,7 +226,7 @@ 
                                 ORDER BY access_date ASC";
 
                     $days_array = StatsUtils::daysTab($sql);
-                    StatsUtils::makeHitsTable($days_array,$langDay);
+                    StatsUtils::makeHitsTable($days_array, $langDay);
                     break;
                 // all days
                 case "week" :
@@ -239,7 +239,7 @@ 
                                 ORDER BY access_date ASC";
 
                     $days_array = StatsUtils::daysTab($sql);
-                    StatsUtils::makeHitsTable($days_array,$langDay);
+                    StatsUtils::makeHitsTable($days_array, $langDay);
                     break;
                 // all hours
                 case "day"  :
@@ -251,8 +251,8 @@ 
                                     AND YEAR(access_date) = YEAR(FROM_UNIXTIME('$reqdate'))
                                 ORDER BY access_date ASC";
 
-                    $hours_array = StatsUtils::hoursTab($sql,$reqdate);
-                    StatsUtils::makeHitsTable($hours_array,$langHour);
+                    $hours_array = StatsUtils::hoursTab($sql, $reqdate);
+                    StatsUtils::makeHitsTable($hours_array, $langHour);
                     break;
             }
         }

Braces +11 added lines, -8 removed lines

@@ -90,7 +90,9 @@ 
             echo "<tr>
                     <td>
                     ";
-            if(isset($_cid)) echo "<b>$_cid : </b>";
+            if(isset($_cid)) {
+                echo "<b>$_cid : </b>";
+            }
             echo "		<b>".get_lang('ToolList')."</b>
 					</td>
                 </tr>
@@ -116,27 +118,28 @@ 
                         echo"</tr>";
                 }
 
-            }
-            else
+            } else
             {
                 echo "<tr>";
                 echo "<td colspan='2'><center>".get_lang('NoResult')."</center></td>";
                 echo"</tr>";
             }
             echo "</table></td></tr>";
-        }
-        else
+        } else
         {
             // this can prevent bug if there is special chars in $tool
             $encodedTool = urlencode($tool);
             $tool = urldecode($tool);
 
-            if( !isset($reqdate) )
-                $reqdate = time();
+            if( !isset($reqdate) ) {
+                            $reqdate = time();
+            }
             echo "<tr>
                     <td>
 					";
-            if(isset($_cid)) echo "<b>$_cid : </b>";
+            if(isset($_cid)) {
+                echo "<b>$_cid : </b>";
+            }
             echo "        <b>".get_lang($tool)."</b>
 					</td>
                 </tr>

main/tracking/logins_details.php

Spacing +25 added lines, -25 removed lines

@@ -75,13 +75,13 @@ 
     // check if uid is tutor of this group
     $courseId = api_get_course_int_id();
 
-    if (( $is_allowedToTrack || $is_allowedToTrackEverybodyInCourse)) {
+    if (($is_allowedToTrack || $is_allowedToTrackEverybodyInCourse)) {
         if ($is_allowedToTrackEverybodyInCourse) {
             $sql = "SELECT u.firstname,u.lastname, u.email
                     FROM $TABLECOURSUSER cu , $TABLEUSER u
                     WHERE
                         cu.user_id = u.user_id AND
-                        cu.relation_type<>" . COURSE_RELATION_TYPE_RRHH . " AND
+                        cu.relation_type<>".COURSE_RELATION_TYPE_RRHH." AND
                         cu.c_id = '$courseId' AND
                         u.user_id = '$uInfo'";
         } else {
@@ -97,21 +97,21 @@ 
             $res[2] == "" ? $res2 = get_lang('NoEmail') : $res2 = Display::encrypted_mailto_link($res[2]);
 
             echo "<tr><td>";
-            echo $informationsAbout . " : <br>";
+            echo $informationsAbout." : <br>";
             echo "<ul>\n"
-            . "<li>" . get_lang('FirstName') . " : " . $res[0] . "</li>\n"
-            . "<li>" . get_lang('LastName') . " : " . $res[1] . "</li>\n"
-            . "<li>" . get_lang('Email') . " : " . $res2 . "</li>\n"
+            . "<li>".get_lang('FirstName')." : ".$res[0]."</li>\n"
+            . "<li>".get_lang('LastName')." : ".$res[1]."</li>\n"
+            . "<li>".get_lang('Email')." : ".$res2."</li>\n"
             . "</ul>";
             echo "</td></tr>";
             /*             * ***** MENU ******* */
             echo "<tr>
                 <td>
-                [<a href='userLog.php?uInfo=$uInfo&view=$view'>" . get_lang('Back') . "</a>]
+                [<a href='userLog.php?uInfo=$uInfo&view=$view'>".get_lang('Back')."</a>]
         ";
             echo "  &nbsp;&nbsp;&nbsp;||&nbsp;&nbsp;&nbsp;
-                [<a href='" . api_get_self() . "?uInfo=$uInfo&view=$view&period=week&reqdate=$reqdate' class='specialLink'>" . get_lang('PeriodWeek') . "</a>]
-                [<a href='" . api_get_self() . "?uInfo=$uInfo&view=$view&period=month&reqdate=$reqdate' class='specialLink'>" . get_lang('PeriodMonth') . "</a>]
+                [<a href='" . api_get_self()."?uInfo=$uInfo&view=$view&period=week&reqdate=$reqdate' class='specialLink'>".get_lang('PeriodWeek')."</a>]
+                [<a href='" . api_get_self()."?uInfo=$uInfo&view=$view&period=month&reqdate=$reqdate' class='specialLink'>".get_lang('PeriodMonth')."</a>]
                 &nbsp;&nbsp;&nbsp;||&nbsp;&nbsp;&nbsp;
         ";
             switch ($period) {
@@ -120,8 +120,8 @@ 
                     $previousReqDate = $reqdate - 7 * 86400;
                     $nextReqDate = $reqdate + 7 * 86400;
                     echo "
-                    [<a href='" . api_get_self() . "?uInfo=$uInfo&view=$view&period=week&reqdate=$previousReqDate' class='specialLink'>" . get_lang('PreviousWeek') . "</a>]
-                    [<a href='" . api_get_self() . "?uInfo=$uInfo&view=$view&period=week&reqdate=$nextReqDate' class='specialLink'>" . get_lang('NextWeek') . "</a>]
+                    [<a href='" . api_get_self()."?uInfo=$uInfo&view=$view&period=week&reqdate=$previousReqDate' class='specialLink'>".get_lang('PreviousWeek')."</a>]
+                    [<a href='" . api_get_self()."?uInfo=$uInfo&view=$view&period=week&reqdate=$nextReqDate' class='specialLink'>".get_lang('NextWeek')."</a>]
                 ";
                     break;
                 default :
@@ -132,8 +132,8 @@ 
                     $previousReqDate = mktime(1, 1, 1, date("m", $reqdate) - 1, 1, date("Y", $reqdate));
                     $nextReqDate = mktime(1, 1, 1, date("m", $reqdate) + 1, 1, date("Y", $reqdate));
                     echo "
-                    [<a href='" . api_get_self() . "?uInfo=$uInfo&view=$view&period=month&reqdate=$previousReqDate' class='specialLink'>" . get_lang('PreviousMonth') . "</a>]
-                    [<a href='" . api_get_self() . "?uInfo=$uInfo&view=$view&period=month&reqdate=$nextReqDate' class='specialLink'>" . get_lang('NextMonth') . "</a>]
+                    [<a href='" . api_get_self()."?uInfo=$uInfo&view=$view&period=month&reqdate=$previousReqDate' class='specialLink'>".get_lang('PreviousMonth')."</a>]
+                    [<a href='" . api_get_self()."?uInfo=$uInfo&view=$view&period=month&reqdate=$nextReqDate' class='specialLink'>".get_lang('NextMonth')."</a>]
                 ";
                     break;
             }
@@ -153,7 +153,7 @@ 
                         AND YEAR(access_date) = YEAR(FROM_UNIXTIME('$reqdate'))
                         GROUP BY DAYOFMONTH(access_date)
                         ORDER BY access_date ASC";
-                $displayedDate = $MonthsLong[date("n", $reqdate) - 1] . date(" Y", $reqdate);
+                $displayedDate = $MonthsLong[date("n", $reqdate) - 1].date(" Y", $reqdate);
                 break;
             case "week" :
                 $sql = "SELECT access_date
@@ -165,24 +165,24 @@ 
                         GROUP BY DAYOFMONTH(access_date)
                         ORDER BY access_date ASC";
                 $weeklowreqdate = ($reqdate - (86400 * date("w", $reqdate)));
-                $weekhighreqdate = ($reqdate + (86400 * (6 - date("w", $reqdate)) ));
-                $displayedDate = get_lang('From') . " " . date("d ", $weeklowreqdate) . $MonthsLong[date("n", $weeklowreqdate) - 1] . date(" Y", $weeklowreqdate)
-                        . " " . get_lang('To') . " " . date("d ", $weekhighreqdate) . $MonthsLong[date("n", $weekhighreqdate) - 1] . date(" Y", $weekhighreqdate);
+                $weekhighreqdate = ($reqdate + (86400 * (6 - date("w", $reqdate))));
+                $displayedDate = get_lang('From')." ".date("d ", $weeklowreqdate).$MonthsLong[date("n", $weeklowreqdate) - 1].date(" Y", $weeklowreqdate)
+                        . " ".get_lang('To')." ".date("d ", $weekhighreqdate).$MonthsLong[date("n", $weekhighreqdate) - 1].date(" Y", $weekhighreqdate);
                 break;
         }
         echo "<tr><td>";
         $results = StatsUtils::getManyResults1Col($sql);
         /*             * * display of the displayed period  ** */
         echo "<table width='100%' cellpadding='2' cellspacing='1' border='0' align=center>";
-        echo "<td bgcolor='#E6E6E6'>" . $displayedDate . "</td>";
+        echo "<td bgcolor='#E6E6E6'>".$displayedDate."</td>";
         if (is_array($results)) {
             for ($j = 0; $j < sizeof($results); $j++) {
                 $beautifulDateTime = api_convert_and_format_date($results[$j], null, date_default_timezone_get());
                 echo "<tr>";
-                echo "<td style='padding-left : 40px;' valign='top'>" . $beautifulDateTime . "</td>";
+                echo "<td style='padding-left : 40px;' valign='top'>".$beautifulDateTime."</td>";
                 echo"</tr>";
                 // $limit is used to select only results between $results[$j] (current login) and next one
-                if ($j == ( sizeof($results) - 1 ))
+                if ($j == (sizeof($results) - 1))
                     $limit = date("Y-m-d H:i:s", $nextReqDate);
                 else
                     $limit = $results[$j + 1];
@@ -192,8 +192,8 @@ 
                         FROM $TABLETRACK_ACCESS
                         WHERE access_user_id = $uInfo
                             AND access_tool IS NOT NULL
-                            AND access_date > '" . $results[$j] . "'
-                            AND access_date < '" . $limit . "'
+                            AND access_date > '".$results[$j]."'
+                            AND access_date < '" . $limit."'
                             AND c_id = $courseId
                         GROUP BY access_tool
                         ORDER BY access_tool ASC";
@@ -204,8 +204,8 @@ 
                     echo "<table width='50%' cellpadding='0' cellspacing='0' border='0'>\n";
                     for ($k = 0; $k < count($results2); $k++) {
                         echo "<tr>\n";
-                        echo "<td width='70%' style='padding-left : 60px;'>" . get_lang($results2[$k][0]) . "</td>\n";
-                        echo "<td width='30%' align='right' style='padding-right : 40px'>" . $results2[$k][1] . " " . get_lang('Visits') . "</td>\n";
+                        echo "<td width='70%' style='padding-left : 60px;'>".get_lang($results2[$k][0])."</td>\n";
+                        echo "<td width='30%' align='right' style='padding-right : 40px'>".$results2[$k][1]." ".get_lang('Visits')."</td>\n";
                         echo "</tr>";
                     }
                     echo "</table>\n";
@@ -215,7 +215,7 @@ 
             }
         } else {
             echo "<tr>";
-            echo "<td colspan='2' bgcolor='#eeeeee'>" . get_lang('NoResult') . "</td>";
+            echo "<td colspan='2' bgcolor='#eeeeee'>".get_lang('NoResult')."</td>";
             echo "</tr>";
         }
         echo "</table>";

Braces +5 added lines, -4 removed lines

@@ -182,10 +182,11 @@
                 echo "<td style='padding-left : 40px;' valign='top'>" . $beautifulDateTime . "</td>";
                 echo"</tr>";
                 // $limit is used to select only results between $results[$j] (current login) and next one
-                if ($j == ( sizeof($results) - 1 ))
-                    $limit = date("Y-m-d H:i:s", $nextReqDate);
-                else
-                    $limit = $results[$j + 1];
+                if ($j == ( sizeof($results) - 1 )) {
+                                    $limit = date("Y-m-d H:i:s", $nextReqDate);
+                } else {
+                                    $limit = $results[$j + 1];
+                }
                 // select all access to tool between displayed date and next displayed date or now() if
                 // displayed date is the last login date
                 $sql = "SELECT access_tool, count(access_tool)

Indentation -1 removed lines

@@ -16,7 +16,6 @@
  * @author Patrick Cool
  * @author René Haentjens, added CSV file import (October 2004)
  * @package chamilo.link
-
  */
 
 // Including libraries