chamilo / chamilo-lms

main/inc/lib/geometry.lib.php

Indentation +25 added lines, -25 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 /* For licensing terms, see /license.txt */
 /**
- * @author Arnaud Ligot (CBlue SPRL) <arnaud@cblue.be>
- * @package chamilo.include.geometry
- */
+     * @author Arnaud Ligot (CBlue SPRL) <arnaud@cblue.be>
+     * @package chamilo.include.geometry
+     */
 
 define('DEBUG', false);
 /**
@@ -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])) {
                 break;
             }
 
-            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);
 }
 
 /**

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 (

main/exercice/exercise_submit_modal.php

Indentation +142 added lines, -142 removed lines

@@ -43,13 +43,13 @@ 
 $learnpath_id = 0;
 
 if (isset($_REQUEST['learnpath_id'])) {
-	$learnpath_id = intval($_REQUEST['learnpath_id']);
+    $learnpath_id = intval($_REQUEST['learnpath_id']);
 }
 
 $learnpath_item_id = 0;
 
 if (isset($_REQUEST['learnpath_item_id'])) {
-	$learnpath_item_id = intval($_REQUEST['learnpath_item_id']);
+    $learnpath_item_id = intval($_REQUEST['learnpath_item_id']);
 }
 
 $_SESSION['hotspot_coord']=array();
@@ -93,7 +93,7 @@ 
 // Getting the options by js
 if (empty($choice_value)) {
 
-	echo "<script>
+    echo "<script>
 		// this works for only radio buttons
 		var f = self.parent.window.document.frm_exercise;
 		var choice_js='';
@@ -122,12 +122,12 @@ 
 		}
 
 	";
-	// IMPORTANT
-	//this is the real redirect function
-	//echo 'window.location.href = "exercise_submit_modal.php?learnpath_id='.$learnpath_id.'&learnpath_item_id='.$learnpath_item_id.'&hotspotcoord="+ hotspotcoord + "&hotspot="+ hotspot + "&choice="+ choice_js + "&exerciseId='.$exerciseId.'&num='.$questionNum.'&exerciseType='.$exerciseType.'&origin='.$origin.'&gradebook='.$gradebook.'";';
+    // IMPORTANT
+    //this is the real redirect function
+    //echo 'window.location.href = "exercise_submit_modal.php?learnpath_id='.$learnpath_id.'&learnpath_item_id='.$learnpath_item_id.'&hotspotcoord="+ hotspotcoord + "&hotspot="+ hotspot + "&choice="+ choice_js + "&exerciseId='.$exerciseId.'&num='.$questionNum.'&exerciseType='.$exerciseType.'&origin='.$origin.'&gradebook='.$gradebook.'";';
     echo ' url = "exercise_submit_modal.php?learnpath_id='.$learnpath_id.'&learnpath_item_id='.$learnpath_item_id.'&hotspotcoord="+ hotspotcoord + "&hotspot="+ hotspot + "&choice="+ choice_js + "&exerciseId='.$exerciseId.'&num='.$questionNum.'&exerciseType='.$exerciseType.'&origin='.$origin.'&gradebook='.$gradebook.'";';
     echo "$('#global-modal .modal-body').load(url);";
-	echo '</script>';
+    echo '</script>';
 
     exit;
 }
@@ -180,12 +180,12 @@ 
 
 // creates a temporary Question object
 if (in_array($questionid, $questionList)) {
-	$objQuestionTmp 	= Question :: read($questionid);
-	$questionName		=$objQuestionTmp->selectTitle();
-	$questionDescription=$objQuestionTmp->selectDescription();
-	$questionWeighting	=$objQuestionTmp->selectWeighting();
-	$answerType			=$objQuestionTmp->selectType();
-	$quesId				=$objQuestionTmp->selectId(); //added by priya saini
+    $objQuestionTmp 	= Question :: read($questionid);
+    $questionName		=$objQuestionTmp->selectTitle();
+    $questionDescription=$objQuestionTmp->selectDescription();
+    $questionWeighting	=$objQuestionTmp->selectWeighting();
+    $answerType			=$objQuestionTmp->selectType();
+    $quesId				=$objQuestionTmp->selectId(); //added by priya saini
 }
 
 $objAnswerTmp=new Answer($questionid);
@@ -208,43 +208,43 @@ 
 $totalScore = 0;
 
 if (!empty($choice_value)) {
-	for ($answerId=1;$answerId <= $nbrAnswers;$answerId++) {
-		$answer            = $objAnswerTmp->selectAnswer($answerId);
-		$answerComment     = $objAnswerTmp->selectComment($answerId);
-		$answerDestination = $objAnswerTmp->selectDestination($answerId);
-
-		$answerCorrect     = $objAnswerTmp->isCorrect($answerId);
-		$answerWeighting   = $objAnswerTmp->selectWeighting($answerId);
-		$numAnswer         = $objAnswerTmp->selectAutoId($answerId);
-
-		//delineation
-		$delineation_cord  = $objAnswerTmp->selectHotspotCoordinates(1);
-		$answer_delineation_destination=$objAnswerTmp->selectDestination(1);
+    for ($answerId=1;$answerId <= $nbrAnswers;$answerId++) {
+        $answer            = $objAnswerTmp->selectAnswer($answerId);
+        $answerComment     = $objAnswerTmp->selectComment($answerId);
+        $answerDestination = $objAnswerTmp->selectDestination($answerId);
+
+        $answerCorrect     = $objAnswerTmp->isCorrect($answerId);
+        $answerWeighting   = $objAnswerTmp->selectWeighting($answerId);
+        $numAnswer         = $objAnswerTmp->selectAutoId($answerId);
+
+        //delineation
+        $delineation_cord  = $objAnswerTmp->selectHotspotCoordinates(1);
+        $answer_delineation_destination=$objAnswerTmp->selectDestination(1);
         if ($dbg_local>0) { error_log(__LINE__.' answerId: '.$answerId.'('.$answerType.') - user delineation_cord: '.$delineation_cord.' - $answer_delineation_destination: '.$answer_delineation_destination,0);}
 
-		switch($answerType) {
-			// for unique answer
-			case UNIQUE_ANSWER :
-				$studentChoice = ($choice_value == $numAnswer)?1:0;
-				if ($studentChoice) {
-					$questionScore	+=$answerWeighting;
-					$totalScore		+=$answerWeighting;
-					$newquestionList[]=$questionid;
-				}
-				break;
-			case HOT_SPOT_DELINEATION :
-			    $studentChoice=$choice[$answerId];
-				if ($studentChoice) {
-					$newquestionList[]=$questionid;
-				}
-				if ($answerId===1) {
-					$questionScore	+=$answerWeighting;
-					$totalScore		+=$answerWeighting;
-					$_SESSION['hotspot_coord'][1]	=$delineation_cord;
-					$_SESSION['hotspot_dest'][1]	=$answer_delineation_destination;
-				}
-				break;
-		}
+        switch($answerType) {
+            // for unique answer
+            case UNIQUE_ANSWER :
+                $studentChoice = ($choice_value == $numAnswer)?1:0;
+                if ($studentChoice) {
+                    $questionScore	+=$answerWeighting;
+                    $totalScore		+=$answerWeighting;
+                    $newquestionList[]=$questionid;
+                }
+                break;
+            case HOT_SPOT_DELINEATION :
+                $studentChoice=$choice[$answerId];
+                if ($studentChoice) {
+                    $newquestionList[]=$questionid;
+                }
+                if ($answerId===1) {
+                    $questionScore	+=$answerWeighting;
+                    $totalScore		+=$answerWeighting;
+                    $_SESSION['hotspot_coord'][1]	=$delineation_cord;
+                    $_SESSION['hotspot_dest'][1]	=$answer_delineation_destination;
+                }
+                break;
+        }
 
 
         if ($answerType == UNIQUE_ANSWER || $answerType == MULTIPLE_ANSWER) {
@@ -341,7 +341,7 @@ 
                         $lp_hotspot=$destination_items[2];
                         $select_question_hotspot=$destination_items[3];
                         $url_hotspot=$destination_items[4];
-                         //echo 'show the feedback';
+                            //echo 'show the feedback';
                     }
                 } elseif($answerId>1) {
                     if ($objAnswerTmp->selectHotspotType($answerId) == 'noerror') {
@@ -398,41 +398,41 @@ 
                 //we send the error
             }
         }
-	}
+    }
 
-	if ($overlap_color) {
-		$overlap_color='green';
+    if ($overlap_color) {
+        $overlap_color='green';
     } else {
-		$overlap_color='red';
+        $overlap_color='red';
     }
-	if ($missing_color) {
-		$missing_color='green';
+    if ($missing_color) {
+        $missing_color='green';
     } else {
-		$missing_color='red';
+        $missing_color='red';
     }
-	if ($excess_color) {
-		$excess_color='green';
+    if ($excess_color) {
+        $excess_color='green';
     } else {
-		$excess_color='red';
+        $excess_color='red';
     }
 
     if (!is_numeric($final_overlap)) {
-    	$final_overlap = 0;
+        $final_overlap = 0;
     }
 
     if (!is_numeric($final_missing)) {
-    	$final_missing = 0;
+        $final_missing = 0;
     }
     if (!is_numeric($final_excess)) {
-    	$final_excess = 0;
+        $final_excess = 0;
     }
 
     if ($final_excess>100) {
-    	$final_excess = 100;
+        $final_excess = 100;
     }
 
 
-	$table_resume = '<table class="data_table" >
+    $table_resume = '<table class="data_table" >
 	<tr class="row_odd" >
 		<td></td>
 		<td ><b>'.get_lang('Requirements').'</b></td>
@@ -457,7 +457,7 @@ 
 		<td><div style="color:'.$missing_color.'">'.(($final_missing < 0)?0:intval($final_missing)).'</div></td>
 	</tr>
 	</table>';
-	//var_dump($final_overlap, $threadhold1 , $final_missing, $threadhold2 , $final_excess, $threadhold3);
+    //var_dump($final_overlap, $threadhold1 , $final_missing, $threadhold2 , $final_excess, $threadhold3);
 }
 $_SESSION['newquestionList'] = $newquestionList;
 
@@ -474,68 +474,68 @@ 
 if ($answerType != HOT_SPOT_DELINEATION) {
     if (!empty($destination)) {
         $item_list = explode('@@',$destination);
-    	//print_R($item_list);
-    	$try = $item_list[0];
-    	$lp = $item_list[1];
-    	$destinationid= $item_list[2];
-    	$url=$item_list[3];
+        //print_R($item_list);
+        $try = $item_list[0];
+        $lp = $item_list[1];
+        $destinationid= $item_list[2];
+        $url=$item_list[3];
     }
-	$table_resume='';
+    $table_resume='';
 } else {
-		$try = $try_hotspot;
-		$lp = $lp_hotspot;
-		$destinationid= $select_question_hotspot;
-		$url=$url_hotspot;
-	if ($organs_at_risk_hit==0 && $wrong_results==false ) {
-		// no error = no oar and no wrong result for delineation
-		//show if no error
-		//echo 'no error';
-		$comment= $answerComment = $objAnswerTmp->selectComment($nbrAnswers);
-		$answerDestination		 = $objAnswerTmp->selectDestination($nbrAnswers);
-
-		//we send the error
-		$destination_items= explode('@@', $answerDestination);
-		$try=$destination_items[1];
-		$lp=$destination_items[2];
-		$destinationid=$destination_items[3];
-		$url=$destination_items[4];
-		$exerciseResult[$questionid] = 1;
-	} else {
-		$exerciseResult[$questionid] = 0;
-	}
+        $try = $try_hotspot;
+        $lp = $lp_hotspot;
+        $destinationid= $select_question_hotspot;
+        $url=$url_hotspot;
+    if ($organs_at_risk_hit==0 && $wrong_results==false ) {
+        // no error = no oar and no wrong result for delineation
+        //show if no error
+        //echo 'no error';
+        $comment= $answerComment = $objAnswerTmp->selectComment($nbrAnswers);
+        $answerDestination		 = $objAnswerTmp->selectDestination($nbrAnswers);
+
+        //we send the error
+        $destination_items= explode('@@', $answerDestination);
+        $try=$destination_items[1];
+        $lp=$destination_items[2];
+        $destinationid=$destination_items[3];
+        $url=$destination_items[4];
+        $exerciseResult[$questionid] = 1;
+    } else {
+        $exerciseResult[$questionid] = 0;
+    }
 }
 
 // the link to retry the question
 if (isset($try) && $try==1) {
-	$num_value_array= (array_keys($questionList, $questionid));
-	$links.= Display :: return_icon('reload.gif', '', array ('style' => 'padding-left:0px;padding-right:5px;')).'<a onclick="SendEx('.$num_value_array[0].');" href="#">'.get_lang('TryAgain').'</a><br /><br />';
+    $num_value_array= (array_keys($questionList, $questionid));
+    $links.= Display :: return_icon('reload.gif', '', array ('style' => 'padding-left:0px;padding-right:5px;')).'<a onclick="SendEx('.$num_value_array[0].');" href="#">'.get_lang('TryAgain').'</a><br /><br />';
 }
 
 // the link to theory (a learning path)
 if (!empty($lp)) {
-	$lp_url= api_get_path(WEB_CODE_PATH).'newscorm/lp_controller.php?'.api_get_cidreq().'&action=view&lp_id='.$lp;
-	$list = new LearnpathList(api_get_user_id());
-	$flat_list = $list->get_flat_list();
-	$links.= Display :: return_icon('theory.gif', '', array ('style' => 'padding-left:0px;padding-right:5px;')).'<a target="_blank" href="'.$lp_url.'">'.get_lang('SeeTheory').'</a><br />';
+    $lp_url= api_get_path(WEB_CODE_PATH).'newscorm/lp_controller.php?'.api_get_cidreq().'&action=view&lp_id='.$lp;
+    $list = new LearnpathList(api_get_user_id());
+    $flat_list = $list->get_flat_list();
+    $links.= Display :: return_icon('theory.gif', '', array ('style' => 'padding-left:0px;padding-right:5px;')).'<a target="_blank" href="'.$lp_url.'">'.get_lang('SeeTheory').'</a><br />';
 }
 $links.='<br />';
 
 // the link to an external website or link
 if (!empty($url)) {
-	$links.= Display :: return_icon('link.gif', '', array ('style' => 'padding-left:0px;padding-right:5px;')).'<a target="_blank" href="'.$url.'">'.get_lang('VisitUrl').'</a><br /><br />';
+    $links.= Display :: return_icon('link.gif', '', array ('style' => 'padding-left:0px;padding-right:5px;')).'<a target="_blank" href="'.$url.'">'.get_lang('VisitUrl').'</a><br /><br />';
 }
 
 // the link to finish the test
 if ($destinationid==-1) {
-	$links.= Display :: return_icon('finish.gif', '', array ('style' => 'width:22px; height:22px; padding-left:0px;padding-right:5px;')).'<a onclick="SendEx(-1);" href="#">'.get_lang('EndActivity').'</a><br /><br />';
+    $links.= Display :: return_icon('finish.gif', '', array ('style' => 'width:22px; height:22px; padding-left:0px;padding-right:5px;')).'<a onclick="SendEx(-1);" href="#">'.get_lang('EndActivity').'</a><br /><br />';
 } else {
-	// the link to other question
-	if (in_array($destinationid,$questionList)) {
-		$objQuestionTmp = Question :: read($destinationid);
-		$questionName=$objQuestionTmp->selectTitle();
-		$num_value_array= (array_keys($questionList, $destinationid));
-		$links.= Display :: return_icon('quiz.gif', '', array ('style' => 'padding-left:0px;padding-right:5px;')).'<a onclick="SendEx('.$num_value_array[0].');" href="#">'.get_lang('GoToQuestion').' '.$num_value_array[0].'</a><br /><br />';
-	}
+    // the link to other question
+    if (in_array($destinationid,$questionList)) {
+        $objQuestionTmp = Question :: read($destinationid);
+        $questionName=$objQuestionTmp->selectTitle();
+        $num_value_array= (array_keys($questionList, $destinationid));
+        $links.= Display :: return_icon('quiz.gif', '', array ('style' => 'padding-left:0px;padding-right:5px;')).'<a onclick="SendEx('.$num_value_array[0].');" href="#">'.get_lang('GoToQuestion').' '.$num_value_array[0].'</a><br /><br />';
+    }
 }
 
 echo '<script>
@@ -552,43 +552,43 @@ 
 </script>';
 
 if ($links!='') {
-	/*echo '<div id="ModalContent" style="padding-bottom:30px;padding-top:10px;padding-left:20px;padding-right:20px;">
+    /*echo '<div id="ModalContent" style="padding-bottom:30px;padding-top:10px;padding-left:20px;padding-right:20px;">
     <a onclick="self.parent.tb_remove();" href="#" style="float:right; margin-top:-10px;">'.api_ucfirst(get_lang('Close')).'</a>';*/
