chamilo / chamilo-lms

src/Chamilo/InstallerBundle/Requirement/Requirement.php

Spacing +2 added lines, -2 removed lines

@@ -29,10 +29,10 @@
         $help = null
     ) {
         $this->label = $label;
-        $this->fulfilled = (Boolean)$fulfilled;
+        $this->fulfilled = (Boolean) $fulfilled;
         $this->expected = $expected;
         $this->actual = $actual;
-        $this->required = (Boolean)$required;
+        $this->required = (Boolean) $required;
         $this->help = $help;
     }
 

src/Chamilo/InstallerBundle/Requirement/ExtensionsRequirements.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
             'requirements'
         );
 
-        $pcreVersion = defined('PCRE_VERSION') ? (float)PCRE_VERSION : null;
+        $pcreVersion = defined('PCRE_VERSION') ? (float) PCRE_VERSION : null;
 
         $this
             ->add(

src/Chamilo/UserBundle/Form/UserType.php

Spacing +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
         // Update Author id
         $builder->addEventListener(
             FormEvents::POST_SUBMIT,
-            function (FormEvent $event) use ($currentUser) {
+            function(FormEvent $event) use ($currentUser) {
                 /** @var User $user */
                 $user = $event->getData();
                 $extraFields = $user->getExtrafields();

app/ChamiloRequirements.php

Spacing +7 added lines, -7 removed lines

@@ -167,7 +167,7 @@ 
 
         $this->addPhpIniRequirement(
             'memory_limit',
-            function ($cfgValue) use ($mem) {
+            function($cfgValue) use ($mem) {
                 return $mem >= 256 * 1024 * 1024 || -1 == $mem;
             },
             false,
@@ -301,7 +301,7 @@ 
     {
         return array_filter(
             $this->getRequirements(),
-            function ($requirement) {
+            function($requirement) {
                 return !($requirement instanceof PhpIniRequirement)
                 && !($requirement instanceof ChamiloRequirement)
                 && !($requirement instanceof CliRequirement);
@@ -318,7 +318,7 @@ 
     {
         return array_filter(
             $this->getRequirements(),
-            function ($requirement) {
+            function($requirement) {
                 return $requirement instanceof PhpIniRequirement;
             }
         );
@@ -333,7 +333,7 @@ 
     {
         return array_filter(
             $this->getRequirements(),
-            function ($requirement) {
+            function($requirement) {
                 return $requirement instanceof ChamiloRequirement;
             }
         );
@@ -346,7 +346,7 @@ 
     {
         return array_filter(
             $this->getRequirements(),
-            function ($requirement) {
+            function($requirement) {
                 return $requirement instanceof CliRequirement;
             }
         );
@@ -365,7 +365,7 @@ 
         preg_match('/([\-0-9]+)[\s]*([a-z]*)$/i', trim($val), $matches);
 
         if (isset($matches[1])) {
-            $val = (int)$matches[1];
+            $val = (int) $matches[1];
         }
 
         switch (strtolower($matches[2])) {
@@ -383,7 +383,7 @@ 
             // no break
         }
 
-        return (float)$val;
+        return (float) $val;
     }
 
     /**

main/inc/lib/exercise_show_functions.lib.php

Braces +1 added lines, -2 removed lines

@@ -434,8 +434,7 @@
             } else {
                 echo $question->options[2];
             }
-        }
-        else {
+        } else {
             echo '-';
         }
         ?>

Doc Comments +33 added lines, -4 removed lines

@@ -72,6 +72,11 @@ 
      * @param string    Answer text
      * @param int       Exercise ID
      * @param int       Question ID
+     * @param integer $feedback_type
+     * @param string $answer
+     * @param integer $id
+     * @param integer $questionId
+     * @param boolean|string $showTotalScoreAndUserChoices
      * @return void
      */
     public static function display_calculated_answer(
@@ -111,6 +116,9 @@ 
      * @param string    Answer text
      * @param int       Exercise ID
      * @param int       Question ID
+     * @param integer $feedback_type
+     * @param integer $exe_id
+     * @param integer $questionId
      * @return void
      */
     public static function display_free_answer(
@@ -140,11 +148,10 @@ 
     }
 
     /**
-    * @param $feedback_type
+    * @param integer $feedback_type
     * @param $answer
-    * @param $id
-    * @param $questionId
-    * @param null $nano
+    * @param integer $id
+    * @param integer $questionId
     * @param int $results_disabled
      */
     public static function display_oral_expression_answer($feedback_type, $answer, $id, $questionId, $fileUrl = null, $results_disabled = 0)
@@ -194,6 +201,7 @@ 
      * @param string $answerComment
      * @param int $resultsDisabled
      * @param int $orderColor
+     * @param boolean $showTotalScoreAndUserChoices
      */
     public static function display_hotspot_answer(
         $feedback_type,
@@ -375,6 +383,14 @@ 
      * @param integer Exercise ID
      * @param integer Question ID
      * @param boolean Whether to show the answer comment or not
+     * @param integer $feedback_type
+     * @param integer $answerType
+     * @param string $answer
+     * @param string $answerComment
+     * @param integer $answerCorrect
+     * @param integer $id
+     * @param integer $questionId
+     * @param boolean $showTotalScoreAndUserChoices
      * @return void
      */
     public static function display_multiple_answer_true_false(
@@ -479,6 +495,14 @@ 
      * @param integer Exercise ID
      * @param integer Question ID
      * @param boolean Whether to show the answer comment or not
+     * @param integer $feedback_type
+     * @param integer $answerType
+     * @param string $answer
+     * @param string $answerComment
+     * @param integer $answerCorrect
+     * @param integer $id
+     * @param integer $questionId
+     * @param boolean $showTotalScoreAndUserChoices
      * @return void
      */
     public static function display_multiple_answer_combination_true_false(
@@ -571,6 +595,11 @@ 
         <?php
     }
 
+    /**
+     * @param integer $feedback_type
+     * @param integer $exe_id
+     * @param integer $questionId
+     */
     public static function displayAnnotationAnswer(
         $feedback_type,
         $exe_id,

Indentation +20 added lines, -20 removed lines

@@ -140,12 +140,12 @@ 
     }
 
     /**
-    * @param $feedback_type
-    * @param $answer
-    * @param $id
-    * @param $questionId
-    * @param null $nano
-    * @param int $results_disabled
+     * @param $feedback_type
+     * @param $answer
+     * @param $id
+     * @param $questionId
+     * @param null $nano
+     * @param int $results_disabled
      */
     public static function display_oral_expression_answer($feedback_type, $answer, $id, $questionId, $fileUrl = null, $results_disabled = 0)
     {
@@ -468,19 +468,19 @@ 
         <?php
     }
 
-     /**
-     * Display the answers to a multiple choice question
-     *
-     * @param integer Answer type
-     * @param integer Student choice
-     * @param string  Textual answer
-     * @param string  Comment on answer
-     * @param string  Correct answer comment
-     * @param integer Exercise ID
-     * @param integer Question ID
-     * @param boolean Whether to show the answer comment or not
-     * @return void
-     */
+        /**
+         * Display the answers to a multiple choice question
+         *
+         * @param integer Answer type
+         * @param integer Student choice
+         * @param string  Textual answer
+         * @param string  Comment on answer
+         * @param string  Correct answer comment
+         * @param integer Exercise ID
+         * @param integer Question ID
+         * @param boolean Whether to show the answer comment or not
+         * @return void
+         */
     public static function display_multiple_answer_combination_true_false(
         $feedback_type,
         $answerType,
@@ -547,7 +547,7 @@ 
             <?php
             //@todo replace this harcoded value
             if ($studentChoice) {
-                 $color = "black";
+                    $color = "black";
                 if ($studentChoice == $answerCorrect) {
                     $color = "green";
                 }

Spacing +4 added lines, -4 removed lines

@@ -309,11 +309,11 @@
             }
         }
 
-        $icon = in_array($answerType, array(UNIQUE_ANSWER, UNIQUE_ANSWER_NO_OPTION)) ? 'radio':'checkbox';
-        $icon .= $studentChoice?'_on':'_off';
+        $icon = in_array($answerType, array(UNIQUE_ANSWER, UNIQUE_ANSWER_NO_OPTION)) ? 'radio' : 'checkbox';
+        $icon .= $studentChoice ? '_on' : '_off';
         $icon .= '.gif';
-        $iconAnswer = in_array($answerType, array(UNIQUE_ANSWER, UNIQUE_ANSWER_NO_OPTION)) ? 'radio':'checkbox';
-        $iconAnswer .= $answerCorrect?'_on':'_off';
+        $iconAnswer = in_array($answerType, array(UNIQUE_ANSWER, UNIQUE_ANSWER_NO_OPTION)) ? 'radio' : 'checkbox';
+        $iconAnswer .= $answerCorrect ? '_on' : '_off';
         $iconAnswer .= '.gif';
 
         ?>

main/inc/lib/access_url_edit_users_to_url_functions.lib.php

Indentation +4 added lines, -4 removed lines

@@ -40,11 +40,11 @@
             // search users where username or firstname or lastname begins likes $needle
             $order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname, username' : ' ORDER BY lastname, firstname, username';
             $sql = 'SELECT u.user_id, username, lastname, firstname FROM '.$tbl_user.' u '.
-                   ' WHERE (username LIKE "'.$needle.'%" '.
-                   ' OR firstname LIKE "'.$needle.'%" '.
-                   ' OR lastname LIKE "'.$needle.'%") '.
+                    ' WHERE (username LIKE "'.$needle.'%" '.
+                    ' OR firstname LIKE "'.$needle.'%" '.
+                    ' OR lastname LIKE "'.$needle.'%") '.
                     $order_clause .
-                   ' LIMIT 11';
+                    ' LIMIT 11';
 
             $rs = Database::query($sql);
             $i=0;

Spacing +4 added lines, -4 removed lines

@@ -43,22 +43,22 @@
                    ' WHERE (username LIKE "'.$needle.'%" '.
                    ' OR firstname LIKE "'.$needle.'%" '.
                    ' OR lastname LIKE "'.$needle.'%") '.
-                    $order_clause .
+                    $order_clause.
                    ' LIMIT 11';
 
             $rs = Database::query($sql);
-            $i=0;
+            $i = 0;
 
             while ($user = Database::fetch_array($rs)) {
                 $i++;
-                if ($i<=10) {
+                if ($i <= 10) {
                     $return .= '<a href="javascript: void(0);" onclick="javascript: add_user_to_url(\''.addslashes($user['user_id']).'\',\''.api_get_person_name(addslashes($user['firstname']), addslashes($user['lastname'])).' ('.addslashes($user['username']).')'.'\')">'.api_get_person_name($user['firstname'], $user['lastname']).' ('.$user['username'].')</a><br />';
                 } else {
                     $return .= '...<br />';
                 }
             }
         }
-        $xajax_response -> addAssign('ajax_list_users','innerHTML',api_utf8_encode($return));
+        $xajax_response -> addAssign('ajax_list_users', 'innerHTML', api_utf8_encode($return));
         return $xajax_response;
     }
 }

src/Chamilo/ThemeBundle/EventListener/ContextListener.php

Indentation +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
     public function getUser()
     {
         if (!$this->container->has('security.context')) {
-           return false;
+            return false;
         }
 
         if (null === $token = $this->container->get('security.context')->getToken()) {

Braces +2 added lines, -1 removed lines

@@ -13,7 +13,8 @@
 use Symfony\Component\Security\Core\User\User;
 use Symfony\Component\Security\Core\User\UserInterface;
 
-class ContextListener {
+class ContextListener
+{
 
     protected $indicator = '^/admin';
     protected $container = null;

src/Chamilo/ThemeBundle/EventListener/NavbarTaskListDemoListener.php

Indentation +3 added lines, -3 removed lines

@@ -26,9 +26,9 @@
     protected function getTasks()
     {
         return array(
-         new TaskModel('make stuff', 30, TaskModel::COLOR_GREEN),
-         new TaskModel('make more stuff', 60),
-         new TaskModel('some more tasks to do', 10, TaskModel::COLOR_RED)
+            new TaskModel('make stuff', 30, TaskModel::COLOR_GREEN),
+            new TaskModel('make more stuff', 60),
+            new TaskModel('some more tasks to do', 10, TaskModel::COLOR_RED)
         );
 
     }

main/inc/lib/geometry.lib.php

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);
 }
 
 /**

Braces +75 added lines, -43 removed lines

@@ -12,7 +12,8 @@ 
  * @param max[y]    Y resolution
  * @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) {
+function poly_init($max)
+{
     return array_fill(0, $max["x"]-1,
             array_fill(0, $max["y"]-1, FALSE));
 }
@@ -41,7 +42,8 @@ 
  * @returns an array such as: for all i in [0..max[x][ : for all j in [0..max[y][ : array[i][j] = in_poly(poly, i,j)
  *                in_poly(poly,i,j) = true iff (i,j) is inside the polygon defined by poly
  */
-function poly_compile($poly, $max, $test = false) {
+function poly_compile($poly, $max, $test = false)
+{
     $res = poly_init($max);
 
     // looking for EDGES
@@ -65,8 +67,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 +79,15 @@ 
 
         /* special cases */
         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']);
+            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;
                 continue;
             }
@@ -87,9 +95,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 +111,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 */
@@ -132,14 +146,16 @@ 
     }
 
     // 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);
-        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 +167,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'].')   ';
         }
 
@@ -170,8 +189,7 @@ 
 
         for ($dy = $poly[$i-1]['y']+$dy_inc;
             $dy != $poly[0]['y'];
-            $dy += $dy_inc)
-        {
+            $dy += $dy_inc) {
             $x += $pente*$dy_inc;
             array_push($bords[$dy], round($x));
 //            if (DEBUG) echo '/('.$x.';'.$dy.')   ';
@@ -182,20 +200,22 @@ 
     /* 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++) {
                 $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,16 +242,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)
+        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");
@@ -247,20 +270,25 @@ 
  *
  * @returns (see below, UTSL)
  */
-function poly_result(&$poly1, &$poly2, $max) {
+function poly_result(&$poly1, &$poly2, $max)
+{
     $onlyIn1 = 0;
     $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 (
@@ -280,7 +308,8 @@ 
  *
  * @returns (see below, UTSL)
  */
-function poly_touch(&$poly1, &$poly2, $max) {
+function poly_touch(&$poly1, &$poly2, $max)
+{
 
     for ($i=0; $i<$max['x']; $i++) {
         for($j=0; $j<$max['y']; $j++) {
@@ -301,7 +330,8 @@ 
  * @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);
     foreach ($pairs as $idx => $pcoord) {
@@ -317,7 +347,8 @@ 
  * @param   array   Coordinates of one polygon
  * @return  array   ('x'=>val,'y'=>val)
  */
-function poly_get_max(&$coords1, &$coords2) {
+function poly_get_max(&$coords1, &$coords2)
+{
     $mx = 0;
     $my = 0;
     foreach ($coords1 as $coord) {
@@ -461,7 +492,8 @@ 
      * @param array $point The point properties
      * @return boolean
      */
-    public static function pointIsInPolygon($properties, $point) {
+    public static function pointIsInPolygon($properties, $point)
+    {
         $points = $properties;
         $isInside = false;
 

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -14,7 +14,7 @@ 
  */
 function poly_init($max) {
     return array_fill(0, $max["x"]-1,
-            array_fill(0, $max["y"]-1, FALSE));
+            array_fill(0, $max["y"]-1, false));
 }
 
 
@@ -228,7 +228,7 @@ 
     }
     for ($i=0; $i<$max['y']; $i++) {
         for($j=0; $j<$max['x']; $j++)
-            if($poly[$j][$i] == TRUE)
+            if($poly[$j][$i] == true)
                 $s .= ($format=='html'?"<b>1</b>":'1');
             else
                 $s .= "0";