chamilo / chamilo-lms

src/Chamilo/CoreBundle/DependencyInjection/ChamiloCoreExtension.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
     {
         $loader = new Loader\YamlFileLoader(
             $container,
-            new FileLocator(__DIR__ . '/../Resources/config')
+            new FileLocator(__DIR__.'/../Resources/config')
         );
 
         $loader->load('services.yml');

src/Chamilo/CoreBundle/Entity/Skill.php

Spacing +2 added lines, -2 removed lines

@@ -222,14 +222,14 @@
                 return \Display::return_icon('badges-default.png', null, null, ICON_SIZE_BIG, null, true);
             }
 
-            return api_get_path(WEB_UPLOAD_PATH) . 'badges/' . sha1($this->name) . '-small.png';
+            return api_get_path(WEB_UPLOAD_PATH).'badges/'.sha1($this->name).'-small.png';
         }
 
         if (empty($this->icon)) {
             return \Display::return_icon('badges-default.png', null, null, ICON_SIZE_HUGE, null, true);
         }
 
-        return api_get_path(WEB_UPLOAD_PATH) . "badges/{$this->icon}";
+        return api_get_path(WEB_UPLOAD_PATH)."badges/{$this->icon}";
     }
 
     /**

main/social/my_skills_report.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 $isDRH = api_is_drh();
 
 if (!$isStudent && !$isStudentBoss && !$isDRH) {
-    header('Location: ' . api_get_path(WEB_CODE_PATH) . 'social/skills_wheel.php');
+    header('Location: '.api_get_path(WEB_CODE_PATH).'social/skills_wheel.php');
     exit;
 }
 

main/course_progress/thematic_plan.php

Indentation +9 added lines, -9 removed lines

@@ -47,15 +47,15 @@
         $form->addElement('hidden', 'description_type['.$id.']', $id);
         $form->addText('title['.$id.']', get_lang('Title'), false, array('size'=>'50'));
         $form->addHtmlEditor(
-           'description['.$id.']',
-           get_lang('Description'),
-           false,
-           false,
-           array(
-               'ToolbarStartExpanded' => 'false',
-               'ToolbarSet' => 'TrainingDescription',
-               'Height' => '150'
-           )
+            'description['.$id.']',
+            get_lang('Description'),
+            false,
+            false,
+            array(
+                'ToolbarStartExpanded' => 'false',
+                'ToolbarSet' => 'TrainingDescription',
+                'Height' => '150'
+            )
         );
 
         if (!empty($thematic_simple_list) && in_array($id, $thematic_simple_list)) {

Spacing +4 added lines, -4 removed lines

@@ -10,7 +10,7 @@ 
 // actions menu
 $new_thematic_plan_data = array();
 if (!empty($thematic_plan_data))
-foreach($thematic_plan_data as $thematic_item) {
+foreach ($thematic_plan_data as $thematic_item) {
     $thematic_simple_list[] = $thematic_item['description_type'];
     $new_thematic_plan_data[$thematic_item['description_type']] = $thematic_item;
 }
@@ -25,7 +25,7 @@ 
     }
 }
 
-$i=1;
+$i = 1;
 
 echo Display::tag('h2', $thematic_data['title']);
 echo $thematic_data['content'];
@@ -67,8 +67,8 @@ 
             $thematic_plan = null;
         } else {
             $thematic_plan = null;
-            $default['title['.$id.']']       = $title;
-            $default['description['.$id.']']= '';
+            $default['title['.$id.']'] = $title;
+            $default['description['.$id.']'] = '';
         }
         $form->setDefaults($default);
     }

Braces +3 added lines, -2 removed lines

@@ -9,9 +9,10 @@
 
 // actions menu
 $new_thematic_plan_data = array();
-if (!empty($thematic_plan_data))
-foreach($thematic_plan_data as $thematic_item) {
+if (!empty($thematic_plan_data)) {
+    foreach($thematic_plan_data as $thematic_item) {
     $thematic_simple_list[] = $thematic_item['description_type'];
+}
     $new_thematic_plan_data[$thematic_item['description_type']] = $thematic_item;
 }
 

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 '-';
         }
         ?>

Indentation +107 added lines, -107 removed lines

@@ -17,25 +17,25 @@ 
  */
 class ExerciseShowFunctions
 {
-	/**
-	 * Shows the answer to a fill-in-the-blanks question, as HTML
+    /**
+     * Shows the answer to a fill-in-the-blanks question, as HTML
      * @param int $feedbackType
-	 * @param string    $answer
-	 * @param int $id       Exercise ID
-	 * @param int $questionId      Question ID
+     * @param string    $answer
+     * @param int $id       Exercise ID
+     * @param int $questionId      Question ID
      * @param int $resultsDisabled
      * @param string $originalStudentAnswer
      *
-	 * @return void
-	 */
-	public static function display_fill_in_blanks_answer(
-	    $feedbackType,
-	    $answer,
-	    $id,
-	    $questionId,
-	    $resultsDisabled,
-	    $originalStudentAnswer = '',
-	    $showTotalScoreAndUserChoices
+     * @return void
+     */
+    public static function display_fill_in_blanks_answer(
+        $feedbackType,
+        $answer,
+        $id,
+        $questionId,
+        $resultsDisabled,
+        $originalStudentAnswer = '',
+        $showTotalScoreAndUserChoices
     ) {
         $answerHTML = FillBlanks::getHtmlDisplayForAnswer($answer, $resultsDisabled, $showTotalScoreAndUserChoices);
         if (strpos($originalStudentAnswer, 'font color') !== false) {
@@ -64,7 +64,7 @@ 
             </tr>
         <?php
         }
-	}
+    }
 
     /**
      * Shows the answer to a calculated question, as HTML
@@ -105,20 +105,20 @@ 
         }
     }
 
-	/**
-	 * Shows the answer to a free-answer question, as HTML
-	 * @param string    Answer text
-	 * @param int       Exercise ID
-	 * @param int       Question ID
-	 * @return void
-	 */
-	public static function display_free_answer(
-	    $feedback_type,
-	    $answer,
-	    $exe_id,
-	    $questionId,
-	    $questionScore = null,
-	    $results_disabled = 0
+    /**
+     * Shows the answer to a free-answer question, as HTML
+     * @param string    Answer text
+     * @param int       Exercise ID
+     * @param int       Question ID
+     * @return void
+     */
+    public static function display_free_answer(
+        $feedback_type,
+        $answer,
+        $exe_id,
+        $questionId,
+        $questionScore = null,
+        $results_disabled = 0
     ) {
         $comments = Event::get_comments($exe_id, $questionId);
 
@@ -136,17 +136,17 @@ 
                 echo '</tr>';
             }
         }
-	}
+    }
 
     /**
-    * @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)
+    public static function display_oral_expression_answer($feedback_type, $answer, $id, $questionId, $fileUrl = null, $results_disabled = 0)
     {
         if (isset($fileUrl)) {
             echo '
@@ -184,8 +184,8 @@ 
         }
     }
 
-	/**
-	 * Displays the answer to a hotspot question
+    /**
+     * Displays the answer to a hotspot question
      * @param int $feedback_type
      * @param int $answerId
      * @param string $answer
@@ -194,7 +194,7 @@ 
      * @param int $resultsDisabled
      * @param int $orderColor
      */