-	echo '<h1><div style="color:#333;">'.get_lang('Feedback').'</div></h1>';
-
-	if ($answerType == HOT_SPOT_DELINEATION) {
-		if ($organs_at_risk_hit > 0) {
-			//$message='<p>'.get_lang('YourDelineation').'</p>';
-			//$message.=$table_resume;
-			$message.='<br />'.get_lang('ResultIs').' <b>'.get_lang('Unacceptable').'</b><br />';
-			//if ($wrong_results) { }
-			$message.='<p style="color:#DC0A0A;"><b>'.get_lang('OARHit').'</b></p>';
-			$message.='<p>'.$comment.'</p>';
-		} else {
-			$message='<p>'.get_lang('YourDelineation').'</p>';
-			$message.=$table_resume;
-			$message.='<br />'.get_lang('ResultIs').' <b>'.$result_comment.'</b><br />';
-			$message.='<p>'.$comment.'</p>';
-		}
-		echo $message;
-	} else {
-		echo '<p>'.$comment.'</p>';
-	}
-	echo '<h3>'.$links.'</h3>';
-	echo '</div>';
-
-	$_SESSION['hot_spot_result']=$message;
-	$_SESSION['hotspot_delineation_result'][$exerciseId][$questionid] = array($message, $exerciseResult[$questionid]);
-	//reseting the exerciseResult variable
-	Session::write('exerciseResult',$exerciseResult);
-
-	//save this variables just in case the exercise loads an LP with other exercise
-	$_SESSION['objExerciseExtra'.$exerciseId] 	 = $_SESSION['objExercise'];
-	$_SESSION['exerciseResultExtra'.$exerciseId] = $_SESSION['exerciseResult'];
-	$_SESSION['questionListExtra'.$exerciseId]	 = $_SESSION['questionList'];
+    echo '<h1><div style="color:#333;">'.get_lang('Feedback').'</div></h1>';
+
+    if ($answerType == HOT_SPOT_DELINEATION) {
+        if ($organs_at_risk_hit > 0) {
+            //$message='<p>'.get_lang('YourDelineation').'</p>';
+            //$message.=$table_resume;
+            $message.='<br />'.get_lang('ResultIs').' <b>'.get_lang('Unacceptable').'</b><br />';
+            //if ($wrong_results) { }
+            $message.='<p style="color:#DC0A0A;"><b>'.get_lang('OARHit').'</b></p>';
+            $message.='<p>'.$comment.'</p>';
+        } else {
+            $message='<p>'.get_lang('YourDelineation').'</p>';
+            $message.=$table_resume;
+            $message.='<br />'.get_lang('ResultIs').' <b>'.$result_comment.'</b><br />';
+            $message.='<p>'.$comment.'</p>';
+        }
+        echo $message;
+    } else {
+        echo '<p>'.$comment.'</p>';
+    }
+    echo '<h3>'.$links.'</h3>';
+    echo '</div>';
+
+    $_SESSION['hot_spot_result']=$message;
+    $_SESSION['hotspot_delineation_result'][$exerciseId][$questionid] = array($message, $exerciseResult[$questionid]);
+    //reseting the exerciseResult variable
+    Session::write('exerciseResult',$exerciseResult);
+
+    //save this variables just in case the exercise loads an LP with other exercise
+    $_SESSION['objExerciseExtra'.$exerciseId] 	 = $_SESSION['objExercise'];
+    $_SESSION['exerciseResultExtra'.$exerciseId] = $_SESSION['exerciseResult'];
+    $_SESSION['questionListExtra'.$exerciseId]	 = $_SESSION['questionList'];
 } else {
-	$questionNum++;
-	echo '<script>
+    $questionNum++;
+    echo '<script>
 			self.parent.window.location.href = "exercise_submit.php?exerciseId='.$exerciseId.'&num='.$questionNum.'&exerciseType='.$exerciseType.'&origin='.$origin.'";
    			//self.parent.tb_remove();
  	 	</script>';

Spacing +136 added lines, -136 removed lines

@@ -52,9 +52,9 @@ 
 	$learnpath_item_id = intval($_REQUEST['learnpath_item_id']);
 }
 
