chamilo / chamilo-lms

main/dropbox/recover_dropbox_files.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 $result = Database::query($sql);
 
 if (Database::num_rows($result)) {
-    $files  = Database::store_result($result);
+    $files = Database::store_result($result);
     $rows = array();
     foreach ($files as $file) {
         //Check if I have this file:

main/inc/lib/geometry.lib.php

Braces +49 added lines, -28 removed lines

@@ -65,8 +65,10 @@ 
     $bords = array_fill(0, $bord_lenght, array()); // building this array
 
     /* adding the first point of the polygone */
-    if (is_array($bords[$poly[0]['y']])) //avoid warning
+    if (is_array($bords[$poly[0]['y']])) {
+        //avoid warning
     	array_push($bords[$poly[0]['y']], $poly[0]['x']);
+    }
 
     $i = 1; // we re-use $i and $old_pente bellow the loop
     $old_pente=0;
@@ -75,11 +77,14 @@ 
 
         /* special cases */
         if ($poly[$i-1]['y'] == $poly[$i]['y']) {
-            if ($poly[$i-1]['x'] == $poly[$i]['x'])
-                continue; // twice the same point
+            if ($poly[$i-1]['x'] == $poly[$i]['x']) {
+                            continue;
+            }
+            // twice the same point
             else {    //  infinite elevation of the edge
-            	if (is_array($bords[$poly[$i]['y']]))
-                	array_push($bords[$poly[$i]['y']],$poly[$i]['x']);
+            	if (is_array($bords[$poly[$i]['y']])) {
+            	                	array_push($bords[$poly[$i]['y']],$poly[$i]['x']);
+            	}
                 $old_pente=0;
                 continue;
             }
@@ -87,9 +92,13 @@ 
 
 		//echo 'point:'.$poly[$i]['y']; bug here
         // adding the point as a part of an edge
-        if (is_array($bords[$poly[$i]['y']])) //avoid warning
+        if (is_array($bords[$poly[$i]['y']])) {
+            //avoid warning
         array_push($bords[$poly[$i]['y']], $poly[$i]['x']);
-        if (DEBUG) echo '('.$poly[$i]['x'].';'.$poly[$i]['y'].')   ';
+        }
+        if (DEBUG) {
+            echo '('.$poly[$i]['x'].';'.$poly[$i]['y'].')   ';
+        }
 
         /* computing the elevation of the edge going */
         //        from $poly[$i-1] to $poly[$i]
@@ -99,15 +108,17 @@ 
         // if the sign of the elevation change from the one of the
         // previous edge, the point must be added a second time inside
         // $bords
-        if ($i>1)
-            if (($old_pente<0 && $pente>0)
+        if ($i>1) {
+                    if (($old_pente<0 && $pente>0)
                     || ($old_pente>0 && $pente<0)) {
 				if (is_array($bords[$poly[$i]['y']])) //avoid warning
                 	array_push($bords[$poly[$i]['y']],$poly[$i]['x']);
+        }
 
-                if (DEBUG)
-                    echo '*('.$poly[$i]['x'].
+                if (DEBUG) {
+                                    echo '*('.$poly[$i]['x'].
                         ';'.$poly[$i]['y'].')   ';
+                }
         	}
 
         /* detect the direction of the elevation in Y */
@@ -136,10 +147,11 @@ 
 
         // elevation between $poly[0]['x'] and $poly[1]['x'])
         $rest = $poly[0]['y']-$poly[1]['y'];
-        if ($rest!=0)
-        	$pente1 = ($poly[0]['x']-$poly[1]['x'])/($rest);
-        else
-			$pente1 = 0;
+        if ($rest!=0) {
+                	$pente1 = ($poly[0]['x']-$poly[1]['x'])/($rest);
+        } else {
+        			$pente1 = 0;
+        }
 
         // elevation between $poly[$i-1]['x'] and $poly[0]['x'])
         $pente = ($poly[$i-1]['x']-$poly[0]['x'])/
@@ -151,14 +163,17 @@ 
 
         // doubling the first point if needed (see above)
         if (($pente1<0 && $pente>0) || ($pente1>0 && $pente<0)) {
-        	if (is_array($bords[$poly[$i - 1]['y']]))
-            	array_push($bords[$poly[$i - 1]['y']],  round($poly[$i - 1]['x']));
+        	if (is_array($bords[$poly[$i - 1]['y']])) {
+        	            	array_push($bords[$poly[$i - 1]['y']],  round($poly[$i - 1]['x']));
+        	}
             //if (DEBUG) echo '('.$poly[$i-1]['x'].';'.$poly[$i-1]['y'].')   ';
         }
         //  doubling the last point if neededd
         if (($old_pente<0 && $pente>0) || ($old_pente>0 && $pente<0)) {
-        	if (is_array($bords[$poly[$i-1]['y']])) //avoid warning
+        	if (is_array($bords[$poly[$i-1]['y']])) {
+        	    //avoid warning
             	array_push($bords[$poly[$i-1]['y']], round($poly[$i-1]['x']));
+        	}
             //if (DEBUG) echo '*('.$poly[$i-1]['x'].';'.$poly[$i-1]['y'].')   ';
         }
 
@@ -227,11 +242,13 @@ 
         $s = "<div style='font-size: 8px; line-height:3px'><pre>\n";
     }
     for ($i=0; $i<$max['y']; $i++) {
-        for($j=0; $j<$max['x']; $j++)
-            if($poly[$j][$i] == TRUE)
+        for($j=0; $j<$max['x']; $j++) {
+                    if($poly[$j][$i] == TRUE)
                 $s .= ($format=='html'?"<b>1</b>":'1');
-            else
-                $s .= "0";
+        }
+            else {
+                            $s .= "0";
+            }
         $s .= ($format=='html'?"<br />\n":"\n");
     }
     $s .= ($format=='html'?"</pre></div>\n":"\n");
@@ -252,15 +269,19 @@ 
     $surfaceOf1 = 0;
     $surfaceOf2 = 0;
 
-    for ($i=0; $i<$max['x']; $i++)
-        for($j=0; $j<$max['y']; $j++) {
+    for ($i=0; $i<$max['x']; $i++) {
+            for($j=0;
+    }
+    $j<$max['y']; $j++) {
             if (isset($poly1[$i][$j]) && ($poly1[$i][$j] == TRUE)) {
                 $surfaceOf1++;
-                if (isset($poly2[$i][$j]) && ($poly2[$i][$j] == FALSE))
-                    $onlyIn1++;
+                if (isset($poly2[$i][$j]) && ($poly2[$i][$j] == FALSE)) {
+                                    $onlyIn1++;
+                }
+            }
+            if (isset($poly2[$i][$j]) && ($poly2[$i][$j] == TRUE)) {
+                            $surfaceOf2++;
             }
-            if (isset($poly2[$i][$j]) && ($poly2[$i][$j] == TRUE))
-                $surfaceOf2++;
         }
 
     return array (

Indentation +22 added lines, -22 removed lines

@@ -56,9 +56,9 @@ 
      *        for all j in [O..max[y][ : for all i in bords[$j] :
      *            (i,j) is a point inside an edge of the polygone
      */
-	$bord_lenght = $max['x'];
+    $bord_lenght = $max['x'];
     if ($max['y'] > $bord_lenght) {
-     	$bord_lenght = $max['y'];
+            $bord_lenght = $max['y'];
     }
 
     //$bords = array_fill(0, $bord_lenght-1, array()); // building this array
@@ -66,7 +66,7 @@ 
 
     /* adding the first point of the polygone */
     if (is_array($bords[$poly[0]['y']])) //avoid warning
-    	array_push($bords[$poly[0]['y']], $poly[0]['x']);
+        array_push($bords[$poly[0]['y']], $poly[0]['x']);
 
     $i = 1; // we re-use $i and $old_pente bellow the loop
     $old_pente=0;
@@ -78,14 +78,14 @@ 
             if ($poly[$i-1]['x'] == $poly[$i]['x'])
                 continue; // twice the same point
             else {    //  infinite elevation of the edge
-            	if (is_array($bords[$poly[$i]['y']]))
-                	array_push($bords[$poly[$i]['y']],$poly[$i]['x']);
+                if (is_array($bords[$poly[$i]['y']]))
+                    array_push($bords[$poly[$i]['y']],$poly[$i]['x']);
                 $old_pente=0;
                 continue;
             }
         }
 
-		//echo 'point:'.$poly[$i]['y']; bug here
+        //echo 'point:'.$poly[$i]['y']; bug here
         // adding the point as a part of an edge
         if (is_array($bords[$poly[$i]['y']])) //avoid warning
         array_push($bords[$poly[$i]['y']], $poly[$i]['x']);
@@ -102,13 +102,13 @@ 
         if ($i>1)
             if (($old_pente<0 && $pente>0)
                     || ($old_pente>0 && $pente<0)) {
-				if (is_array($bords[$poly[$i]['y']])) //avoid warning
-                	array_push($bords[$poly[$i]['y']],$poly[$i]['x']);
+                if (is_array($bords[$poly[$i]['y']])) //avoid warning
+                    array_push($bords[$poly[$i]['y']],$poly[$i]['x']);
 
                 if (DEBUG)
                     echo '*('.$poly[$i]['x'].
                         ';'.$poly[$i]['y'].')   ';
-        	}
+            }
 
         /* detect the direction of the elevation in Y */
         $dy_inc = ($poly[$i]['y']-$poly[$i-1]['y']) > 0 ? 1 : -1;
@@ -137,9 +137,9 @@ 
         // elevation between $poly[0]['x'] and $poly[1]['x'])
         $rest = $poly[0]['y']-$poly[1]['y'];
         if ($rest!=0)
-        	$pente1 = ($poly[0]['x']-$poly[1]['x'])/($rest);
+            $pente1 = ($poly[0]['x']-$poly[1]['x'])/($rest);
         else
-			$pente1 = 0;
+            $pente1 = 0;
 
         // elevation between $poly[$i-1]['x'] and $poly[0]['x'])
         $pente = ($poly[$i-1]['x']-$poly[0]['x'])/
@@ -151,14 +151,14 @@ 
 
         // doubling the first point if needed (see above)
         if (($pente1<0 && $pente>0) || ($pente1>0 && $pente<0)) {
-        	if (is_array($bords[$poly[$i - 1]['y']]))
-            	array_push($bords[$poly[$i - 1]['y']],  round($poly[$i - 1]['x']));
+            if (is_array($bords[$poly[$i - 1]['y']]))
+                array_push($bords[$poly[$i - 1]['y']],  round($poly[$i - 1]['x']));
             //if (DEBUG) echo '('.$poly[$i-1]['x'].';'.$poly[$i-1]['y'].')   ';
         }
         //  doubling the last point if neededd
         if (($old_pente<0 && $pente>0) || ($old_pente>0 && $pente<0)) {
-        	if (is_array($bords[$poly[$i-1]['y']])) //avoid warning
-            	array_push($bords[$poly[$i-1]['y']], round($poly[$i-1]['x']));
+            if (is_array($bords[$poly[$i-1]['y']])) //avoid warning
+                array_push($bords[$poly[$i-1]['y']], round($poly[$i-1]['x']));
             //if (DEBUG) echo '*('.$poly[$i-1]['x'].';'.$poly[$i-1]['y'].')   ';
         }
 
@@ -185,7 +185,7 @@ 
     for ($i = 0; $i<$n; $i++) {  // Y
         //error_log(__FILE__.' - Border Num '.$i,0);
         if (is_array($bords[$i])) {
-       		sort($bords[$i]);
+                sort($bords[$i]);
         }
 
         for ($j = 0; $j<sizeof($bords[$i]);$j+=2) { // bords
@@ -196,7 +196,7 @@ 
             for ($k = round($bords[$i][$j]); $k<=$bords[$i][$j+1];$k++) {
                 $res[$k][$i] = true; //filling the array with trues
                 if ($test == 1)  {
-                	/*how to draw the polygon in a human way:
+                    /*how to draw the polygon in a human way:
                 	In ubuntu : sudo apt-get install gnuplot
                 	Create an empty file with all points with the result of this echos (No commas, no point, no headers)
                 	In gnuplot:
@@ -204,7 +204,7 @@ 
                 	For 2 polygons:  plot "/home/jmontoya/test", "/home/jmontoya/test2"
                 	A new window will appear with the plot
                 	*/
-                	echo $k.'  '.$i; echo '<br />';
+                    echo $k.'  '.$i; echo '<br />';
                 }
             }
         }
@@ -308,7 +308,7 @@ 
         list($x,$y) = explode(';',$pcoord);
         $points[] = array('x'=>$x,'y'=>$y);
     }
-	return $points;
+    return $points;
 }
 
 /**
@@ -321,11 +321,11 @@ 
     $mx = 0;
     $my = 0;
     foreach ($coords1 as $coord) {
-    	if ($coord['x'] > $mx) {
+        if ($coord['x'] > $mx) {
             $mx = $coord['x'];
-    	}
+        }
         if ($coord['y'] > $my) {
-        	$my = $coord['y'];
+            $my = $coord['y'];
         }
     }
     foreach ($coords2 as $coord) {

Spacing +55 added lines, -55 removed lines

@@ -13,8 +13,8 @@ 
  * @returns an array such as: for all i in [0..max[x][ : for all j in [0..max[y][ : array[i][j] = FALSE
  */
 function poly_init($max) {
-    return array_fill(0, $max["x"]-1,
-            array_fill(0, $max["y"]-1, FALSE));
+    return array_fill(0, $max["x"] - 1,
+            array_fill(0, $max["y"] - 1, FALSE));
 }
 
 
@@ -69,18 +69,18 @@ 
     	array_push($bords[$poly[0]['y']], $poly[0]['x']);
 
     $i = 1; // we re-use $i and $old_pente bellow the loop
-    $old_pente=0;
-    for (    ;    // for each points of the polygon but the first
-        $i<sizeof($poly) && (!empty($poly[$i]['x']) && !empty($poly[$i]['y'])); $i++) {
+    $old_pente = 0;
+    for (;    // for each points of the polygon but the first
+        $i < sizeof($poly) && (!empty($poly[$i]['x']) && !empty($poly[$i]['y'])); $i++) {
 
         /* special cases */
-        if ($poly[$i-1]['y'] == $poly[$i]['y']) {
-            if ($poly[$i-1]['x'] == $poly[$i]['x'])
+        if ($poly[$i - 1]['y'] == $poly[$i]['y']) {
+            if ($poly[$i - 1]['x'] == $poly[$i]['x'])
                 continue; // twice the same point
             else {    //  infinite elevation of the edge
             	if (is_array($bords[$poly[$i]['y']]))
-                	array_push($bords[$poly[$i]['y']],$poly[$i]['x']);
-                $old_pente=0;
+                	array_push($bords[$poly[$i]['y']], $poly[$i]['x']);
+                $old_pente = 0;
                 continue;
             }
         }
@@ -93,17 +93,17 @@ 
 
         /* computing the elevation of the edge going */
         //        from $poly[$i-1] to $poly[$i]
-        $pente = ($poly[$i-1]['x']-$poly[$i]['x'])/
-                 ($poly[$i-1]['y']-$poly[$i]['y']);
+        $pente = ($poly[$i - 1]['x'] - $poly[$i]['x']) /
+                 ($poly[$i - 1]['y'] - $poly[$i]['y']);
 
         // if the sign of the elevation change from the one of the
         // previous edge, the point must be added a second time inside
         // $bords
-        if ($i>1)
-            if (($old_pente<0 && $pente>0)
-                    || ($old_pente>0 && $pente<0)) {
+        if ($i > 1)
+            if (($old_pente < 0 && $pente > 0)
+                    || ($old_pente > 0 && $pente < 0)) {
 				if (is_array($bords[$poly[$i]['y']])) //avoid warning
-                	array_push($bords[$poly[$i]['y']],$poly[$i]['x']);
+                	array_push($bords[$poly[$i]['y']], $poly[$i]['x']);
 
                 if (DEBUG)
                     echo '*('.$poly[$i]['x'].
@@ -111,8 +111,8 @@ 
         	}
 
         /* detect the direction of the elevation in Y */
-        $dy_inc = ($poly[$i]['y']-$poly[$i-1]['y']) > 0 ? 1 : -1;
-        $x = $poly[$i-1]['x'];
+        $dy_inc = ($poly[$i]['y'] - $poly[$i - 1]['y']) > 0 ? 1 : -1;
+        $x = $poly[$i - 1]['x'];
 //        if (DEBUG) echo "init: ".$poly[$i-1]['y']."  dy_inc: ".$dy_inc.
 //            "   end: ".$poly[$i]['y']."   pente:".$pente;
 
@@ -121,10 +121,10 @@ 
 
         // we iterate w/ $dy in ]$poly[$i-1]['y'],$poly[$i-1]['y'][
         //    w/ $dy_inc as increment
-        for ($dy = $poly[$i-1]['y']+$dy_inc;
+        for ($dy = $poly[$i - 1]['y'] + $dy_inc;
             $dy != $poly[$i]['y'];
             $dy += $dy_inc) {
-            $x += $pente*$dy_inc;
+            $x += $pente * $dy_inc;
             array_push($bords[$dy], $x);
 //            if (DEBUG) echo '/('.$x.';'.$dy.')   ';
         }
@@ -132,47 +132,47 @@ 
     }
 
     // closing the polygone (the edge between $poly[$i-1] and $poly[0])
-    if ($poly[$i-1]['y']!=$poly[0]['y']) {// droite--> rien à faire
+    if ($poly[$i - 1]['y'] != $poly[0]['y']) {// droite--> rien à faire
 
         // elevation between $poly[0]['x'] and $poly[1]['x'])
-        $rest = $poly[0]['y']-$poly[1]['y'];
-        if ($rest!=0)
-        	$pente1 = ($poly[0]['x']-$poly[1]['x'])/($rest);
+        $rest = $poly[0]['y'] - $poly[1]['y'];
+        if ($rest != 0)
+        	$pente1 = ($poly[0]['x'] - $poly[1]['x']) / ($rest);
         else
 			$pente1 = 0;
 
         // elevation between $poly[$i-1]['x'] and $poly[0]['x'])
-        $pente = ($poly[$i-1]['x']-$poly[0]['x'])/
-            ($poly[$i-1]['y']-$poly[0]['y']);
+        $pente = ($poly[$i - 1]['x'] - $poly[0]['x']) /
+            ($poly[$i - 1]['y'] - $poly[0]['y']);
 
 //        if (DEBUG) echo 'start('.$poly[$i-1]['x'].','.$poly[$i-1]['y'].
 //                ')-end('.$poly[0]['x'].','.$poly[0]['y'].
 //                ')-pente'.$pente;
 
         // doubling the first point if needed (see above)
-        if (($pente1<0 && $pente>0) || ($pente1>0 && $pente<0)) {
+        if (($pente1 < 0 && $pente > 0) || ($pente1 > 0 && $pente < 0)) {
         	if (is_array($bords[$poly[$i - 1]['y']]))
-            	array_push($bords[$poly[$i - 1]['y']],  round($poly[$i - 1]['x']));
+            	array_push($bords[$poly[$i - 1]['y']], round($poly[$i - 1]['x']));
             //if (DEBUG) echo '('.$poly[$i-1]['x'].';'.$poly[$i-1]['y'].')   ';
         }
         //  doubling the last point if neededd
-        if (($old_pente<0 && $pente>0) || ($old_pente>0 && $pente<0)) {
-        	if (is_array($bords[$poly[$i-1]['y']])) //avoid warning
-            	array_push($bords[$poly[$i-1]['y']], round($poly[$i-1]['x']));
+        if (($old_pente < 0 && $pente > 0) || ($old_pente > 0 && $pente < 0)) {
+        	if (is_array($bords[$poly[$i - 1]['y']])) //avoid warning
+            	array_push($bords[$poly[$i - 1]['y']], round($poly[$i - 1]['x']));
             //if (DEBUG) echo '*('.$poly[$i-1]['x'].';'.$poly[$i-1]['y'].')   ';
         }
 
 
-        $dy_inc = ($poly[0]['y']-$poly[$i-1]['y']) > 0 ? 1 : -1;
-        $x = $poly[$i-1]['x'];
+        $dy_inc = ($poly[0]['y'] - $poly[$i - 1]['y']) > 0 ? 1 : -1;
+        $x = $poly[$i - 1]['x'];
 //        if (DEBUG) echo "init: ".$poly[$i-1]['y']."  dy_inc: ".$dy_inc.
 //            "   end: ".$poly[0]['y'];
 
-        for ($dy = $poly[$i-1]['y']+$dy_inc;
+        for ($dy = $poly[$i - 1]['y'] + $dy_inc;
             $dy != $poly[0]['y'];
             $dy += $dy_inc)
         {
-            $x += $pente*$dy_inc;
+            $x += $pente * $dy_inc;
             array_push($bords[$dy], round($x));
 //            if (DEBUG) echo '/('.$x.';'.$dy.')   ';
         }
@@ -182,20 +182,20 @@ 
     /* basic idea: we sort a column of edges.
         For each pair of point, we color the points in between */
     $n = count($bords);
-    for ($i = 0; $i<$n; $i++) {  // Y
+    for ($i = 0; $i < $n; $i++) {  // Y
         //error_log(__FILE__.' - Border Num '.$i,0);
         if (is_array($bords[$i])) {
        		sort($bords[$i]);
         }
 
-        for ($j = 0; $j<sizeof($bords[$i]);$j+=2) { // bords
+        for ($j = 0; $j < sizeof($bords[$i]); $j += 2) { // bords
             if (!isset($bords[$i][$j + 1])) {
                 continue;
             }
 
-            for ($k = round($bords[$i][$j]); $k<=$bords[$i][$j+1];$k++) {
+            for ($k = round($bords[$i][$j]); $k <= $bords[$i][$j + 1]; $k++) {
                 $res[$k][$i] = true; //filling the array with trues
-                if ($test == 1)  {
+                if ($test == 1) {
                 	/*how to draw the polygon in a human way:
                 	In ubuntu : sudo apt-get install gnuplot
                 	Create an empty file with all points with the result of this echos (No commas, no point, no headers)
@@ -222,19 +222,19 @@ 
  *
  * @return string     html code of the representation of the polygone image
  */
-function poly_dump(&$poly, $max, $format='raw') {
+function poly_dump(&$poly, $max, $format = 'raw') {
     if ($format == 'html') {
         $s = "<div style='font-size: 8px; line-height:3px'><pre>\n";
     }
-    for ($i=0; $i<$max['y']; $i++) {
-        for($j=0; $j<$max['x']; $j++)
-            if($poly[$j][$i] == TRUE)
-                $s .= ($format=='html'?"<b>1</b>":'1');
+    for ($i = 0; $i < $max['y']; $i++) {
+        for ($j = 0; $j < $max['x']; $j++)
+            if ($poly[$j][$i] == TRUE)
+                $s .= ($format == 'html' ? "<b>1</b>" : '1');
             else
                 $s .= "0";
-        $s .= ($format=='html'?"<br />\n":"\n");
+        $s .= ($format == 'html' ? "<br />\n" : "\n");
     }
-    $s .= ($format=='html'?"</pre></div>\n":"\n");
+    $s .= ($format == 'html' ? "</pre></div>\n" : "\n");
     return $s;
 }
 
@@ -252,8 +252,8 @@ 
     $surfaceOf1 = 0;
     $surfaceOf2 = 0;
 
-    for ($i=0; $i<$max['x']; $i++)
-        for($j=0; $j<$max['y']; $j++) {
+    for ($i = 0; $i < $max['x']; $i++)
+        for ($j = 0; $j < $max['y']; $j++) {
             if (isset($poly1[$i][$j]) && ($poly1[$i][$j] == TRUE)) {
                 $surfaceOf1++;
                 if (isset($poly2[$i][$j]) && ($poly2[$i][$j] == FALSE))
@@ -263,7 +263,7 @@ 
                 $surfaceOf2++;
         }
 
-    return array (
+    return array(
         "s1" => $surfaceOf1,
         "s2" => $surfaceOf2,
         "both" => $surfaceOf1 - $onlyIn1,
@@ -282,8 +282,8 @@ 
  */
 function poly_touch(&$poly1, &$poly2, $max) {
 
-    for ($i=0; $i<$max['x']; $i++) {
-        for($j=0; $j<$max['y']; $j++) {
+    for ($i = 0; $i < $max['x']; $i++) {
+        for ($j = 0; $j < $max['y']; $j++) {
             if (isset($poly1[$i][$j]) && ($poly1[$i][$j] == true)
                 && isset($poly2[$i][$j]) && ($poly2[$i][$j] == true)) {
                     return true;
@@ -301,12 +301,12 @@ 
  * @return  array   An array of points in the right format to use with the
  *                  local functions
  */
-function convert_coordinates($coords,$sep='|') {
+function convert_coordinates($coords, $sep = '|') {
     $points = array();
-    $pairs = explode($sep,$coords);
+    $pairs = explode($sep, $coords);
     foreach ($pairs as $idx => $pcoord) {
-        list($x,$y) = explode(';',$pcoord);
-        $points[] = array('x'=>$x,'y'=>$y);
+        list($x, $y) = explode(';', $pcoord);
+        $points[] = array('x'=>$x, 'y'=>$y);
     }
 	return $points;
 }
@@ -336,7 +336,7 @@ 
             $my = $coord['y'];
         }
     }
-    return array('x'=>$mx,'y'=>$my);
+    return array('x'=>$mx, 'y'=>$my);
 }
 
 /**

main/admin/access_urls.php

Indentation +2 added lines, -2 removed lines

@@ -85,12 +85,12 @@
     }
 }
 if(!empty($url_string)) {
-	Display :: display_warning_message(get_lang('AdminShouldBeRegisterInSite').'<br />'.$url_string,false);
+    Display :: display_warning_message(get_lang('AdminShouldBeRegisterInSite').'<br />'.$url_string,false);
 }
 
 // checking the current installation
 if ($current_access_url_id==-1) {
-	Display::display_warning_message(get_lang('URLNotConfiguredPleaseChangedTo').': '.api_get_path(WEB_PATH));
+    Display::display_warning_message(get_lang('URLNotConfiguredPleaseChangedTo').': '.api_get_path(WEB_PATH));
 } elseif(api_is_platform_admin()) {
     $quant= UrlManager::relation_url_user_exist(api_get_user_id(),$current_access_url_id);
     if ($quant==0) {

Spacing +17 added lines, -17 removed lines

@@ -19,7 +19,7 @@ 
     exit;
 }
 
-$interbreadcrumb[] = array ("url" => 'index.php', 'name' => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array("url" => 'index.php', 'name' => get_lang('PlatformAdmin'));
 $tool_name = get_lang('MultipleAccessURLs');
 Display :: display_header($tool_name);
 
@@ -55,12 +55,12 @@ 
         case 'register':
             // we are going to register the admin
             if (api_is_platform_admin()) {
-                if ($current_access_url_id!=-1) {
+                if ($current_access_url_id != -1) {
                     $url_str = '';
                     foreach ($url_list as $my_url) {
                         if (!in_array($my_url['id'], $my_user_url_list)) {
                             UrlManager::add_user_to_url(api_get_user_id(), $my_url['id']);
-                            $url_str.=$my_url['url'].' <br />';
+                            $url_str .= $my_url['url'].' <br />';
                         }
                     }
                     Display:: display_normal_message(
@@ -84,16 +84,16 @@ 
         $url_string .= $my_url['url'].' <br />';
     }
 }
-if(!empty($url_string)) {
-	Display :: display_warning_message(get_lang('AdminShouldBeRegisterInSite').'<br />'.$url_string,false);
+if (!empty($url_string)) {
+	Display :: display_warning_message(get_lang('AdminShouldBeRegisterInSite').'<br />'.$url_string, false);
 }
 
 // checking the current installation
-if ($current_access_url_id==-1) {
+if ($current_access_url_id == -1) {
 	Display::display_warning_message(get_lang('URLNotConfiguredPleaseChangedTo').': '.api_get_path(WEB_PATH));
-} elseif(api_is_platform_admin()) {
-    $quant= UrlManager::relation_url_user_exist(api_get_user_id(),$current_access_url_id);
-    if ($quant==0) {
+} elseif (api_is_platform_admin()) {
+    $quant = UrlManager::relation_url_user_exist(api_get_user_id(), $current_access_url_id);
+    if ($quant == 0) {
         Display:: display_warning_message(
             '<a href="'.api_get_self().'?action=register&sec_token='.$parameters['sec_token'].'">'.get_lang('ClickToRegisterAdmin').'</a>',
             false
@@ -142,16 +142,16 @@ 
 
     //Status
     $active = $row['active'];
-    if ($active=='1') {
-        $action='lock';
-        $image='right';
+    if ($active == '1') {
+        $action = 'lock';
+        $image = 'right';
     }
-    if ($active=='0') {
-        $action='unlock';
-        $image='wrong';
+    if ($active == '0') {
+        $action = 'unlock';
+        $image = 'wrong';
     }
     // you cannot lock the default
-    if ($row['id']=='1') {
+    if ($row['id'] == '1') {
         $status = Display::return_icon($image.'.gif', get_lang(ucfirst($action)));
     } else {
         $status = '<a href="access_urls.php?action='.$action.'&amp;url_id='.$row['id'].'">'.
@@ -161,7 +161,7 @@ 
     $url_id = $row['id'];
     $actions = Display::url(Display::return_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_SMALL), "access_url_edit.php?url_id=$url_id");
     if ($url_id != '1') {
-        $actions .= '<a href="access_urls.php?action=delete_url&amp;url_id='.$url_id.'" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset))."'".')) return false;">'.
+        $actions .= '<a href="access_urls.php?action=delete_url&amp;url_id='.$url_id.'" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"), ENT_QUOTES, $charset))."'".')) return false;">'.
             Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL).'</a>';
     }
     $urls[] = array($url, $description, $status, $actions);

main/forum/editthread.php

Spacing +3 added lines, -3 removed lines

@@ -45,7 +45,7 @@ 
 }
 
 if (!empty($gradebook) && $gradebook == 'view') {
-    $interbreadcrumb[] = array (
+    $interbreadcrumb[] = array(
         'url' => '../gradebook/'.Security::remove_XSS($_SESSION['gradebook_dest']),
         'name' => get_lang('ToolGradebook')
     );
@@ -107,7 +107,7 @@ 
     $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'group/group.php?'.$cidreq, 'name' => get_lang('Groups'));
     $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'group/group_space.php?'.$cidreq, 'name' => get_lang('GroupSpace').' '.$groupProperties['name']);
     $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'forum/viewforum.php?'.$cidreq.'&forum='.intval($_GET['forum']), 'name' => $currentForum['forum_title']);
-    $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'forum/newthread.php?'.$cidreq.'&forum='.intval($_GET['forum']),'name' => get_lang('EditThread'));
+    $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'forum/newthread.php?'.$cidreq.'&forum='.intval($_GET['forum']), 'name' => get_lang('EditThread'));
 } else {
     $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'forum/index.php?'.$cidreq, 'name' => $nameTools);
     $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'forum/viewforumcategory.php?'.$cidreq.'&forumcategory='.$currentForumCategory['cat_id'], 'name' => $currentForumCategory['cat_title']);
@@ -156,7 +156,7 @@ 
 echo '<div class="actions">';
 echo '<span style="float:right;">'.search_link().'</span>';
 echo '<a href="viewforum.php?forum='.intval($_GET['forum']).'&'.$cidreq.'">'.
-    Display::return_icon('back.png',get_lang('BackToForum'),'',ICON_SIZE_MEDIUM).'</a>';
+    Display::return_icon('back.png', get_lang('BackToForum'), '', ICON_SIZE_MEDIUM).'</a>';
 echo '</div>';
 
 $threadData = getThreadInfo($threadId, $cId);

main/forum/forumsearch.php

Spacing +4 added lines, -4 removed lines

@@ -40,7 +40,7 @@ 
 // Are we in a lp ?
 $origin = '';
 if (isset($_GET['origin'])) {
-    $origin =  Security::remove_XSS($_GET['origin']);
+    $origin = Security::remove_XSS($_GET['origin']);
 }
 
 // Name of the tool
@@ -48,12 +48,12 @@ 
 
 // Breadcrumbs
 
-if (isset($_SESSION['gradebook'])){
+if (isset($_SESSION['gradebook'])) {
     $gradebook = $_SESSION['gradebook'];
 }
 
 if (!empty($gradebook) && $gradebook == 'view') {
-    $interbreadcrumb[] = array (
+    $interbreadcrumb[] = array(
         'url' => '../gradebook/'.$_SESSION['gradebook_dest'],
         'name' => get_lang('ToolGradebook')
     );
@@ -66,7 +66,7 @@ 
     $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'group/group.php?'.api_get_cidreq(), 'name' => get_lang('Groups'));
     $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'group/group_space.php?'.api_get_cidreq(), 'name' => get_lang('GroupSpace').' ('.$group_properties['name'].')');
     $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'forum/viewforum.php?origin='.$origin.'&forum='.intval($_GET['forum']).'&'.api_get_cidreq(), 'name' => prepare4display($current_forum['forum_title']));
-    $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'forum/forumsearch.php?'.api_get_cidreq(),'name' => get_lang('ForumSearch'));
+    $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'forum/forumsearch.php?'.api_get_cidreq(), 'name' => get_lang('ForumSearch'));
 } else {
     $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'forum/index.php?'.api_get_cidreq(), 'name' => $nameTools);
     $nameTools = get_lang('ForumSearch');

main/document/slideshow.php

Spacing +50 added lines, -50 removed lines

@@ -64,7 +64,7 @@ 
 if ($slide_id != 'all') {
 	$image = null;
 	if (isset($image_files_only[$slide])) {
-		$image = $sys_course_path . $_course['path'] . '/document' . $folder . $image_files_only[$slide];
+		$image = $sys_course_path.$_course['path'].'/document'.$folder.$image_files_only[$slide];
 	}
 	if (file_exists($image)) {
 		echo '<div class="actions-pagination">';
@@ -105,7 +105,7 @@ 
             $last = Display::return_icon('action_last_na.png', get_lang('LastSlide'));
 		} else {
 			$imgn = 'action_next.png';
-			$last = '<a href="slideshow.php?slide_id='.($total_slides-1).'&curdirpath='.$pathurl.'">
+			$last = '<a href="slideshow.php?slide_id='.($total_slides - 1).'&curdirpath='.$pathurl.'">
 			        '.Display::return_icon('action_last.png', get_lang('LastSlide')).'
                 </a>';
 		}
@@ -122,18 +122,18 @@ 
 
 // Exit the slideshow
 echo '<a href="document.php?action=exit_slideshow&curdirpath='.$pathurl.'&'.api_get_cidreq().'">'.
-    Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
+    Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), '', ICON_SIZE_MEDIUM).'</a>';
 
 // Show thumbnails
 if ($slide_id != 'all') {
 	echo '<a href="slideshow.php?slide_id=all&curdirpath='.$pathurl.'&'.api_get_cidreq().'">'.
-        Display::return_icon('thumbnails.png',get_lang('ShowThumbnails'),'',ICON_SIZE_MEDIUM).'</a>';
+        Display::return_icon('thumbnails.png', get_lang('ShowThumbnails'), '', ICON_SIZE_MEDIUM).'</a>';
 } else {
-	echo Display::return_icon('thumbnails_na.png',get_lang('ShowThumbnails'),'',ICON_SIZE_MEDIUM);
+	echo Display::return_icon('thumbnails_na.png', get_lang('ShowThumbnails'), '', ICON_SIZE_MEDIUM);
 }
 // Slideshow options
 echo '<a href="slideshowoptions.php?curdirpath='.$pathurl.'&'.api_get_cidreq().'">'.
-    Display::return_icon('settings.png', get_lang('SetSlideshowOptions'),'',ICON_SIZE_MEDIUM).'</a>';
+    Display::return_icon('settings.png', get_lang('SetSlideshowOptions'), '', ICON_SIZE_MEDIUM).'</a>';
 
 echo '</div>';
 echo '<br />';
@@ -157,7 +157,7 @@ 
 }
 $target_width = $target_height = null;
 // The target height and width depends if we choose resizing or no resizing
-if (isset($_SESSION["image_resizing"]) &&  $_SESSION["image_resizing"] == "resizing") {
+if (isset($_SESSION["image_resizing"]) && $_SESSION["image_resizing"] == "resizing") {
 	$target_width = $_SESSION["image_resizing_width"];
 	$target_height = $_SESSION["image_resizing_height"];
 }
@@ -165,7 +165,7 @@ 
 /*	THUMBNAIL VIEW */
 
 // This is for viewing all the images in the slideshow as thumbnails.
-$image_tag = array ();
+$image_tag = array();
 $html = '';
 if ($slide_id == 'all') {
 
@@ -173,16 +173,16 @@ 
     $allowed_thumbnail_types = array('jpg', 'jpeg', 'gif', 'png');
 	$max_thumbnail_width     = 250;
 	$max_thumbnail_height    = 250;
-	$png_compression	     = 0;//0(none)-9
-	$jpg_quality  	         = 75;//from 0 to 100 (default is 75). More quality less compression
+	$png_compression	     = 0; //0(none)-9
+	$jpg_quality = 75; //from 0 to 100 (default is 75). More quality less compression
 
 	$directory_thumbnails = $sys_course_path.$_course['path'].'/document'.$folder.'.thumbs/';
 
 	//Other parameters only for show tumbnails
-	$row_items 			     = 4;//only in slideshow.php
-	$number_image 			 = 7;//num icons cols to show
-	$thumbnail_width_frame=$max_thumbnail_width;//optional $max_thumbnail_width+x
-	$thumbnail_height_frame=$max_thumbnail_height;
+	$row_items = 4; //only in slideshow.php
+	$number_image = 7; //num icons cols to show
+	$thumbnail_width_frame = $max_thumbnail_width; //optional $max_thumbnail_width+x
+	$thumbnail_height_frame = $max_thumbnail_height;
 
 	// Create the template_thumbnails folder (if no exist)
 
@@ -195,20 +195,20 @@ 
 
 		foreach ($image_files_only as $one_image_file) {
 			$image = $sys_course_path.$_course['path'].'/document'.$folder.$one_image_file;
-			$image_thumbnail= $directory_thumbnails.'.'.$one_image_file;
+			$image_thumbnail = $directory_thumbnails.'.'.$one_image_file;
 
 			if (file_exists($image)) {
 				//check thumbnail
 				$imagetype = explode(".", $image);
                 //or check $imagetype = image_type_to_extension(exif_imagetype($image), false);
-				$imagetype = strtolower($imagetype[count($imagetype)-1]);
+				$imagetype = strtolower($imagetype[count($imagetype) - 1]);
 
-				if(in_array($imagetype,$allowed_thumbnail_types)) {
-					if (!file_exists($image_thumbnail)){
+				if (in_array($imagetype, $allowed_thumbnail_types)) {
+					if (!file_exists($image_thumbnail)) {
                         //run each once we view thumbnails is too heavy, then need move into  !file_exists($image_thumbnail, and only run when haven't the thumbnail
 						$original_image_size = api_getimagesize($image);
 
-						switch($imagetype) {
+						switch ($imagetype) {
 							case 'gif':
 								$source_img = imagecreatefromgif($image);
 								break;
@@ -230,17 +230,17 @@ 
                             $max_thumbnail_height
                         );
 
-						if($max_thumbnail_width>$original_image_size['width'] && $max_thumbnail_height>$original_image_size['height']){
-							$new_thumbnail_size['width']=$original_image_size['width'];
-							$new_thumbnail_size['height']=$original_image_size['height'];
+						if ($max_thumbnail_width > $original_image_size['width'] && $max_thumbnail_height > $original_image_size['height']) {
+							$new_thumbnail_size['width'] = $original_image_size['width'];
+							$new_thumbnail_size['height'] = $original_image_size['height'];
 						}
 
 						$crop = imagecreatetruecolor($new_thumbnail_size['width'], $new_thumbnail_size['height']);
 
 						// preserve transparency
-						if($imagetype == "png"){
+						if ($imagetype == "png") {
 							imagesavealpha($crop, true);
-							$color = imagecolorallocatealpha($crop,0x00,0x00,0x00,127);
+							$color = imagecolorallocatealpha($crop, 0x00, 0x00, 0x00, 127);
 							imagefill($crop, 0, 0, $color);
 						}
 
@@ -248,7 +248,7 @@ 
 							$transindex = imagecolortransparent($source_img);
                             $palletsize = imagecolorstotal($source_img);
 							 //GIF89a for transparent and anim (first clip), either GIF87a
-							 if ($transindex >= 0 && $transindex < $palletsize){
+							 if ($transindex >= 0 && $transindex < $palletsize) {
 								 $transcol = imagecolorsforindex($source_img, $transindex);
 								 $transindex = imagecolorallocatealpha($crop, $transcol['red'], $transcol['green'], $transcol['blue'], 127);
 								 imagefill($crop, 0, 0, $transindex);
@@ -272,16 +272,16 @@ 
 
 						switch ($imagetype) {
 							case 'gif':
-								imagegif($crop,$image_thumbnail);
+								imagegif($crop, $image_thumbnail);
 								break;
 							case 'jpg':
-								imagejpeg($crop,$image_thumbnail,$jpg_quality);
+								imagejpeg($crop, $image_thumbnail, $jpg_quality);
 								break;
 							case 'jpeg':
-								imagejpeg($crop,$image_thumbnail,$jpg_quality);
+								imagejpeg($crop, $image_thumbnail, $jpg_quality);
 								break;
 							case 'png':
-								imagepng($crop,$image_thumbnail,$png_compression);
+								imagepng($crop, $image_thumbnail, $png_compression);
 								break;
 						}
 
@@ -291,26 +291,26 @@ 
 
 					//show thumbnail and link
 
-					$one_image_thumbnail_file='.thumbs/.'.$one_image_file;//get path thumbnail
+					$one_image_thumbnail_file = '.thumbs/.'.$one_image_file; //get path thumbnail
 					$doc_url = ($path && $path !== '/') ? $path.'/'.$one_image_thumbnail_file : $path.$one_image_thumbnail_file;
 					$image_tag[] = '<img class="img-gallery" src="download.php?doc_url='.$doc_url.'" border="0" title="'.$one_image_file.'">';
 				} else {
 					//if images aren't support by gd (not gif, jpg, jpeg, png)
-					if ($imagetype=="bmp") {
+					if ($imagetype == "bmp") {
                         // use getimagesize instead api_getimagesize($image); becasuse api_getimagesize doesn't support bmp files. Put here for each show, only for a few bmp files isn't heavy
 						$original_image_size = getimagesize($image);
-						if ($max_thumbnail_width<$original_image_size[0] || $max_thumbnail_height<$original_image_size[1]){
-							$thumbnail_size=api_calculate_image_size($original_image_size[0], $original_image_size[1], $max_thumbnail_width, $max_thumbnail_height);//don't use resize_image because doesn't run with bmp files
+						if ($max_thumbnail_width < $original_image_size[0] || $max_thumbnail_height < $original_image_size[1]) {
+							$thumbnail_size = api_calculate_image_size($original_image_size[0], $original_image_size[1], $max_thumbnail_width, $max_thumbnail_height); //don't use resize_image because doesn't run with bmp files
 							$image_height = $thumbnail_size['height'];
 							$image_width  = $thumbnail_size['width'];
 						} else {
-							$image_height=$original_image_size[0];
-							$image_width=$original_image_size[1];
+							$image_height = $original_image_size[0];
+							$image_width = $original_image_size[1];
 						}
 					} else {
 						//example for svg files,...
-						$image_width=$max_thumbnail_width;
-						$image_height=$max_thumbnail_height;
+						$image_width = $max_thumbnail_width;
+						$image_height = $max_thumbnail_height;
 					}
 
 					$doc_url = ($path && $path !== '/') ? $path.'/'.$one_image_file : $path.$one_image_file;
@@ -326,7 +326,7 @@ 
 
 	$i = 0;
 	$count_image = count($image_tag);
-	$number_iteration = ceil($count_image/$number_image);
+	$number_iteration = ceil($count_image / $number_image);
 	$p = 0;
     $html = '';
     $html .= '<div class="gallery">';
@@ -338,7 +338,7 @@ 
                             $html .= '<a class="canvas-two" href="slideshow.php?slide_id='.$p.'&curdirpath='.$pathurl.'">';
                             $html .= '<div class="frame">';
                             $html .= '<div class="photo">';
-                            $html .=  $image_tag[$p];
+                            $html .= $image_tag[$p];
                             $html .= '</div>';
                             $html .= '</div>';
                             $html .= '</a>';
@@ -393,7 +393,7 @@ 
 
 		list($width, $height) = getimagesize($image);
 		// Auto resize
-		if (isset($_SESSION["image_resizing"]) &&  $_SESSION["image_resizing"] == 'resizing') {
+		if (isset($_SESSION["image_resizing"]) && $_SESSION["image_resizing"] == 'resizing') {
 		?>
 
 		<script type="text/javascript">
@@ -410,7 +410,7 @@ 
 				start_height=initial_height;
 			}
 
-			document.write('<img id="image"  src="<?php echo  'download.php?doc_url='.$path.'/'.$image_files_only[$slide]; ?>" width="'+start_width+'" height="'+start_height+'"  border="0"  alt="<?php echo $image_files_only[$slide] ;?>">');
+			document.write('<img id="image"  src="<?php echo  'download.php?doc_url='.$path.'/'.$image_files_only[$slide]; ?>" width="'+start_width+'" height="'+start_height+'"  border="0"  alt="<?php echo $image_files_only[$slide]; ?>">');
 
 			function resizeImage() {
 
@@ -454,7 +454,7 @@ 
 		echo '</a>';
         echo '<div class="caption text-center">';
         echo Display::tag('h3', $row['title']);
-        echo '<p>' . $row['comment'] . '</p>';
+        echo '<p>'.$row['comment'].'</p>';
         echo '</div>';
         echo '</div>';
 
@@ -467,7 +467,7 @@ 
                 $resize_info = get_lang('Resizing').'<br />';
                 $resize_width = $_SESSION["image_resizing_width"].' x ';
                 $resize_height = $_SESSION['image_resizing_height'];
-            } elseif (isset($_SESSION['image_resizing']) && $_SESSION['image_resizing'] != 'noresizing'){
+            } elseif (isset($_SESSION['image_resizing']) && $_SESSION['image_resizing'] != 'noresizing') {
                 $resize_info = get_lang('Resizing').'<br />';
                 $resize_width = get_lang('Auto').' x ';
                 $resize_height = get_lang('Auto');
@@ -478,10 +478,10 @@ 
             }
 
             echo '<li class="text-center">';
-            echo $image_files_only[$slide] . ' ';
+            echo $image_files_only[$slide].' ';
             echo Display::toolbarButton(
                 get_lang('Modify'),
-                'edit_document.php?' . api_get_cidreq() . '&' . http_build_query([
+                'edit_document.php?'.api_get_cidreq().'&'.http_build_query([
                     'id' => $row['id'],
                     'origin' => 'slideshow',
                     'origin_opt' => $edit_slide_id,
@@ -493,11 +493,11 @@ 
                 false
             );
             echo '</li>';
-            echo '<li class="text-center">' . $width.' x '.$height . '</li>';
-			echo '<li class="text-center">' . round((filesize($image) / 1024), 2) . ' KB - ' . $ext . '</li>';
-            echo '<li class="text-center">' . $resize_info . '</li>';
-			echo '<li class="text-center">' . $resize_width . '</li>';
-			echo '<li class="text-center">' . $resize_height . '</li>';
+            echo '<li class="text-center">'.$width.' x '.$height.'</li>';
+			echo '<li class="text-center">'.round((filesize($image) / 1024), 2).' KB - '.$ext.'</li>';
+            echo '<li class="text-center">'.$resize_info.'</li>';
+			echo '<li class="text-center">'.$resize_width.'</li>';
+			echo '<li class="text-center">'.$resize_height.'</li>';
             echo '</ul>';
 		}
 

Indentation +245 added lines, -245 removed lines

@@ -15,15 +15,15 @@ 
 $slide_id = isset($_GET['slide_id']) ? Security::remove_XSS($_GET['slide_id']) : null;
 
 if (empty($slide_id)) {
-	$edit_slide_id = 1;
+    $edit_slide_id = 1;
 } else {
-	$edit_slide_id = $slide_id;
+    $edit_slide_id = $slide_id;
 }
 
 if ($path != '/') {
-	$folder = $path.'/';
+    $folder = $path.'/';
 } else {
-	$folder = '/';
+    $folder = '/';
 }
 $sys_course_path = api_get_path(SYS_COURSE_PATH);
 
@@ -41,15 +41,15 @@ 
 
 // Loading the slides from the session
 if (isset($_SESSION['image_files_only'])) {
-	$image_files_only = $_SESSION['image_files_only'];
+    $image_files_only = $_SESSION['image_files_only'];
 }
 
 // Calculating the current slide, next slide, previous slide and the number of slides
 $slide = null;
 if ($slide_id != 'all') {
-	$slide = $slide_id ? $slide_id : 0;
-	$previous_slide = $slide - 1;
-	$next_slide = $slide + 1;
+    $slide = $slide_id ? $slide_id : 0;
+    $previous_slide = $slide - 1;
+    $next_slide = $slide + 1;
 }
 $total_slides = count($image_files_only);
 ?>
@@ -62,62 +62,62 @@ 
 <?php
 
 if ($slide_id != 'all') {
-	$image = null;
-	if (isset($image_files_only[$slide])) {
-		$image = $sys_course_path . $_course['path'] . '/document' . $folder . $image_files_only[$slide];
-	}
-	if (file_exists($image)) {
-		echo '<div class="actions-pagination">';
-
-		// Back forward buttons
-		if ($slide == 0) {
-			$imgp = 'action_prev_na.png';
-			$first = Display::return_icon('action_first_na.png');
-		} else {
-			$imgp = 'action_prev.png';
-			$first = '<a href="slideshow.php?slide_id=0&curdirpath='.$pathurl.'">
+    $image = null;
+    if (isset($image_files_only[$slide])) {
+        $image = $sys_course_path . $_course['path'] . '/document' . $folder . $image_files_only[$slide];
+    }
+    if (file_exists($image)) {
+        echo '<div class="actions-pagination">';
+
+        // Back forward buttons
+        if ($slide == 0) {
+            $imgp = 'action_prev_na.png';
+            $first = Display::return_icon('action_first_na.png');
+        } else {
+            $imgp = 'action_prev.png';
+            $first = '<a href="slideshow.php?slide_id=0&curdirpath='.$pathurl.'">
 			          '.Display::return_icon('action_first.png', get_lang('FirstSlide')).'
 			          </a>';
-		}
+        }
 
-		// First slide
-		echo $first;
+        // First slide
+        echo $first;
 
-		// Previous slide
-		if ($slide > 0) {
-			echo '<a href="slideshow.php?slide_id='.$previous_slide.'&curdirpath='.$pathurl.'">';
-		}
+        // Previous slide
+        if ($slide > 0) {
+            echo '<a href="slideshow.php?slide_id='.$previous_slide.'&curdirpath='.$pathurl.'">';
+        }
 
         echo Display::return_icon($imgp, get_lang('Previous'));
-		if ($slide > 0) {
-			echo '</a>';
-		}
-
-		// Divider
-		echo ' [ '.$next_slide.'/'.$total_slides.' ] ';
-
-		// Next slide
-		if ($slide < $total_slides - 1) {
-			echo '<a href="slideshow.php?slide_id='.$next_slide.'&curdirpath='.$pathurl.'">';
-		}
-		if ($slide == $total_slides - 1) {
-			$imgn = 'action_next_na.png';
+        if ($slide > 0) {
+            echo '</a>';
+        }
+
+        // Divider
+        echo ' [ '.$next_slide.'/'.$total_slides.' ] ';
+
+        // Next slide
+        if ($slide < $total_slides - 1) {
+            echo '<a href="slideshow.php?slide_id='.$next_slide.'&curdirpath='.$pathurl.'">';
+        }
+        if ($slide == $total_slides - 1) {
+            $imgn = 'action_next_na.png';
             $last = Display::return_icon('action_last_na.png', get_lang('LastSlide'));
-		} else {
-			$imgn = 'action_next.png';
-			$last = '<a href="slideshow.php?slide_id='.($total_slides-1).'&curdirpath='.$pathurl.'">
+        } else {
+            $imgn = 'action_next.png';
+            $last = '<a href="slideshow.php?slide_id='.($total_slides-1).'&curdirpath='.$pathurl.'">
 			        '.Display::return_icon('action_last.png', get_lang('LastSlide')).'
                 </a>';
-		}
+        }
         echo Display::return_icon($imgn, get_lang('Next'));
-		if ($slide > 0) {
-			echo '</a>';
-		}
-
-		// Last slide
-		echo $last;
-		echo '</div>';
-	}
+        if ($slide > 0) {
+            echo '</a>';
+        }
+
+        // Last slide
+        echo $last;
+        echo '</div>';
+    }
 }
 
 // Exit the slideshow
@@ -126,10 +126,10 @@ 
 
 // Show thumbnails
 if ($slide_id != 'all') {
-	echo '<a href="slideshow.php?slide_id=all&curdirpath='.$pathurl.'&'.api_get_cidreq().'">'.
+    echo '<a href="slideshow.php?slide_id=all&curdirpath='.$pathurl.'&'.api_get_cidreq().'">'.
         Display::return_icon('thumbnails.png',get_lang('ShowThumbnails'),'',ICON_SIZE_MEDIUM).'</a>';
 } else {
-	echo Display::return_icon('thumbnails_na.png',get_lang('ShowThumbnails'),'',ICON_SIZE_MEDIUM);
+    echo Display::return_icon('thumbnails_na.png',get_lang('ShowThumbnails'),'',ICON_SIZE_MEDIUM);
 }
 // Slideshow options
 echo '<a href="slideshowoptions.php?curdirpath='.$pathurl.'&'.api_get_cidreq().'">'.
@@ -142,24 +142,24 @@ 
 
 // If we come from slideshowoptions.php we sessionize (new word !!! ;-) the options
 if (isset($_POST['Submit'])) {
-	// We come from slideshowoptions.php
-	//$_SESSION["auto_image_resizing"]=Security::remove_XSS($_POST['auto_radio_resizing']);
-	$_SESSION["image_resizing"] = Security::remove_XSS($_POST['radio_resizing']);
-	if ($_POST['radio_resizing'] == "resizing" && $_POST['width'] != '' && $_POST['height'] != '') {
-		//echo "resizing";
-		$_SESSION["image_resizing_width"] = Security::remove_XSS($_POST['width']);
-		$_SESSION["image_resizing_height"] = Security::remove_XSS($_POST['height']);
-	} else {
-		//echo "unsetting the session heighte and width";
-		$_SESSION["image_resizing_width"] = null;
-		$_SESSION["image_resizing_height"] = null;
-	}
+    // We come from slideshowoptions.php
+    //$_SESSION["auto_image_resizing"]=Security::remove_XSS($_POST['auto_radio_resizing']);
+    $_SESSION["image_resizing"] = Security::remove_XSS($_POST['radio_resizing']);
+    if ($_POST['radio_resizing'] == "resizing" && $_POST['width'] != '' && $_POST['height'] != '') {
+        //echo "resizing";
+        $_SESSION["image_resizing_width"] = Security::remove_XSS($_POST['width']);
+        $_SESSION["image_resizing_height"] = Security::remove_XSS($_POST['height']);
+    } else {
+        //echo "unsetting the session heighte and width";
+        $_SESSION["image_resizing_width"] = null;
+        $_SESSION["image_resizing_height"] = null;
+    }
 }
 $target_width = $target_height = null;
 // The target height and width depends if we choose resizing or no resizing
 if (isset($_SESSION["image_resizing"]) &&  $_SESSION["image_resizing"] == "resizing") {
-	$target_width = $_SESSION["image_resizing_width"];
-	$target_height = $_SESSION["image_resizing_height"];
+    $target_width = $_SESSION["image_resizing_width"];
+    $target_height = $_SESSION["image_resizing_height"];
 }
 
 /*	THUMBNAIL VIEW */
@@ -169,59 +169,59 @@ 
 $html = '';
 if ($slide_id == 'all') {
 
-	// Config for make thumbnails
+    // Config for make thumbnails
     $allowed_thumbnail_types = array('jpg', 'jpeg', 'gif', 'png');
-	$max_thumbnail_width     = 250;
-	$max_thumbnail_height    = 250;
-	$png_compression	     = 0;//0(none)-9
-	$jpg_quality  	         = 75;//from 0 to 100 (default is 75). More quality less compression
+    $max_thumbnail_width     = 250;
+    $max_thumbnail_height    = 250;
+    $png_compression	     = 0;//0(none)-9
+    $jpg_quality  	         = 75;//from 0 to 100 (default is 75). More quality less compression
 
-	$directory_thumbnails = $sys_course_path.$_course['path'].'/document'.$folder.'.thumbs/';
+    $directory_thumbnails = $sys_course_path.$_course['path'].'/document'.$folder.'.thumbs/';
 
-	//Other parameters only for show tumbnails
-	$row_items 			     = 4;//only in slideshow.php
-	$number_image 			 = 7;//num icons cols to show
-	$thumbnail_width_frame=$max_thumbnail_width;//optional $max_thumbnail_width+x
-	$thumbnail_height_frame=$max_thumbnail_height;
+    //Other parameters only for show tumbnails
+    $row_items 			     = 4;//only in slideshow.php
+    $number_image 			 = 7;//num icons cols to show
+    $thumbnail_width_frame=$max_thumbnail_width;//optional $max_thumbnail_width+x
+    $thumbnail_height_frame=$max_thumbnail_height;
 
-	// Create the template_thumbnails folder (if no exist)
+    // Create the template_thumbnails folder (if no exist)
 
-	if (!file_exists($directory_thumbnails)) {
-		@mkdir($directory_thumbnails, api_get_permissions_for_new_directories());
+    if (!file_exists($directory_thumbnails)) {
+        @mkdir($directory_thumbnails, api_get_permissions_for_new_directories());
     }
 
-	// check files and thumbnails
-	if (is_array($image_files_only)) {
+    // check files and thumbnails
+    if (is_array($image_files_only)) {
 
-		foreach ($image_files_only as $one_image_file) {
-			$image = $sys_course_path.$_course['path'].'/document'.$folder.$one_image_file;
-			$image_thumbnail= $directory_thumbnails.'.'.$one_image_file;
+        foreach ($image_files_only as $one_image_file) {
+            $image = $sys_course_path.$_course['path'].'/document'.$folder.$one_image_file;
+            $image_thumbnail= $directory_thumbnails.'.'.$one_image_file;
 
-			if (file_exists($image)) {
-				//check thumbnail
-				$imagetype = explode(".", $image);
+            if (file_exists($image)) {
+                //check thumbnail
+                $imagetype = explode(".", $image);
                 //or check $imagetype = image_type_to_extension(exif_imagetype($image), false);
-				$imagetype = strtolower($imagetype[count($imagetype)-1]);
+                $imagetype = strtolower($imagetype[count($imagetype)-1]);
 
-				if(in_array($imagetype,$allowed_thumbnail_types)) {
-					if (!file_exists($image_thumbnail)){
+                if(in_array($imagetype,$allowed_thumbnail_types)) {
+                    if (!file_exists($image_thumbnail)){
                         //run each once we view thumbnails is too heavy, then need move into  !file_exists($image_thumbnail, and only run when haven't the thumbnail
-						$original_image_size = api_getimagesize($image);
-
-						switch($imagetype) {
-							case 'gif':
-								$source_img = imagecreatefromgif($image);
-								break;
-							case 'jpg':
-								$source_img = imagecreatefromjpeg($image);
-								break;
-							case 'jpeg':
-								$source_img = imagecreatefromjpeg($image);
-								break;
-							case 'png':
-								$source_img = imagecreatefrompng($image);
-								break;
-						}
+                        $original_image_size = api_getimagesize($image);
+
+                        switch($imagetype) {
+                            case 'gif':
+                                $source_img = imagecreatefromgif($image);
+                                break;
+                            case 'jpg':
+                                $source_img = imagecreatefromjpeg($image);
+                                break;
+                            case 'jpeg':
+                                $source_img = imagecreatefromjpeg($image);
+                                break;
+                            case 'png':
+                                $source_img = imagecreatefrompng($image);
+                                break;
+                        }
 
                         $new_thumbnail_size = api_calculate_image_size(
                             $original_image_size['width'],
@@ -230,33 +230,33 @@ 
                             $max_thumbnail_height
                         );
 
-						if($max_thumbnail_width>$original_image_size['width'] && $max_thumbnail_height>$original_image_size['height']){
-							$new_thumbnail_size['width']=$original_image_size['width'];
-							$new_thumbnail_size['height']=$original_image_size['height'];
-						}
+                        if($max_thumbnail_width>$original_image_size['width'] && $max_thumbnail_height>$original_image_size['height']){
+                            $new_thumbnail_size['width']=$original_image_size['width'];
+                            $new_thumbnail_size['height']=$original_image_size['height'];
+                        }
 
-						$crop = imagecreatetruecolor($new_thumbnail_size['width'], $new_thumbnail_size['height']);
+                        $crop = imagecreatetruecolor($new_thumbnail_size['width'], $new_thumbnail_size['height']);
 
-						// preserve transparency
-						if($imagetype == "png"){
-							imagesavealpha($crop, true);
-							$color = imagecolorallocatealpha($crop,0x00,0x00,0x00,127);
-							imagefill($crop, 0, 0, $color);
-						}
+                        // preserve transparency
+                        if($imagetype == "png"){
+                            imagesavealpha($crop, true);
+                            $color = imagecolorallocatealpha($crop,0x00,0x00,0x00,127);
+                            imagefill($crop, 0, 0, $color);
+                        }
 
-						if ($imagetype == "gif") {
-							$transindex = imagecolortransparent($source_img);
+                        if ($imagetype == "gif") {
+                            $transindex = imagecolortransparent($source_img);
                             $palletsize = imagecolorstotal($source_img);
-							 //GIF89a for transparent and anim (first clip), either GIF87a
-							 if ($transindex >= 0 && $transindex < $palletsize){
-								 $transcol = imagecolorsforindex($source_img, $transindex);
-								 $transindex = imagecolorallocatealpha($crop, $transcol['red'], $transcol['green'], $transcol['blue'], 127);
-								 imagefill($crop, 0, 0, $transindex);
-								 imagecolortransparent($crop, $transindex);
-							 }
-						}
-
-						//resampled image
+                                //GIF89a for transparent and anim (first clip), either GIF87a
+                                if ($transindex >= 0 && $transindex < $palletsize){
+                                    $transcol = imagecolorsforindex($source_img, $transindex);
+                                    $transindex = imagecolorallocatealpha($crop, $transcol['red'], $transcol['green'], $transcol['blue'], 127);
+                                    imagefill($crop, 0, 0, $transindex);
+                                    imagecolortransparent($crop, $transindex);
+                                }
+                        }
+
+                        //resampled image
                         imagecopyresampled(
                             $crop,
                             $source_img,
@@ -270,69 +270,69 @@ 
                             $original_image_size['height']
                         );
 
-						switch ($imagetype) {
-							case 'gif':
-								imagegif($crop,$image_thumbnail);
-								break;
-							case 'jpg':
-								imagejpeg($crop,$image_thumbnail,$jpg_quality);
-								break;
-							case 'jpeg':
-								imagejpeg($crop,$image_thumbnail,$jpg_quality);
-								break;
-							case 'png':
-								imagepng($crop,$image_thumbnail,$png_compression);
-								break;
-						}
-
-						//clean memory
-						imagedestroy($crop);
-					}//end !exist thumbnail
-
-					//show thumbnail and link
-
-					$one_image_thumbnail_file='.thumbs/.'.$one_image_file;//get path thumbnail
-					$doc_url = ($path && $path !== '/') ? $path.'/'.$one_image_thumbnail_file : $path.$one_image_thumbnail_file;
-					$image_tag[] = '<img class="img-gallery" src="download.php?doc_url='.$doc_url.'" border="0" title="'.$one_image_file.'">';
-				} else {
-					//if images aren't support by gd (not gif, jpg, jpeg, png)
-					if ($imagetype=="bmp") {
+                        switch ($imagetype) {
+                            case 'gif':
+                                imagegif($crop,$image_thumbnail);
+                                break;
+                            case 'jpg':
+                                imagejpeg($crop,$image_thumbnail,$jpg_quality);
+                                break;
+                            case 'jpeg':
+                                imagejpeg($crop,$image_thumbnail,$jpg_quality);
+                                break;
+                            case 'png':
+                                imagepng($crop,$image_thumbnail,$png_compression);
+                                break;
+                        }
+
+                        //clean memory
+                        imagedestroy($crop);
+                    }//end !exist thumbnail
+
+                    //show thumbnail and link
+
+                    $one_image_thumbnail_file='.thumbs/.'.$one_image_file;//get path thumbnail
+                    $doc_url = ($path && $path !== '/') ? $path.'/'.$one_image_thumbnail_file : $path.$one_image_thumbnail_file;
+                    $image_tag[] = '<img class="img-gallery" src="download.php?doc_url='.$doc_url.'" border="0" title="'.$one_image_file.'">';
+                } else {
+                    //if images aren't support by gd (not gif, jpg, jpeg, png)
+                    if ($imagetype=="bmp") {
                         // use getimagesize instead api_getimagesize($image); becasuse api_getimagesize doesn't support bmp files. Put here for each show, only for a few bmp files isn't heavy
-						$original_image_size = getimagesize($image);
-						if ($max_thumbnail_width<$original_image_size[0] || $max_thumbnail_height<$original_image_size[1]){
-							$thumbnail_size=api_calculate_image_size($original_image_size[0], $original_image_size[1], $max_thumbnail_width, $max_thumbnail_height);//don't use resize_image because doesn't run with bmp files
-							$image_height = $thumbnail_size['height'];
-							$image_width  = $thumbnail_size['width'];
-						} else {
-							$image_height=$original_image_size[0];
-							$image_width=$original_image_size[1];
-						}
-					} else {
-						//example for svg files,...
-						$image_width=$max_thumbnail_width;
-						$image_height=$max_thumbnail_height;
-					}
-
-					$doc_url = ($path && $path !== '/') ? $path.'/'.$one_image_file : $path.$one_image_file;
-					$image_tag[] = '<img src="download.php?doc_url='.$doc_url.'" border="0" width="'.$image_width.'" height="'.$image_height.'" title="'.$one_image_file.'">';
-
-				}//end allowed image types
-			}//end if exist file image
-		}//end foreach
-	}//end image files only
-
-	// Creating the table
-	$html_table = '';
-
-	$i = 0;
-	$count_image = count($image_tag);
-	$number_iteration = ceil($count_image/$number_image);
-	$p = 0;
+                        $original_image_size = getimagesize($image);
+                        if ($max_thumbnail_width<$original_image_size[0] || $max_thumbnail_height<$original_image_size[1]){
+                            $thumbnail_size=api_calculate_image_size($original_image_size[0], $original_image_size[1], $max_thumbnail_width, $max_thumbnail_height);//don't use resize_image because doesn't run with bmp files
+                            $image_height = $thumbnail_size['height'];
+                            $image_width  = $thumbnail_size['width'];
+                        } else {
+                            $image_height=$original_image_size[0];
+                            $image_width=$original_image_size[1];
+                        }
+                    } else {
+                        //example for svg files,...
+                        $image_width=$max_thumbnail_width;
+                        $image_height=$max_thumbnail_height;
+                    }
+
+                    $doc_url = ($path && $path !== '/') ? $path.'/'.$one_image_file : $path.$one_image_file;
+                    $image_tag[] = '<img src="download.php?doc_url='.$doc_url.'" border="0" width="'.$image_width.'" height="'.$image_height.'" title="'.$one_image_file.'">';
+
+                }//end allowed image types
+            }//end if exist file image
+        }//end foreach
+    }//end image files only
+
+    // Creating the table
+    $html_table = '';
+
+    $i = 0;
+    $count_image = count($image_tag);
+    $number_iteration = ceil($count_image/$number_image);
+    $p = 0;
     $html = '';
     $html .= '<div class="gallery">';
-	for ($k = 0; $k < $number_iteration; $k++) {
-		for ($i = 0; $i < $number_image; $i++) {
-			if (isset($image_tag[$p])) {
+    for ($k = 0; $k < $number_iteration; $k++) {
+        for ($i = 0; $i < $number_image; $i++) {
+            if (isset($image_tag[$p])) {
                             $html .= '<div class="col-xs-6 col-sm-3 col-md-2">';
                             $html .= '<div class="canvas-one">';
                             $html .= '<a class="canvas-two" href="slideshow.php?slide_id='.$p.'&curdirpath='.$pathurl.'">';
@@ -344,10 +344,10 @@ 
                             $html .= '</a>';
                             $html .= '</div>';
                             $html .= '</div>';
-			}
-			$p++;
-		}
-	}
+            }
+            $p++;
+        }
+    }
     $html .= '</div>';
 
 }//end slide==all
@@ -358,43 +358,43 @@ 
 // This is for viewing all the images in the slideshow one at a time.
 
 if ($slide_id != 'all' && !empty($image_files_only)) {
-	if (file_exists($image) && is_file($image)) {
-		$image_height_width = resize_image($image, $target_width, $target_height);
-
-		$image_height = $image_height_width[0];
-		$image_width = $image_height_width[1];
-
-		$height_width_tags = null;
-		if (isset($_SESSION['image_resizing']) && $_SESSION['image_resizing'] == 'resizing') {
-			$height_width_tags = 'width="'.$image_width.'" height="'.$image_height.'"';
-		}
-
-		// This is done really quickly and should be cleaned up a little bit using the API functions
-		$tbl_documents = Database::get_course_table(TABLE_DOCUMENT);
-		if ($path == '/') {
-			$pathpart = '/';
-		} else {
-			$pathpart = $path.'/';
-		}
-		$sql = "SELECT * FROM $tbl_documents
+    if (file_exists($image) && is_file($image)) {
+        $image_height_width = resize_image($image, $target_width, $target_height);
+
+        $image_height = $image_height_width[0];
+        $image_width = $image_height_width[1];
+
+        $height_width_tags = null;
+        if (isset($_SESSION['image_resizing']) && $_SESSION['image_resizing'] == 'resizing') {
+            $height_width_tags = 'width="'.$image_width.'" height="'.$image_height.'"';
+        }
+
+        // This is done really quickly and should be cleaned up a little bit using the API functions
+        $tbl_documents = Database::get_course_table(TABLE_DOCUMENT);
+        if ($path == '/') {
+            $pathpart = '/';
+        } else {
+            $pathpart = $path.'/';
+        }
+        $sql = "SELECT * FROM $tbl_documents
 		        WHERE c_id = $course_id AND path='".Database::escape_string($pathpart.$image_files_only[$slide])."'";
-		$result = Database::query($sql);
-		$row = Database::fetch_array($result);
+        $result = Database::query($sql);
+        $row = Database::fetch_array($result);
 
         echo '<div class="thumbnail">';
-		if ($slide < $total_slides - 1 && $slide_id != 'all') {
-			echo "<a href='slideshow.php?slide_id=".$next_slide."&curdirpath=$pathurl'>";
-		} else {
-			echo "<a href='slideshow.php?slide_id=0&curdirpath=$pathurl'>";
-		}
+        if ($slide < $total_slides - 1 && $slide_id != 'all') {
+            echo "<a href='slideshow.php?slide_id=".$next_slide."&curdirpath=$pathurl'>";
+        } else {
+            echo "<a href='slideshow.php?slide_id=0&curdirpath=$pathurl'>";
+        }
         if ($path == '/') {
-        	$path = '';
+            $path = '';
         }
 
-		list($width, $height) = getimagesize($image);
-		// Auto resize
-		if (isset($_SESSION["image_resizing"]) &&  $_SESSION["image_resizing"] == 'resizing') {
-		?>
+        list($width, $height) = getimagesize($image);
+        // Auto resize
+        if (isset($_SESSION["image_resizing"]) &&  $_SESSION["image_resizing"] == 'resizing') {
+        ?>
 
 		<script type="text/javascript">
 			var initial_width='<?php echo $width; ?>';
@@ -447,21 +447,21 @@ 
 
 		</script>
     <?php
-		} else {
-			echo "<img class=\"img-responsive\" src='download.php?doc_url=$path/".$image_files_only[$slide]."' alt='".$image_files_only[$slide]."' border='0'".$height_width_tags.">";
-		}
+        } else {
+            echo "<img class=\"img-responsive\" src='download.php?doc_url=$path/".$image_files_only[$slide]."' alt='".$image_files_only[$slide]."' border='0'".$height_width_tags.">";
+        }
 
-		echo '</a>';
+        echo '</a>';
         echo '<div class="caption text-center">';
         echo Display::tag('h3', $row['title']);
         echo '<p>' . $row['comment'] . '</p>';
         echo '</div>';
         echo '</div>';
 
-		if (api_is_allowed_to_edit(null, true)) {
+        if (api_is_allowed_to_edit(null, true)) {
             echo '<ul class="list-unstyled">';
-			$aux = explode('.', htmlspecialchars($image_files_only[$slide]));
-			$ext = $aux[count($aux) - 1];
+            $aux = explode('.', htmlspecialchars($image_files_only[$slide]));
+            $ext = $aux[count($aux) - 1];
 
             if (isset($_SESSION['image_resizing']) && $_SESSION['image_resizing'] == 'resizing') {
                 $resize_info = get_lang('Resizing').'<br />';
@@ -473,8 +473,8 @@ 
                 $resize_height = get_lang('Auto');
             } else {
                 $resize_info = get_lang('NoResizing').'<br />';
-				$resize_width = '';
-				$resize_height = '';
+                $resize_width = '';
+                $resize_height = '';
             }
 
             echo '<li class="text-center">';
@@ -494,16 +494,16 @@ 
             );
             echo '</li>';
             echo '<li class="text-center">' . $width.' x '.$height . '</li>';
-			echo '<li class="text-center">' . round((filesize($image) / 1024), 2) . ' KB - ' . $ext . '</li>';
+            echo '<li class="text-center">' . round((filesize($image) / 1024), 2) . ' KB - ' . $ext . '</li>';
             echo '<li class="text-center">' . $resize_info . '</li>';
-			echo '<li class="text-center">' . $resize_width . '</li>';
-			echo '<li class="text-center">' . $resize_height . '</li>';
+            echo '<li class="text-center">' . $resize_width . '</li>';
+            echo '<li class="text-center">' . $resize_height . '</li>';
             echo '</ul>';
-		}
+        }
 
-	} else {
-		Display::display_warning_message(get_lang('FileNotFound'));
-	}
+    } else {
+        Display::display_warning_message(get_lang('FileNotFound'));
+    }
 } else {
     if ($slide_id != 'all') {
         Display::display_warning_message(get_lang('NoDataAvailable'));

main/course_description/index.php

Indentation +2 added lines, -2 removed lines

@@ -24,12 +24,12 @@
 $actions = array('listing', 'add', 'edit', 'delete', 'history');
 $action = 'listing';
 if (isset($_GET['action']) && in_array($_GET['action'],$actions)) {
-	$action = $_GET['action'];
+    $action = $_GET['action'];
 }
 
 $description_type = '';
 if (isset($_GET['description_type'])) {
-	$description_type = intval($_GET['description_type']);
+    $description_type = intval($_GET['description_type']);
 }
 
 $id = null;

Spacing +3 added lines, -3 removed lines

@@ -9,7 +9,7 @@ 
 */
 
 require_once __DIR__.'/../inc/global.inc.php';
-$current_course_tool  = TOOL_COURSE_DESCRIPTION;
+$current_course_tool = TOOL_COURSE_DESCRIPTION;
 
 // defining constants
 define('ADD_BLOCK', 8);
@@ -23,7 +23,7 @@ 
 // get actions
 $actions = array('listing', 'add', 'edit', 'delete', 'history');
 $action = 'listing';
-if (isset($_GET['action']) && in_array($_GET['action'],$actions)) {
+if (isset($_GET['action']) && in_array($_GET['action'], $actions)) {
 	$action = $_GET['action'];
 }
 
@@ -42,7 +42,7 @@ 
 }
 
 // interbreadcrumb
-$interbreadcrumb[] = array ("url" => "index.php?".api_get_cidreq(), "name" => get_lang('CourseProgram'));
+$interbreadcrumb[] = array("url" => "index.php?".api_get_cidreq(), "name" => get_lang('CourseProgram'));
 if ($description_type == 1) {
     $interbreadcrumb[] = array("url" => "#", "name" => get_lang('GeneralDescription'));
 }

main/admin/languages.php

Spacing +27 added lines, -27 removed lines

@@ -35,7 +35,7 @@ 
                 SubLanguageManager::make_unavailable_language($_POST['id']);
                 echo 'set_hidden';
             } else {
-                echo 'confirm:' . intval($_POST['id']);
+                echo 'confirm:'.intval($_POST['id']);
             }
         }
     }
@@ -57,21 +57,21 @@ 
     var disabledLang = "'.$disabledLang.'"
 
     if (msgLang == 1) {
-        $("#id_content_message").html("<div class=\"warning-message alert alert-warning\">' . get_lang('ThereAreUsersUsingThisLanguagesDisableItManually') . ' <br /> " + disabledLang + "</div");
+        $("#id_content_message").html("<div class=\"warning-message alert alert-warning\">' . get_lang('ThereAreUsersUsingThisLanguagesDisableItManually').' <br /> " + disabledLang + "</div");
     }
 
     $("#disable_all_except_default").click(function () {
-        if(confirm("'. get_lang('ConfirmYourChoice') .'")) {
+        if(confirm("'. get_lang('ConfirmYourChoice').'")) {
             $.ajax({
                 contentType: "application/x-www-form-urlencoded",
                 beforeSend: function(objeto) {
-                    $("#id_content_message").html("<div class=\"warning-message alert alert-warning\"><em class=\"fa fa-refresh fa-spin\"></em>  ' . get_lang('Loading') . '</div>");
+                    $("#id_content_message").html("<div class=\"warning-message alert alert-warning\"><em class=\"fa fa-refresh fa-spin\"></em>  ' . get_lang('Loading').'</div>");
                 },
                 type: "GET",
                 url: "../admin/languages.php",
                 data: "action=disable_all_except_default",
                 success: function(datos) {
-                    window.location.href = "' . api_get_self() . '";
+                    window.location.href = "' . api_get_self().'";
                 }
             });
         }
@@ -107,7 +107,7 @@ 
 		$.ajax({
 			contentType: "application/x-www-form-urlencoded",
 			beforeSend: function(objeto) {
-				$("#id_content_message").html("<div class=\"warning-message alert alert-warning\"><em class=\"fa fa-refresh fa-spin\"></em>  ' . get_lang('Loading') . '</div>");
+				$("#id_content_message").html("<div class=\"warning-message alert alert-warning\"><em class=\"fa fa-refresh fa-spin\"></em>  ' . get_lang('Loading').'</div>");
 			},
 			type: "POST",
 			url: "../admin/languages.php",
@@ -118,26 +118,26 @@ 
                     $("#"+id_img_link_tool).attr("src",path_name_of_imglinktool);
 
                     if (my_image_tool=="visible.png") {
-                        $("#"+id_img_link_tool).attr("alt","' . get_lang('MakeAvailable', '') . '");
-                        $("#"+id_img_link_tool).attr("title","' . get_lang('MakeAvailable', '') . '");
+                        $("#"+id_img_link_tool).attr("alt","' . get_lang('MakeAvailable', '').'");
+                        $("#"+id_img_link_tool).attr("title","' . get_lang('MakeAvailable', '').'");
                     } else {
-                        $("#"+id_img_link_tool).attr("alt","' . get_lang('MakeUnavailable', '') . '");
-                        $("#"+id_img_link_tool).attr("title","' . get_lang('MakeUnavailable', '') . '");
+                        $("#"+id_img_link_tool).attr("alt","' . get_lang('MakeUnavailable', '').'");
+                        $("#"+id_img_link_tool).attr("title","' . get_lang('MakeUnavailable', '').'");
                     }
 
                     if (datos=="set_visible") {
-                        $("#id_content_message").html("<div class=\"confirmation-message alert alert-success\">' . get_lang('LanguageIsNowVisible', '') . '</div>");
+                        $("#id_content_message").html("<div class=\"confirmation-message alert alert-success\">' . get_lang('LanguageIsNowVisible', '').'</div>");
                     }
 
                     if (datos=="set_hidden") {
-                        $("#id_content_message").html("<div class=\"confirmation-message alert alert-success\">' . get_lang('LanguageIsNowHidden', '') . '</div>");
+                        $("#id_content_message").html("<div class=\"confirmation-message alert alert-success\">' . get_lang('LanguageIsNowHidden', '').'</div>");
                     }
                 }
 
                 var action = datos.split(":")[0];
                 if (action && action == "confirm") {
                     var id = datos.split(":")[1];
-                    var sure = "<div class=\"warning-message alert alert-warning\">'.get_lang('ThereAreUsersUsingThisLanguageYouWantToDisableThisLanguageAndSetUsersWithTheDefaultPortalLanguage').'<br /><br /><a href=\"languages.php?action=make_unavailable_confirmed&id="+id+"\" class=\"btn btn-default\"><em class=\"fa fa-eye\"></em> ' . get_lang('MakeUnavailable') . '</a></div>";
+                    var sure = "<div class=\"warning-message alert alert-warning\">'.get_lang('ThereAreUsersUsingThisLanguageYouWantToDisableThisLanguageAndSetUsersWithTheDefaultPortalLanguage').'<br /><br /><a href=\"languages.php?action=make_unavailable_confirmed&id="+id+"\" class=\"btn btn-default\"><em class=\"fa fa-eye\"></em> '.get_lang('MakeUnavailable').'</a></div>";
                     $("#id_content_message").html(sure);
                     $("html, body").animate({ scrollTop: 0 }, 200);
 				}
@@ -182,7 +182,7 @@ 
             SubLanguageManager::make_unavailable_language($language['id']);
         } else {
             if (intval(SubLanguageManager::get_platform_language_id()) !== intval($language['id'])) {
-                $failedDisabledLanguages .= ' - ' .$language['english_name'] . '<br />';
+                $failedDisabledLanguages .= ' - '.$language['english_name'].'<br />';
                 $checkFailed = true;
             }
         }
@@ -213,7 +213,7 @@ 
                 foreach ($_POST['id'] as $index => $id) {
                     $ids[] = intval($id);
                 }
-                $sql = "UPDATE $tbl_admin_languages SET available='1' WHERE id IN ('" . implode("','", $ids) . "')";
+                $sql = "UPDATE $tbl_admin_languages SET available='1' WHERE id IN ('".implode("','", $ids)."')";
                 Database::query($sql);
             }
             break;
@@ -223,7 +223,7 @@ 
                 foreach ($_POST['id'] as $index => $id) {
                     $ids[] = intval($id);
                 }
-                $sql = "UPDATE $tbl_admin_languages SET available='0' WHERE id IN ('" . implode("','", $ids) . "')";
+                $sql = "UPDATE $tbl_admin_languages SET available='0' WHERE id IN ('".implode("','", $ids)."')";
                 Database::query($sql);
             }
             break;
@@ -252,7 +252,7 @@ 
 // displaying the explanation for this tool
 Display::display_normal_message(get_lang('PlatformLanguagesExplanation'));
 
-echo '<a id="disable_all_except_default" href="javascript:void(0)" class="btn btn-primary"><em class="fa fa-eye"></em> ' . get_lang('LanguagesDisableAllExceptDefault') . '</a><br /><br />';
+echo '<a id="disable_all_except_default" href="javascript:void(0)" class="btn btn-primary"><em class="fa fa-eye"></em> '.get_lang('LanguagesDisableAllExceptDefault').'</a><br /><br />';
 
 // selecting all the languages
 $sql_select = "SELECT * FROM $tbl_admin_languages";
@@ -273,8 +273,8 @@ 
             $checked = ' checked="checked" ';
         }
 
-        $row_td[] = '<input type="hidden" name="edit_id" value="' . Security::remove_XSS($_GET['id']) . '" /><input type="text" name="txt_name" value="' . $row['original_name'] . '" /> '
-                . '<input type="checkbox" ' . $checked . 'name="platformlanguage" id="platformlanguage" value="' . $row['english_name'] . '" /><label for="platformlanguage">' . $row['original_name'] . ' ' . get_lang('AsPlatformLanguage') . '</label> <input type="submit" name="Submit" value="' . get_lang('Ok') . '" /><a name="value" />';
+        $row_td[] = '<input type="hidden" name="edit_id" value="'.Security::remove_XSS($_GET['id']).'" /><input type="text" name="txt_name" value="'.$row['original_name'].'" /> '
+                . '<input type="checkbox" '.$checked.'name="platformlanguage" id="platformlanguage" value="'.$row['english_name'].'" /><label for="platformlanguage">'.$row['original_name'].' '.get_lang('AsPlatformLanguage').'</label> <input type="submit" name="Submit" value="'.get_lang('Ok').'" /><a name="value" />';
     } else {
         $row_td[] = $row['original_name'];
     }
@@ -288,7 +288,7 @@ 
     if ($row['english_name'] == $row_lang['selected_value']) {
         $setplatformlanguage = Display::return_icon('languages.png', get_lang('CurrentLanguagesPortal'), '', ICON_SIZE_SMALL);
     } else {
-        $setplatformlanguage = "<a href=\"javascript:if (confirm('" . addslashes(get_lang('AreYouSureYouWantToSetThisLanguageAsThePortalDefault')) . "')) { location.href='" . api_get_self() . "?action=setplatformlanguage&id=" . $row['id'] . "'; }\">" . Display::return_icon('languages_na.png', get_lang('SetLanguageAsDefault'), '', ICON_SIZE_SMALL) . "</a>";
+        $setplatformlanguage = "<a href=\"javascript:if (confirm('".addslashes(get_lang('AreYouSureYouWantToSetThisLanguageAsThePortalDefault'))."')) { location.href='".api_get_self()."?action=setplatformlanguage&id=".$row['id']."'; }\">".Display::return_icon('languages_na.png', get_lang('SetLanguageAsDefault'), '', ICON_SIZE_SMALL)."</a>";
     }
 
     $allow_delete_sub_language = null;
@@ -300,7 +300,7 @@ 
 
         if ($verified_if_is_sub_language === false) {
             $verified_if_is_father = SubLanguageManager::check_if_language_is_father($row['id']);
-            $allow_use_sub_language = "&nbsp;<a href='sub_language_add.php?action=definenewsublanguage&id=" . $row['id'] . "'>" . Display::return_icon('new_language.png', get_lang('CreateSubLanguage'), array(), ICON_SIZE_SMALL) . "</a>";
+            $allow_use_sub_language = "&nbsp;<a href='sub_language_add.php?action=definenewsublanguage&id=".$row['id']."'>".Display::return_icon('new_language.png', get_lang('CreateSubLanguage'), array(), ICON_SIZE_SMALL)."</a>";
             if ($verified_if_is_father === true) {
                 //$allow_add_term_sub_language = "&nbsp;<a href='sub_language.php?action=registersublanguage&id=".$row['id']."'>".Display::return_icon('2rightarrow.png', get_lang('AddWordForTheSubLanguage'),array('width'=>ICON_SIZE_SMALL,'height'=>ICON_SIZE_SMALL))."</a>";
                 $allow_add_term_sub_language = '';
@@ -310,8 +310,8 @@ 
         } else {
             $allow_use_sub_language = '';
             $all_information_of_sub_language = SubLanguageManager::get_all_information_of_language($row['id']);
-            $allow_add_term_sub_language = "&nbsp;<a href='sub_language.php?action=registersublanguage&id=" . Security::remove_XSS($all_information_of_sub_language['parent_id']) . "&sub_language_id=" . Security::remove_XSS($row['id']) . "'>" . Display::return_icon('2rightarrow.png', get_lang('AddWordForTheSubLanguage'), array('width' => ICON_SIZE_SMALL, 'height' => ICON_SIZE_SMALL)) . "</a>";
-            $allow_delete_sub_language = "&nbsp;<a href='sub_language_add.php?action=deletesublanguage&id=" . Security::remove_XSS($all_information_of_sub_language['parent_id']) . "&sub_language_id=" . Security::remove_XSS($row['id']) . "'>" . Display::return_icon('delete.png', get_lang('DeleteSubLanguage'), array('width' => ICON_SIZE_SMALL, 'height' => ICON_SIZE_SMALL)) . "</a>";
+            $allow_add_term_sub_language = "&nbsp;<a href='sub_language.php?action=registersublanguage&id=".Security::remove_XSS($all_information_of_sub_language['parent_id'])."&sub_language_id=".Security::remove_XSS($row['id'])."'>".Display::return_icon('2rightarrow.png', get_lang('AddWordForTheSubLanguage'), array('width' => ICON_SIZE_SMALL, 'height' => ICON_SIZE_SMALL))."</a>";
+            $allow_delete_sub_language = "&nbsp;<a href='sub_language_add.php?action=deletesublanguage&id=".Security::remove_XSS($all_information_of_sub_language['parent_id'])."&sub_language_id=".Security::remove_XSS($row['id'])."'>".Display::return_icon('delete.png', get_lang('DeleteSubLanguage'), array('width' => ICON_SIZE_SMALL, 'height' => ICON_SIZE_SMALL))."</a>";
         }
     } else {
         $allow_use_sub_language = '';
@@ -319,13 +319,13 @@ 
     }
 
     if ($row['english_name'] == $row_lang['selected_value']) {
-        $row_td[] = Display::return_icon('visible.png', get_lang('Visible'))."<a href='" . api_get_self() . "?action=edit&id=" . $row['id'] . "#value'>" . Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL) . "</a>
-                     &nbsp;" . $setplatformlanguage . $allow_use_sub_language . $allow_add_term_sub_language . $allow_delete_sub_language;
+        $row_td[] = Display::return_icon('visible.png', get_lang('Visible'))."<a href='".api_get_self()."?action=edit&id=".$row['id']."#value'>".Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL)."</a>
+                     &nbsp;" . $setplatformlanguage.$allow_use_sub_language.$allow_add_term_sub_language.$allow_delete_sub_language;
     } else {
         if ($row['available'] == 1) {
-            $row_td[] = "<a class=\"make_visible_and_invisible\" id=\"linktool_" . $row['id'] . "\" href='" . api_get_self() . "?action=makeunavailable&id=" . $row['id'] . "'>" . Display::return_icon('visible.png', get_lang('MakeUnavailable'), array('id' => 'imglinktool_' . $row['id']), ICON_SIZE_SMALL) . "</a> <a href='" . api_get_self() . "?action=edit&id=" . $row['id'] . "#value'>" . Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL) . "</a>&nbsp;" . $setplatformlanguage . $allow_use_sub_language . $allow_add_term_sub_language . $allow_delete_sub_language;
+            $row_td[] = "<a class=\"make_visible_and_invisible\" id=\"linktool_".$row['id']."\" href='".api_get_self()."?action=makeunavailable&id=".$row['id']."'>".Display::return_icon('visible.png', get_lang('MakeUnavailable'), array('id' => 'imglinktool_'.$row['id']), ICON_SIZE_SMALL)."</a> <a href='".api_get_self()."?action=edit&id=".$row['id']."#value'>".Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL)."</a>&nbsp;".$setplatformlanguage.$allow_use_sub_language.$allow_add_term_sub_language.$allow_delete_sub_language;
         } else {
-            $row_td[] = "<a class=\"make_visible_and_invisible\" id=\"linktool_" . $row['id'] . "\" href='" . api_get_self() . "?action=makeavailable&id=" . $row['id'] . "'>" . Display::return_icon('invisible.png', get_lang('MakeAvailable'), array('id' => 'imglinktool_' . $row['id']), ICON_SIZE_SMALL) . "</a> <a href='" . api_get_self() . "?action=edit&id=" . $row['id'] . "#value'>" . Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL) . "</a>&nbsp;" . $setplatformlanguage . $allow_use_sub_language . $allow_add_term_sub_language . $allow_delete_sub_language;
+            $row_td[] = "<a class=\"make_visible_and_invisible\" id=\"linktool_".$row['id']."\" href='".api_get_self()."?action=makeavailable&id=".$row['id']."'>".Display::return_icon('invisible.png', get_lang('MakeAvailable'), array('id' => 'imglinktool_'.$row['id']), ICON_SIZE_SMALL)."</a> <a href='".api_get_self()."?action=edit&id=".$row['id']."#value'>".Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL)."</a>&nbsp;".$setplatformlanguage.$allow_use_sub_language.$allow_add_term_sub_language.$allow_delete_sub_language;
         }
     }
     $language_data[] = $row_td;

main/reports/templates/exercicesMultiCourses.reports.php

Indentation +36 added lines, -36 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 
 $reports_template['exercicesMultiCourses'] = array(
-	'description' => 'Result of each test per student',
-	'getSQL' => 'reports_template_exercicesMultiCourses_getSQL',
-	'wizard' =>
+    'description' => 'Result of each test per student',
+    'getSQL' => 'reports_template_exercicesMultiCourses_getSQL',
+    'wizard' =>
 '
 <span id="exercicesMultiCourses" class="step">
 	<span class="font_normal_07em_black">Result of each test per student</span><br />
@@ -32,39 +32,39 @@ 
 ');
 
 function reports_template_exercicesMultiCourses_getSQL() {
-	// foreach quiz
-	$result = array();
-	$columns = Database::query('select r.id as kid, c.title as course, '.
-		'r.child_name as test from '.
-		Database::get_main_table(TABLE_MAIN_REPORTS_KEYS).' r, '.
-		Database::get_main_table(TABLE_MAIN_COURSE).' c '.
-		'where r.course_id=c.id and r.tool_id='.
-		reports_getToolId(TOOL_QUIZ).
-		' order by r.course_id, r.child_name');
-	if (Database::num_rows($columns) == 0)
-		die('<b>'.get_lang('no data found').'</b>');
-	$query = 'select u.lastname Name, u.firstname Firstname';
-	$columns = Database::store_result($columns);
-	if ($_REQUEST['tattempt'] == 'min' || $_REQUEST['tattempt'] == 'max')
-		$function = $_REQUEST['tattempt'];
-	else
-		$function = 'avg';
-	foreach ($columns as $key => $column)
-		$query .= ', '.$function.'(k'.$key.'.score) as `'.
-				$column['course'].' - '.
-				$column['test'].'` ';
-	$query .= ' from '.Database::get_main_table(TABLE_MAIN_USER).' u ';
-	foreach ($columns as $key => $column) // fixme sessions
-		$query .= 'left outer join '.
-			Database::get_main_table(TABLE_MAIN_REPORTS_VALUES).
-			' k'.$key.
-			' on k'.$key.'.key_id = '.$column['kid'].
-				' and k'.$key.'.user_id = u.user_id ';
-	$query .= ' group by ';
-	foreach ($columns as $key => $column) // grouping attempt
-		$query .= 'k'.$key.'.attempt, ';
-	$query = substr($query, 0, -2); // removing last ', ';
+    // foreach quiz
+    $result = array();
+    $columns = Database::query('select r.id as kid, c.title as course, '.
+        'r.child_name as test from '.
+        Database::get_main_table(TABLE_MAIN_REPORTS_KEYS).' r, '.
+        Database::get_main_table(TABLE_MAIN_COURSE).' c '.
+        'where r.course_id=c.id and r.tool_id='.
+        reports_getToolId(TOOL_QUIZ).
+        ' order by r.course_id, r.child_name');
+    if (Database::num_rows($columns) == 0)
+        die('<b>'.get_lang('no data found').'</b>');
+    $query = 'select u.lastname Name, u.firstname Firstname';
+    $columns = Database::store_result($columns);
+    if ($_REQUEST['tattempt'] == 'min' || $_REQUEST['tattempt'] == 'max')
+        $function = $_REQUEST['tattempt'];
+    else
+        $function = 'avg';
+    foreach ($columns as $key => $column)
+        $query .= ', '.$function.'(k'.$key.'.score) as `'.
+                $column['course'].' - '.
+                $column['test'].'` ';
+    $query .= ' from '.Database::get_main_table(TABLE_MAIN_USER).' u ';
+    foreach ($columns as $key => $column) // fixme sessions
+        $query .= 'left outer join '.
+            Database::get_main_table(TABLE_MAIN_REPORTS_VALUES).
+            ' k'.$key.
+            ' on k'.$key.'.key_id = '.$column['kid'].
+                ' and k'.$key.'.user_id = u.user_id ';
+    $query .= ' group by ';
+    foreach ($columns as $key => $column) // grouping attempt
+        $query .= 'k'.$key.'.attempt, ';
+    $query = substr($query, 0, -2); // removing last ', ';
 
 
-	return $query;
+    return $query;
 }

Braces +17 added lines, -10 removed lines

@@ -41,28 +41,35 @@
 		'where r.course_id=c.id and r.tool_id='.
 		reports_getToolId(TOOL_QUIZ).
 		' order by r.course_id, r.child_name');
-	if (Database::num_rows($columns) == 0)
-		die('<b>'.get_lang('no data found').'</b>');
+	if (Database::num_rows($columns) == 0) {
+			die('<b>'.get_lang('no data found').'</b>');
+	}
 	$query = 'select u.lastname Name, u.firstname Firstname';
 	$columns = Database::store_result($columns);
-	if ($_REQUEST['tattempt'] == 'min' || $_REQUEST['tattempt'] == 'max')
-		$function = $_REQUEST['tattempt'];
-	else
-		$function = 'avg';
-	foreach ($columns as $key => $column)
-		$query .= ', '.$function.'(k'.$key.'.score) as `'.
+	if ($_REQUEST['tattempt'] == 'min' || $_REQUEST['tattempt'] == 'max') {
+			$function = $_REQUEST['tattempt'];
+	} else {
+			$function = 'avg';
+	}
+	foreach ($columns as $key => $column) {
+			$query .= ', '.$function.'(k'.$key.'.score) as `'.
 				$column['course'].' - '.
 				$column['test'].'` ';
+	}
 	$query .= ' from '.Database::get_main_table(TABLE_MAIN_USER).' u ';
-	foreach ($columns as $key => $column) // fixme sessions
+	foreach ($columns as $key => $column) {
+	    // fixme sessions
 		$query .= 'left outer join '.
 			Database::get_main_table(TABLE_MAIN_REPORTS_VALUES).
 			' k'.$key.
 			' on k'.$key.'.key_id = '.$column['kid'].
 				' and k'.$key.'.user_id = u.user_id ';
+	}
 	$query .= ' group by ';
-	foreach ($columns as $key => $column) // grouping attempt
+	foreach ($columns as $key => $column) {
+	    // grouping attempt
 		$query .= 'k'.$key.'.attempt, ';
+	}
 	$query = substr($query, 0, -2); // removing last ', ';