-	public static function display_hotspot_answer(
+    public static function display_hotspot_answer(
         $feedback_type,
         $answerId,
         $answer,
@@ -217,7 +217,7 @@ 
             }
         }
 
-		$hotspot_colors = array(
+        $hotspot_colors = array(
             "", // $i starts from 1 on next loop (ugly fix)
             "#4271B5",
             "#FE8E16",
@@ -234,7 +234,7 @@ 
             "#F7BDE2"
         );
 
-		?>
+        ?>
 		<table class="data_table">
 		<tr>
             <td class="text-center" width="5%">
@@ -246,10 +246,10 @@ 
 			<td class="text-left" width="10%">
 				<?php
                 if (!$hide_expected_answer) {
-    				$my_choice = $studentChoice ? get_lang('Correct') : get_lang('Fault');
-    				echo $my_choice;
+                    $my_choice = $studentChoice ? get_lang('Correct') : get_lang('Fault');
+                    echo $my_choice;
                 }
-				?>
+                ?>
 			</td>
 			<?php if ($feedback_type != EXERCISE_FEEDBACK_TYPE_EXAM) { ?>
 			<td class="text-left" width="60%">
@@ -257,29 +257,29 @@ 
                 if ($studentChoice) {
                     echo '<span style="font-weight: bold; color: #008000;">'.nl2br($answerComment).'</span>';
                 }
-				?>
+                ?>
 			</td>
 			<?php } else { ?>
 				<td class="text-left" width="60%">&nbsp;</td>
 			<?php } ?>
 		</tr>
 		<?php
-	}
-
-	/**
-	 * Display the answers to a multiple choice question
-	 * @param int $feedback_type Feedback type
-	 * @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_unique_or_multiple_answer(
+    }
+
+    /**
+     * Display the answers to a multiple choice question
+     * @param int $feedback_type Feedback type
+     * @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_unique_or_multiple_answer(
         $feedback_type,
         $answerType,
         $studentChoice,
@@ -307,14 +307,14 @@ 
         }
 
         $icon = in_array($answerType, array(UNIQUE_ANSWER, UNIQUE_ANSWER_NO_OPTION)) ? 'radio':'checkbox';
-		$icon .= $studentChoice?'_on':'_off';
-		$icon .= '.gif';
+        $icon .= $studentChoice?'_on':'_off';
+        $icon .= '.gif';
 
-		$iconAnswer = in_array($answerType, array(UNIQUE_ANSWER, UNIQUE_ANSWER_NO_OPTION)) ? 'radio':'checkbox';
-		$iconAnswer .= $answerCorrect?'_on':'_off';
-		$iconAnswer .= '.gif';
+        $iconAnswer = in_array($answerType, array(UNIQUE_ANSWER, UNIQUE_ANSWER_NO_OPTION)) ? 'radio':'checkbox';
+        $iconAnswer .= $answerCorrect?'_on':'_off';
+        $iconAnswer .= '.gif';
 
-		?>
+        ?>
 		<tr>
 		<td width="5%">
 			<?php echo Display::return_icon($icon); ?>
@@ -328,39 +328,39 @@ 
 		</td>
 		<td width="40%">
 			<?php
-			echo $answer;
-			?>
+            echo $answer;
+            ?>
 		</td>
 
 		<?php if ($feedback_type != EXERCISE_FEEDBACK_TYPE_EXAM) { ?>
 		<td width="20%">
 			<?php
             if ($studentChoice) {
-				if ($answerCorrect) {
+                if ($answerCorrect) {
                     $color = 'green';
-					//echo '<span style="font-weight: bold; color: #008000;">'.nl2br($answerComment).'</span>';
-				} else {
+                    //echo '<span style="font-weight: bold; color: #008000;">'.nl2br($answerComment).'</span>';
+                } else {
                     $color = 'black';
                     //echo '<span style="font-weight: bold; color: #FF0000;">'.nl2br($answerComment).'</span>';
-				}
-				if ($hide_expected_answer) {
-				    $color = '';
-				}
+                }
+                if ($hide_expected_answer) {
+                    $color = '';
+                }
                 echo '<span style="font-weight: bold; color: '.$color.';">'.nl2br($answerComment).'</span>';
-			}
-			?>
+            }
+            ?>
 		</td>
 			<?php
-		    if ($ans==1) {
-		        $comm = Event::get_comments($id,$questionId);
-			}
-		    ?>
+            if ($ans==1) {
+                $comm = Event::get_comments($id,$questionId);
+            }
+            ?>
 		 <?php } else { ?>
 			<td>&nbsp;</td>
 		<?php } ?>
 		</tr>
 		<?php
-	}
+    }
 
     /**
      * Display the answers to a multiple choice question
@@ -413,7 +413,7 @@ 
         if (isset($new_options[$studentChoice])) {
             echo get_lang($new_options[$studentChoice]['name']);
         } else {
-        	echo '-';
+            echo '-';
         }
 
         ?>
@@ -421,7 +421,7 @@ 
         <td width="5%">
         <?php
 
-		//Expected choice
+        //Expected choice
         if (!$hide_expected_answer) {
             if (isset($new_options[$answerCorrect])) {
                 echo get_lang($new_options[$answerCorrect]['name']);
@@ -447,8 +447,8 @@ 
                 }
 
                 if ($hide_expected_answer) {
-				    $color = '';
-				}
+                    $color = '';
+                }
 
                 echo '<span style="font-weight: bold; color: '.$color.';">'.nl2br($answerComment).'</span>';
             }
@@ -466,19 +466,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,
@@ -509,7 +509,7 @@ 
         <tr>
         <td width="5%">
         <?php
-		//Your choice
+        //Your choice
         $question = new MultipleAnswerCombinationTrueFalse();
         if (isset($question->options[$studentChoice])) {
             echo $question->options[$studentChoice];
@@ -520,7 +520,7 @@ 
         </td>
         <td width="5%">
         <?php
-		//Expected choice
+        //Expected choice
         if (!$hide_expected_answer) {
             if (isset($question->options[$answerCorrect])) {
                 echo $question->options[$answerCorrect];
@@ -545,14 +545,14 @@ 
             <?php
             //@todo replace this harcoded value
             if ($studentChoice) {
-                 $color = "black";
+                    $color = "black";
                 if ($studentChoice == $answerCorrect) {
                     $color = "green";
                 }
-            	//echo '<span style="font-weight: bold; color: #000;">'.nl2br($answerComment).'</span>';
+                //echo '<span style="font-weight: bold; color: #000;">'.nl2br($answerComment).'</span>';
                 if ($hide_expected_answer) {
                     $color = '';
-				}
+                }
                 echo '<span style="font-weight: bold; color: '.$color.';">'.nl2br($answerComment).'</span>';
             }
             ?>

Spacing +17 added lines, -17 removed lines

@@ -54,7 +54,7 @@ 
                 </td>
 
                 <?php
-                if (!api_is_allowed_to_edit(null,true) && $feedbackType != EXERCISE_FEEDBACK_TYPE_EXAM) { ?>
+                if (!api_is_allowed_to_edit(null, true) && $feedbackType != EXERCISE_FEEDBACK_TYPE_EXAM) { ?>
                     <td>
                         <?php
                         $comm = Event::get_comments($id, $questionId);
@@ -82,7 +82,7 @@ 
         $showTotalScoreAndUserChoices
     ) {
         if (empty($id)) {
-            echo '<tr><td>'. Security::remove_XSS($answer).'</td></tr>';
+            echo '<tr><td>'.Security::remove_XSS($answer).'</td></tr>';
         } else {
         ?>
             <tr>
@@ -93,10 +93,10 @@ 
                 </td>
 
             <?php
-            if (!api_is_allowed_to_edit(null,true) && $feedback_type != EXERCISE_FEEDBACK_TYPE_EXAM) { ?>
+            if (!api_is_allowed_to_edit(null, true) && $feedback_type != EXERCISE_FEEDBACK_TYPE_EXAM) { ?>
                 <td>
                     <?php
-                    $comm = Event::get_comments($id,$questionId);
+                    $comm = Event::get_comments($id, $questionId);
                     ?>
                 </td>
             <?php } ?>
@@ -151,7 +151,7 @@ 
         if (isset($fileUrl)) {
             echo '
                 <tr>
-                    <td><audio src="' . $fileUrl . '" controls></audio></td>
+                    <td><audio src="' . $fileUrl.'" controls></audio></td>
                 </tr>
             ';
         }
@@ -162,7 +162,7 @@ 
             echo '</tr>';
             if ($feedback_type != EXERCISE_FEEDBACK_TYPE_EXAM) {
                 echo '<tr>';
-                echo Display::tag('td',get_lang('notCorrectedYet'), array('width'=>'45%'));
+                echo Display::tag('td', get_lang('notCorrectedYet'), array('width'=>'45%'));
                 echo '</tr>';
             } else {
                 echo '<tr><td>&nbsp;</td></tr>';
@@ -175,9 +175,9 @@ 
             }
             echo '</td>';
 
-            if (!api_is_allowed_to_edit(null,true) && $feedback_type != EXERCISE_FEEDBACK_TYPE_EXAM) {
+            if (!api_is_allowed_to_edit(null, true) && $feedback_type != EXERCISE_FEEDBACK_TYPE_EXAM) {
                 echo '<td>';
-                $comm = Event::get_comments($id,$questionId);
+                $comm = Event::get_comments($id, $questionId);
                 echo '</td>';
             }
             echo '</tr>';
@@ -306,12 +306,12 @@ 
             }
         }
 
-        $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';
 
 		?>
@@ -351,8 +351,8 @@ 
 			?>
 		</td>
 			<?php
-		    if ($ans==1) {
-		        $comm = Event::get_comments($id,$questionId);
+		    if ($ans == 1) {
+		        $comm = Event::get_comments($id, $questionId);
 			}
 		    ?>
 		 <?php } else { ?>
@@ -455,7 +455,7 @@ 
             ?>
         </td>
             <?php
-            if ($ans==1) {
+            if ($ans == 1) {
                 $comm = Event::get_comments($id, $questionId);
             }
             ?>
@@ -558,8 +558,8 @@ 
             ?>
         </td>
             <?php
-            if ($ans==1) {
-                $comm = Event::get_comments($id,$questionId);
+            if ($ans == 1) {
+                $comm = Event::get_comments($id, $questionId);
             }
             ?>
          <?php } else { ?>

Doc Comments +36 added lines, -4 removed lines

@@ -25,6 +25,7 @@ 
 	 * @param int $questionId      Question ID
      * @param int $resultsDisabled
      * @param string $originalStudentAnswer
+     * @param boolean $showTotalScoreAndUserChoices
      *
 	 * @return void
 	 */