-$_SESSION['hotspot_coord']=array();
-$newquestionList= isset($_SESSION['newquestionList']) ? $_SESSION['newquestionList'] : [];
-$questionList 	= $_SESSION['questionList'];
+$_SESSION['hotspot_coord'] = array();
+$newquestionList = isset($_SESSION['newquestionList']) ? $_SESSION['newquestionList'] : [];
+$questionList = $_SESSION['questionList'];
 
 $exerciseId		= intval($_GET['exerciseId']);
 $exerciseType	= intval($_GET['exerciseType']);
@@ -84,9 +84,9 @@ 
 
 $choice_value = '';
 
-$user_array = substr($user_array,0,-1);
+$user_array = substr($user_array, 0, -1);
 
-if (isset($_GET['choice'])){
+if (isset($_GET['choice'])) {
     $choice_value = intval($_GET['choice']);
 }
 
@@ -133,7 +133,7 @@ 
 }
 
 $choice = array();
-$questionid= $questionList[$questionNum];
+$questionid = $questionList[$questionNum];
 // $choice_value => value of the user selection
 $choice[$questionid] = isset($choice_value) ? $choice_value : null;
 
@@ -150,11 +150,11 @@ 
         $exerciseResult = $choice;
     } else {
         // gets the question ID from $choice. It is the key of the array
-        list($key)=array_keys($choice);
+        list($key) = array_keys($choice);
         // if the user didn't already answer this question
-        if(!isset($exerciseResult[$key])) {
+        if (!isset($exerciseResult[$key])) {
             // stores the user answer into the array
-            $exerciseResult[$key]=$choice[$key];
+            $exerciseResult[$key] = $choice[$key];
         }
     }
 }
@@ -180,26 +180,26 @@ 
 
 // creates a temporary Question object
 if (in_array($questionid, $questionList)) {
-	$objQuestionTmp 	= Question :: read($questionid);
-	$questionName		=$objQuestionTmp->selectTitle();
-	$questionDescription=$objQuestionTmp->selectDescription();
-	$questionWeighting	=$objQuestionTmp->selectWeighting();
-	$answerType			=$objQuestionTmp->selectType();
-	$quesId				=$objQuestionTmp->selectId(); //added by priya saini
+	$objQuestionTmp = Question :: read($questionid);
+	$questionName = $objQuestionTmp->selectTitle();
+	$questionDescription = $objQuestionTmp->selectDescription();
+	$questionWeighting = $objQuestionTmp->selectWeighting();
+	$answerType = $objQuestionTmp->selectType();
+	$quesId = $objQuestionTmp->selectId(); //added by priya saini
 }
 
-$objAnswerTmp=new Answer($questionid);
-$nbrAnswers=$objAnswerTmp->selectNbrAnswers();
+$objAnswerTmp = new Answer($questionid);
+$nbrAnswers = $objAnswerTmp->selectNbrAnswers();
 //echo 'answe_type '.$answerType;echo '<br />';
 
 $choice = $exerciseResult[$questionid];
-$destination=array();
-$comment='';
-$next=1;
+$destination = array();
+$comment = '';
+$next = 1;
 $_SESSION['hotspot_coord'] = array();
 $_SESSION['hotspot_dest'] = array();
 
-$overlap_color = $missing_color = $excess_color=false;
+$overlap_color = $missing_color = $excess_color = false;
 $organs_at_risk_hit = 0;
 $wrong_results = false;
 $hot_spot_load = false;