@@ -71,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(
@@ -110,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(
@@ -139,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)
@@ -193,6 +201,7 @@ 
      * @param string $answerComment
      * @param int $resultsDisabled
      * @param int $orderColor
+     * @param boolean $showTotalScoreAndUserChoices
      */
 	public static function display_hotspot_answer(
         $feedback_type,
@@ -277,6 +286,13 @@ 
 	 * @param integer Exercise ID
 	 * @param integer Question ID
 	 * @param boolean Whether to show the answer comment or not
+	 * @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_unique_or_multiple_answer(
@@ -373,6 +389,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(
@@ -477,6 +501,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(

main/reports/reports.lib.php

Indentation +10 added lines, -10 removed lines

@@ -14,9 +14,9 @@ 
 
 // load templates
 function reports_loadTemplates() {
-	global $reports_enabled_templates, $reports_template;
-	foreach ($reports_enabled_templates as $t)
-		require_once 'templates/'.$t.'.reports.php';
+    global $reports_enabled_templates, $reports_template;
+    foreach ($reports_enabled_templates as $t)
+        require_once 'templates/'.$t.'.reports.php';
 }
 
 
@@ -149,18 +149,18 @@ 
  */
 // return tools ID (parametre is a constant from main_api
 function reports_getToolId($tool) {
-	$tools = array_flip(api_get_tools_lists());
-	if (array_key_exists($tool, $tools))
-		return $tools[$tool];
-	else
-		return null;
+    $tools = array_flip(api_get_tools_lists());
+    if (array_key_exists($tool, $tools))
+        return $tools[$tool];
+    else
+        return null;
 }
 
 // return a sql clause returning triplet of (course, $session, $uid) the
 // current user is authorized to reed
 function reports_getVisibilitySQL () {
-	return "select cru.user_id from ".Database::get_main_table(TABLE_MAIN_COURSE_USER).' cru';
-	// fixme sessions
+    return "select cru.user_id from ".Database::get_main_table(TABLE_MAIN_COURSE_USER).' cru';
+    // fixme sessions
 }
 
 // this function execute keys_query (SQL statement)

Braces +10 added lines, -8 removed lines

@@ -15,9 +15,10 @@ 
 // load templates
 function reports_loadTemplates() {
 	global $reports_enabled_templates, $reports_template;
-	foreach ($reports_enabled_templates as $t)
-		require_once 'templates/'.$t.'.reports.php';
-}
+	foreach ($reports_enabled_templates as $t) {
+			require_once 'templates/'.$t.'.reports.php';
+	}
+	}
 
 
 // clear all reporting data
@@ -150,11 +151,12 @@ 
 // return tools ID (parametre is a constant from main_api
 function reports_getToolId($tool) {
 	$tools = array_flip(api_get_tools_lists());
-	if (array_key_exists($tool, $tools))
-		return $tools[$tool];
-	else
-		return null;
-}
+	if (array_key_exists($tool, $tools)) {
+			return $tools[$tool];
+	} else {
+			return null;
+	}
+	}
 
 // return a sql clause returning triplet of (course, $session, $uid) the
 // current user is authorized to reed

Spacing +3 added lines, -3 removed lines

@@ -3,11 +3,11 @@ 
 require_once __DIR__.'/../inc/global.inc.php';
 
 
-define ('REPORTS_PROGRESS_COMPLETED', 1);
+define('REPORTS_PROGRESS_COMPLETED', 1);
 
 $reports_modules = array();
 
-$reports_enabled_modules = array('quiz','course','scorm');
+$reports_enabled_modules = array('quiz', 'course', 'scorm');
 
 $reports_enabled_templates = array('exercicesMultiCourses', 'courseTime', 'courseArticulate');
 
@@ -158,7 +158,7 @@ 
 
 // return a sql clause returning triplet of (course, $session, $uid) the
 // current user is authorized to reed
-function reports_getVisibilitySQL () {
+function reports_getVisibilitySQL() {
 	return "select cru.user_id from ".Database::get_main_table(TABLE_MAIN_COURSE_USER).' cru';
 	// fixme sessions
 }

main/dropbox/recover_dropbox_files.php

Spacing +1 added lines, -1 removed lines

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

main/inc/lib/geometry.lib.php

Braces +49 added lines, -28 removed lines

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

Indentation +22 added lines, -22 removed lines

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

Spacing +55 added lines, -55 removed lines

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

main/admin/access_urls.php

Indentation +2 added lines, -2 removed lines

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

Spacing +17 added lines, -17 removed lines

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