@@ -208,7 +208,7 @@ 
 $totalScore = 0;
 
 if (!empty($choice_value)) {
-	for ($answerId=1;$answerId <= $nbrAnswers;$answerId++) {
+	for ($answerId = 1; $answerId <= $nbrAnswers; $answerId++) {
 		$answer            = $objAnswerTmp->selectAnswer($answerId);
 		$answerComment     = $objAnswerTmp->selectComment($answerId);
 		$answerDestination = $objAnswerTmp->selectDestination($answerId);
@@ -219,29 +219,29 @@ 
 
 		//delineation
 		$delineation_cord  = $objAnswerTmp->selectHotspotCoordinates(1);
-		$answer_delineation_destination=$objAnswerTmp->selectDestination(1);
-        if ($dbg_local>0) { error_log(__LINE__.' answerId: '.$answerId.'('.$answerType.') - user delineation_cord: '.$delineation_cord.' - $answer_delineation_destination: '.$answer_delineation_destination,0);}
+		$answer_delineation_destination = $objAnswerTmp->selectDestination(1);
+        if ($dbg_local > 0) { error_log(__LINE__.' answerId: '.$answerId.'('.$answerType.') - user delineation_cord: '.$delineation_cord.' - $answer_delineation_destination: '.$answer_delineation_destination, 0); }
 
-		switch($answerType) {
+		switch ($answerType) {
 			// for unique answer
 			case UNIQUE_ANSWER :
-				$studentChoice = ($choice_value == $numAnswer)?1:0;
+				$studentChoice = ($choice_value == $numAnswer) ? 1 : 0;
 				if ($studentChoice) {
-					$questionScore	+=$answerWeighting;
-					$totalScore		+=$answerWeighting;
-					$newquestionList[]=$questionid;
+					$questionScore += $answerWeighting;
+					$totalScore		+= $answerWeighting;
+					$newquestionList[] = $questionid;
 				}
 				break;
 			case HOT_SPOT_DELINEATION :
-			    $studentChoice=$choice[$answerId];
+			    $studentChoice = $choice[$answerId];
 				if ($studentChoice) {
-					$newquestionList[]=$questionid;
+					$newquestionList[] = $questionid;
 				}
-				if ($answerId===1) {
-					$questionScore	+=$answerWeighting;
-					$totalScore		+=$answerWeighting;
-					$_SESSION['hotspot_coord'][1]	=$delineation_cord;
-					$_SESSION['hotspot_dest'][1]	=$answer_delineation_destination;
+				if ($answerId === 1) {
+					$questionScore += $answerWeighting;
+					$totalScore += $answerWeighting;
+					$_SESSION['hotspot_coord'][1] = $delineation_cord;
+					$_SESSION['hotspot_dest'][1] = $answer_delineation_destination;
 				}
 				break;
 		}
@@ -253,27 +253,27 @@ 
                 $destination = $answerDestination;
                 $comment = $answerComment;
             }
-        } elseif($answerType == HOT_SPOT_DELINEATION) {
+        } elseif ($answerType == HOT_SPOT_DELINEATION) {
             if ($next) {
-                if ($dbg_local>0) { error_log(__LINE__.' - next',0);}
+                if ($dbg_local > 0) { error_log(__LINE__.' - next', 0); }
                 $hot_spot_load = true; //apparently the script is called twice
                 $user_answer = $user_array;
-                $_SESSION['exerciseResultCoordinates'][$questionid]=$user_answer; //needed for exercise_result.php
+                $_SESSION['exerciseResultCoordinates'][$questionid] = $user_answer; //needed for exercise_result.php
 
                 // we compare only the delineation not the other points
-                $answer_question	= $_SESSION['hotspot_coord'][1];
-                $answerDestination	= $_SESSION['hotspot_dest'][1];
+                $answer_question = $_SESSION['hotspot_coord'][1];
+                $answerDestination = $_SESSION['hotspot_dest'][1];
 
-                $poly_user 				= convert_coordinates($user_answer,'/');
-                $poly_answer 			= convert_coordinates($answer_question,'|');
-                $max_coord 				= poly_get_max($poly_user,$poly_answer);
+                $poly_user 				= convert_coordinates($user_answer, '/');
+                $poly_answer = convert_coordinates($answer_question, '|');
+                $max_coord 				= poly_get_max($poly_user, $poly_answer);
 
                 if (empty($_GET['hotspot'])) { //no user response
                     $overlap = -2;
                 } else {
-                    $poly_user_compiled 	= poly_compile($poly_user,$max_coord);
-                    $poly_answer_compiled 	= poly_compile($poly_answer,$max_coord);
-                    $poly_results 			= poly_result($poly_answer_compiled,$poly_user_compiled,$max_coord);
+                    $poly_user_compiled = poly_compile($poly_user, $max_coord);
+                    $poly_answer_compiled = poly_compile($poly_answer, $max_coord);
+                    $poly_results = poly_result($poly_answer_compiled, $poly_user_compiled, $max_coord);
 
                     $overlap = $poly_results['both'];
                     $poly_answer_area = $poly_results['s1'];
@@ -283,7 +283,7 @@ 
                 }
 
                 //$overlap = round(polygons_overlap($poly_answer,$poly_user)); //this is an area in pixels
-                if ($dbg_local>0) { error_log(__LINE__.' - Polygons results are '.print_r($poly_results,1),0);}
+                if ($dbg_local > 0) { error_log(__LINE__.' - Polygons results are '.print_r($poly_results, 1), 0); }
                 if ($overlap < 1) {
                     //shortcut to avoid complicated calculations
                     $final_overlap = 0;
@@ -291,27 +291,27 @@ 
                     $final_excess  = 100;
                 } else {
                     // the final overlap is the percentage of the initial polygon that is overlapped by the user's polygon
-                    $final_overlap = round(((float)$overlap / (float)$poly_answer_area)*100);
-                    if ($dbg_local>1) { error_log(__LINE__.' - Final overlap is '.$final_overlap,0);}
+                    $final_overlap = round(((float) $overlap / (float) $poly_answer_area) * 100);
+                    if ($dbg_local > 1) { error_log(__LINE__.' - Final overlap is '.$final_overlap, 0); }
                     // the final missing area is the percentage of the initial polygon that is not overlapped by the user's polygon
                     $final_missing = 100 - $final_overlap;
-                    if ($dbg_local>1) { error_log(__LINE__.' - Final missing is '.$final_missing,0);}
+                    if ($dbg_local > 1) { error_log(__LINE__.' - Final missing is '.$final_missing, 0); }
                     // the final excess area is the percentage of the initial polygon's size that is covered by the user's polygon outside of the initial polygon
-                    $final_excess = round((((float)$poly_user_area-(float)$overlap)/(float)$poly_answer_area)*100);
-                    if ($dbg_local>1) { error_log(__LINE__.' - Final excess is '.$final_excess,0);}
+                    $final_excess = round((((float) $poly_user_area - (float) $overlap) / (float) $poly_answer_area) * 100);
+                    if ($dbg_local > 1) { error_log(__LINE__.' - Final excess is '.$final_excess, 0); }
                 }
 
-                $destination_items= explode('@@', $answerDestination);
+                $destination_items = explode('@@', $answerDestination);
                 $threadhold_total = $destination_items[0];
-                $threadhold_items=explode(';',$threadhold_total);
+                $threadhold_items = explode(';', $threadhold_total);
                 $threadhold1 = $threadhold_items[0]; // overlap
                 $threadhold2 = $threadhold_items[1]; // excess
-                $threadhold3 = $threadhold_items[2];	 //missing
+                $threadhold3 = $threadhold_items[2]; //missing
 
                 // echo $final_overlap.'  '.$threadhold1 .' - '. $final_missing.' '. $threadhold2 .' - '. $final_excess.'  '. $threadhold3;
 
                 // if is delineation
-                if ($answerId===1) {
+                if ($answerId === 1) {
                     //setting colors
                     if ($final_overlap >= $threadhold1) {
                         $overlap_color = true; //echo 'a';
@@ -327,40 +327,40 @@ 
 
                     // if pass
                     //if ($final_overlap>=$threadhold1 && $final_missing<=$threadhold2 && $final_excess<=$threadhold3) {
-                    if ($final_overlap>=$threadhold1 && $final_missing<=$threadhold3 && $final_excess<=$threadhold2) {
-                        $next=1; //go to the oars
-                        $result_comment=get_lang('Acceptable');
+                    if ($final_overlap >= $threadhold1 && $final_missing <= $threadhold3 && $final_excess <= $threadhold2) {
+                        $next = 1; //go to the oars
+                        $result_comment = get_lang('Acceptable');
                     } else {
-                        $next=1; //Go to the oars. If $next =  0 we will show this message: "One (or more) area at risk has been hit" instead of the table resume with the results
+                        $next = 1; //Go to the oars. If $next =  0 we will show this message: "One (or more) area at risk has been hit" instead of the table resume with the results
                         $wrong_results = true;
-                        $result_comment=get_lang('Unacceptable');
-                        $special_comment = $comment=$answerDestination=$objAnswerTmp->selectComment(1);
-                        $answerDestination=$objAnswerTmp->selectDestination(1);
-                        $destination_items= explode('@@', $answerDestination);
-                        $try_hotspot=$destination_items[1];
-                        $lp_hotspot=$destination_items[2];
-                        $select_question_hotspot=$destination_items[3];
-                        $url_hotspot=$destination_items[4];
+                        $result_comment = get_lang('Unacceptable');
+                        $special_comment = $comment = $answerDestination = $objAnswerTmp->selectComment(1);
+                        $answerDestination = $objAnswerTmp->selectDestination(1);
+                        $destination_items = explode('@@', $answerDestination);
+                        $try_hotspot = $destination_items[1];
+                        $lp_hotspot = $destination_items[2];
+                        $select_question_hotspot = $destination_items[3];
+                        $url_hotspot = $destination_items[4];
                          //echo 'show the feedback';
                     }
-                } elseif($answerId>1) {
+                } elseif ($answerId > 1) {
                     if ($objAnswerTmp->selectHotspotType($answerId) == 'noerror') {
-                        if ($dbg_local>0) { error_log(__LINE__.' - answerId is of type noerror',0);}
+                        if ($dbg_local > 0) { error_log(__LINE__.' - answerId is of type noerror', 0); }
                         //type no error shouldn't be treated
                         $next = 1;
                         continue;
                     }
-                    if ($dbg_local>0) { error_log(__LINE__.' - answerId is >1 so we\'re probably in OAR',0);}
+                    if ($dbg_local > 0) { error_log(__LINE__.' - answerId is >1 so we\'re probably in OAR', 0); }
                     //check the intersection between the oar and the user
                     //echo 'user';	print_r($x_user_list);		print_r($y_user_list);
                     //echo 'official';print_r($x_list);print_r($y_list);
                     //$result = get_intersection_data($x_list,$y_list,$x_user_list,$y_user_list);
 
                     //$delineation_cord=$objAnswerTmp->selectHotspotCoordinates($answerId);
-                    $delineation_cord=$objAnswerTmp->selectHotspotCoordinates($answerId); //getting the oars coordinates
+                    $delineation_cord = $objAnswerTmp->selectHotspotCoordinates($answerId); //getting the oars coordinates
 
-                    $poly_answer 			= convert_coordinates($delineation_cord,'|');
-                    $max_coord 				= poly_get_max($poly_user,$poly_answer); //getting max coordinates
+                    $poly_answer = convert_coordinates($delineation_cord, '|');
+                    $max_coord = poly_get_max($poly_user, $poly_answer); //getting max coordinates
                     $test = false;
                     // if ($answerId == 2 ){$test = true;} for test oars
 
@@ -368,9 +368,9 @@ 
                         $overlap = false;
                     } else {
                         //	poly_compile really works tested with gnuplot
-                        $poly_user_compiled	  	= poly_compile($poly_user,$max_coord,$test);//$poly_user is already set when answerid = 1
-                        $poly_answer_compiled 	= poly_compile($poly_answer,$max_coord,$test);
-                        $overlap 			  	= poly_touch($poly_user_compiled, $poly_answer_compiled,$max_coord);
+                        $poly_user_compiled	  	= poly_compile($poly_user, $max_coord, $test); //$poly_user is already set when answerid = 1
+                        $poly_answer_compiled 	= poly_compile($poly_answer, $max_coord, $test);
+                        $overlap = poly_touch($poly_user_compiled, $poly_answer_compiled, $max_coord);
                     }
 
                     if ($overlap == false) {
@@ -378,42 +378,42 @@ 
                         $next = 1;
                         continue;
                     } else {
-                        if ($dbg_local>0) { error_log(__LINE__.' - Overlap is '.$overlap.': OAR hit',0);}
+                        if ($dbg_local > 0) { error_log(__LINE__.' - Overlap is '.$overlap.': OAR hit', 0); }
 
                         $organs_at_risk_hit++;
                         //show the feedback
-                        $next=1;
-                        $comment=$answerDestination=$objAnswerTmp->selectComment($answerId);
-                        $answerDestination=$objAnswerTmp->selectDestination($answerId);
-                        $destination_items= explode('@@', $answerDestination);
-                        $try_hotspot=$destination_items[1];
-                        $lp_hotspot=$destination_items[2];
-                        $select_question_hotspot=$destination_items[3];
-                        $url_hotspot=$destination_items[4];
+                        $next = 1;
+                        $comment = $answerDestination = $objAnswerTmp->selectComment($answerId);
+                        $answerDestination = $objAnswerTmp->selectDestination($answerId);
+                        $destination_items = explode('@@', $answerDestination);
+                        $try_hotspot = $destination_items[1];
+                        $lp_hotspot = $destination_items[2];
+                        $select_question_hotspot = $destination_items[3];
+                        $url_hotspot = $destination_items[4];
                     }
                 }
             } else {
                 // the first delineation feedback
-                if ($dbg_local>0) { error_log(__LINE__.' first',0);}
+                if ($dbg_local > 0) { error_log(__LINE__.' first', 0); }
                 //we send the error
             }
         }
 	}
 
 	if ($overlap_color) {
-		$overlap_color='green';
+		$overlap_color = 'green';
     } else {
-		$overlap_color='red';
+		$overlap_color = 'red';
     }
 	if ($missing_color) {
-		$missing_color='green';
+		$missing_color = 'green';
     } else {
-		$missing_color='red';
+		$missing_color = 'red';
     }
 	if ($excess_color) {
-		$excess_color='green';
+		$excess_color = 'green';
     } else {
-		$excess_color='red';
+		$excess_color = 'red';
     }
 
     if (!is_numeric($final_overlap)) {
@@ -427,7 +427,7 @@ 
     	$final_excess = 0;
     }
 
-    if ($final_excess>100) {
+    if ($final_excess > 100) {
     	$final_excess = 100;
     }
 
@@ -442,26 +442,26 @@ 
 	<tr class="row_even">
 		<td><b>'.get_lang('Overlap').'</b></td>
 		<td>'.get_lang('Min').' '.$threadhold1.'</td>
-		<td><div style="color:'.$overlap_color.'">'.(($final_overlap < 0)?0:intval($final_overlap)).'</div></td>
+		<td><div style="color:'.$overlap_color.'">'.(($final_overlap < 0) ? 0 : intval($final_overlap)).'</div></td>
 	</tr>
 
 	<tr>
 		<td><b>'.get_lang('Excess').'</b></td>
 		<td>'.get_lang('Max').' '.$threadhold2.'</td>
-		<td><div style="color:'.$excess_color.'">'.(($final_excess < 0)?0:intval($final_excess)).'</div></td>
+		<td><div style="color:'.$excess_color.'">'.(($final_excess < 0) ? 0 : intval($final_excess)).'</div></td>
 	</tr>
 
 	<tr class="row_even">
 		<td><b>'.get_lang('Missing').'</b></td>
 		<td>'.get_lang('Max').' '.$threadhold3.'</td>
-		<td><div style="color:'.$missing_color.'">'.(($final_missing < 0)?0:intval($final_missing)).'</div></td>
+		<td><div style="color:'.$missing_color.'">'.(($final_missing < 0) ? 0 : intval($final_missing)).'</div></td>
 	</tr>
 	</table>';
 	//var_dump($final_overlap, $threadhold1 , $final_missing, $threadhold2 , $final_excess, $threadhold3);
 }
 $_SESSION['newquestionList'] = $newquestionList;
 
-$links='';
+$links = '';
 
 if (isset($choice_value) && $choice_value == -1) {
     if ($answerType != HOT_SPOT_DELINEATION) {
@@ -473,32 +473,32 @@ 
 
 if ($answerType != HOT_SPOT_DELINEATION) {
     if (!empty($destination)) {
-        $item_list = explode('@@',$destination);
+        $item_list = explode('@@', $destination);
     	//print_R($item_list);
     	$try = $item_list[0];
     	$lp = $item_list[1];
-    	$destinationid= $item_list[2];
-    	$url=$item_list[3];
+    	$destinationid = $item_list[2];
+    	$url = $item_list[3];
     }
-	$table_resume='';
+	$table_resume = '';
 } else {
 		$try = $try_hotspot;
 		$lp = $lp_hotspot;
-		$destinationid= $select_question_hotspot;
-		$url=$url_hotspot;
-	if ($organs_at_risk_hit==0 && $wrong_results==false ) {
+		$destinationid = $select_question_hotspot;
+		$url = $url_hotspot;
+	if ($organs_at_risk_hit == 0 && $wrong_results == false) {
 		// no error = no oar and no wrong result for delineation
 		//show if no error
 		//echo 'no error';
-		$comment= $answerComment = $objAnswerTmp->selectComment($nbrAnswers);
-		$answerDestination		 = $objAnswerTmp->selectDestination($nbrAnswers);
+		$comment = $answerComment = $objAnswerTmp->selectComment($nbrAnswers);
+		$answerDestination = $objAnswerTmp->selectDestination($nbrAnswers);
 
 		//we send the error
-		$destination_items= explode('@@', $answerDestination);
-		$try=$destination_items[1];
-		$lp=$destination_items[2];
-		$destinationid=$destination_items[3];
-		$url=$destination_items[4];
+		$destination_items = explode('@@', $answerDestination);
+		$try = $destination_items[1];
+		$lp = $destination_items[2];
+		$destinationid = $destination_items[3];
+		$url = $destination_items[4];
 		$exerciseResult[$questionid] = 1;
 	} else {
 		$exerciseResult[$questionid] = 0;
@@ -506,35 +506,35 @@ 
 }
 
 // the link to retry the question
-if (isset($try) && $try==1) {
-	$num_value_array= (array_keys($questionList, $questionid));
-	$links.= Display :: return_icon('reload.gif', '', array ('style' => 'padding-left:0px;padding-right:5px;')).'<a onclick="SendEx('.$num_value_array[0].');" href="#">'.get_lang('TryAgain').'</a><br /><br />';
+if (isset($try) && $try == 1) {
+	$num_value_array = (array_keys($questionList, $questionid));
+	$links .= Display :: return_icon('reload.gif', '', array('style' => 'padding-left:0px;padding-right:5px;')).'<a onclick="SendEx('.$num_value_array[0].');" href="#">'.get_lang('TryAgain').'</a><br /><br />';
 }
 
 // the link to theory (a learning path)
 if (!empty($lp)) {
-	$lp_url= api_get_path(WEB_CODE_PATH).'newscorm/lp_controller.php?'.api_get_cidreq().'&action=view&lp_id='.$lp;
+	$lp_url = api_get_path(WEB_CODE_PATH).'newscorm/lp_controller.php?'.api_get_cidreq().'&action=view&lp_id='.$lp;
 	$list = new LearnpathList(api_get_user_id());
 	$flat_list = $list->get_flat_list();
-	$links.= Display :: return_icon('theory.gif', '', array ('style' => 'padding-left:0px;padding-right:5px;')).'<a target="_blank" href="'.$lp_url.'">'.get_lang('SeeTheory').'</a><br />';
+	$links .= Display :: return_icon('theory.gif', '', array('style' => 'padding-left:0px;padding-right:5px;')).'<a target="_blank" href="'.$lp_url.'">'.get_lang('SeeTheory').'</a><br />';
 }
-$links.='<br />';
+$links .= '<br />';
 
 // the link to an external website or link
 if (!empty($url)) {
-	$links.= Display :: return_icon('link.gif', '', array ('style' => 'padding-left:0px;padding-right:5px;')).'<a target="_blank" href="'.$url.'">'.get_lang('VisitUrl').'</a><br /><br />';
+	$links .= Display :: return_icon('link.gif', '', array('style' => 'padding-left:0px;padding-right:5px;')).'<a target="_blank" href="'.$url.'">'.get_lang('VisitUrl').'</a><br /><br />';
 }
 
 // the link to finish the test
-if ($destinationid==-1) {
-	$links.= Display :: return_icon('finish.gif', '', array ('style' => 'width:22px; height:22px; padding-left:0px;padding-right:5px;')).'<a onclick="SendEx(-1);" href="#">'.get_lang('EndActivity').'</a><br /><br />';
+if ($destinationid == -1) {
+	$links .= Display :: return_icon('finish.gif', '', array('style' => 'width:22px; height:22px; padding-left:0px;padding-right:5px;')).'<a onclick="SendEx(-1);" href="#">'.get_lang('EndActivity').'</a><br /><br />';
 } else {
 	// the link to other question
-	if (in_array($destinationid,$questionList)) {
+	if (in_array($destinationid, $questionList)) {
 		$objQuestionTmp = Question :: read($destinationid);
-		$questionName=$objQuestionTmp->selectTitle();
-		$num_value_array= (array_keys($questionList, $destinationid));
-		$links.= Display :: return_icon('quiz.gif', '', array ('style' => 'padding-left:0px;padding-right:5px;')).'<a onclick="SendEx('.$num_value_array[0].');" href="#">'.get_lang('GoToQuestion').' '.$num_value_array[0].'</a><br /><br />';
+		$questionName = $objQuestionTmp->selectTitle();
+		$num_value_array = (array_keys($questionList, $destinationid));
+		$links .= Display :: return_icon('quiz.gif', '', array('style' => 'padding-left:0px;padding-right:5px;')).'<a onclick="SendEx('.$num_value_array[0].');" href="#">'.get_lang('GoToQuestion').' '.$num_value_array[0].'</a><br /><br />';
 	}
 }
 
@@ -551,7 +551,7 @@ 
 }
 </script>';
 
-if ($links!='') {
+if ($links != '') {
 	/*echo '<div id="ModalContent" style="padding-bottom:30px;padding-top:10px;padding-left:20px;padding-right:20px;">
     <a onclick="self.parent.tb_remove();" href="#" style="float:right; margin-top:-10px;">'.api_ucfirst(get_lang('Close')).'</a>';*/
 	echo '<h1><div style="color:#333;">'.get_lang('Feedback').'</div></h1>';
@@ -560,15 +560,15 @@ 
 		if ($organs_at_risk_hit > 0) {
 			//$message='<p>'.get_lang('YourDelineation').'</p>';
 			//$message.=$table_resume;
-			$message.='<br />'.get_lang('ResultIs').' <b>'.get_lang('Unacceptable').'</b><br />';
+			$message .= '<br />'.get_lang('ResultIs').' <b>'.get_lang('Unacceptable').'</b><br />';
 			//if ($wrong_results) { }
-			$message.='<p style="color:#DC0A0A;"><b>'.get_lang('OARHit').'</b></p>';
-			$message.='<p>'.$comment.'</p>';
+			$message .= '<p style="color:#DC0A0A;"><b>'.get_lang('OARHit').'</b></p>';
+			$message .= '<p>'.$comment.'</p>';
 		} else {
-			$message='<p>'.get_lang('YourDelineation').'</p>';
-			$message.=$table_resume;
-			$message.='<br />'.get_lang('ResultIs').' <b>'.$result_comment.'</b><br />';
-			$message.='<p>'.$comment.'</p>';
+			$message = '<p>'.get_lang('YourDelineation').'</p>';
+			$message .= $table_resume;
+			$message .= '<br />'.get_lang('ResultIs').' <b>'.$result_comment.'</b><br />';
+			$message .= '<p>'.$comment.'</p>';
 		}
 		echo $message;
 	} else {
@@ -577,10 +577,10 @@ 
 	echo '<h3>'.$links.'</h3>';
 	echo '</div>';
 
-	$_SESSION['hot_spot_result']=$message;
+	$_SESSION['hot_spot_result'] = $message;
 	$_SESSION['hotspot_delineation_result'][$exerciseId][$questionid] = array($message, $exerciseResult[$questionid]);
 	//reseting the exerciseResult variable
-	Session::write('exerciseResult',$exerciseResult);
+	Session::write('exerciseResult', $exerciseResult);
 
 	//save this variables just in case the exercise loads an LP with other exercise
 	$_SESSION['objExerciseExtra'.$exerciseId] 	 = $_SESSION['objExercise'];