chamilo / chamilo-lms

main/admin/user_update_import.php

Braces +4 added lines, -1 removed lines

@@ -454,7 +454,10 @@
     <blockquote>
         <pre>
             <b>UserName</b>;LastName;FirstName;Email;NewUserName;Password;AuthSource;OfficialCode;PhoneNumber;Status;ExpiryDate;Active;Language;Courses;ClassId;
-            xxx;xxx;xxx;xxx;xxx;xxx;xxx;xxx;xxx;user/teacher/drh;0000-00-00 00:00:00;0/1;xxx;<span style="color:red;"><?php if (count($list_reponse) > 0) echo implode(';', $list_reponse).';'; ?></span>xxx1|xxx2|xxx3;1;<br />
+            xxx;xxx;xxx;xxx;xxx;xxx;xxx;xxx;xxx;user/teacher/drh;0000-00-00 00:00:00;0/1;xxx;<span style="color:red;"><?php if (count($list_reponse) > 0) {
+    echo implode(';', $list_reponse).';';
+}
+?></span>xxx1|xxx2|xxx3;1;<br />
         </pre>
     </blockquote>
 <p><?php

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

main/dropbox/dropbox_functions.inc.php

Braces +12 added lines, -5 removed lines

@@ -734,7 +734,9 @@ 
             WHERE user_id='$id'";
     $result = Database::query($sql);
     $res = Database::fetch_array($result);
-    if (!$res) return false;
+    if (!$res) {
+        return false;
+    }
 
     return stripslashes($res['username']);
 }
@@ -810,10 +812,15 @@ 
             ";
     $result = Database::query($sql);
 
-    if (!($res = Database::fetch_array($result)))
-        die(get_lang('GeneralError').' (code 901)');
-    if ($owner == 0) return $res['uploader_id'];
-    if ($res['uploader_id'] == $owner) return true;
+    if (!($res = Database::fetch_array($result))) {
+            die(get_lang('GeneralError').' (code 901)');
+    }
+    if ($owner == 0) {
+        return $res['uploader_id'];
+    }
+    if ($res['uploader_id'] == $owner) {
+        return true;
+    }
     die(get_lang('GeneralError').' (code '.$or_die.')');
 }
 

main/exercice/hotspot_admin.inc.php

Braces +32 added lines, -13 removed lines

@@ -366,8 +366,9 @@ 
         if ($answerType == HOT_SPOT_DELINEATION) {
             // the magic happens here ...
             // we do this to not count the if no error section
-            if ($nbrAnswers >= 2)
-                $nbrAnswers--;
+            if ($nbrAnswers >= 2) {
+                            $nbrAnswers--;
+            }
         }
 
         $reponse = array();
@@ -679,12 +680,15 @@ 
 
                                     for ($k = 1; $k <= 100; $k++) {
                                         $selected1 = $selected2 = $selected3 = '';
-                                        if ($k == $threadhold1[$i])
-                                            $selected1 = 'selected="selected"';
-                                        if ($k == $threadhold2[$i])
-                                            $selected2 = 'selected="selected"';
-                                        if ($k == $threadhold3[$i])
-                                            $selected3 = 'selected="selected"';
+                                        if ($k == $threadhold1[$i]) {
+                                                                                    $selected1 = 'selected="selected"';
+                                        }
+                                        if ($k == $threadhold2[$i]) {
+                                                                                    $selected2 = 'selected="selected"';
+                                        }
+                                        if ($k == $threadhold3[$i]) {
+                                                                                    $selected3 = 'selected="selected"';
+                                        }
                                         $option1.='<option ' . $selected1 . ' >' . $k . ' % </option>';
                                         $option2.='<option ' . $selected2 . ' >' . $k . ' % </option>';
                                         $option3.='<option ' . $selected3 . '>' . $k . ' %</option>';
@@ -731,7 +735,10 @@ 
                                                 <div class="checkbox">
                                                     <p>
                                                         <label>
-                                                            <input type="checkbox" class="checkbox" name="<?php echo 'try[' . $i; ?>]"  <?php if ($try[$i] == 1) echo'checked'; ?> />
+                                                            <input type="checkbox" class="checkbox" name="<?php echo 'try[' . $i; ?>]"  <?php if ($try[$i] == 1) {
+    echo'checked';
+}
+?> />
                                                             <?php echo get_lang('TryAgain'); ?>
                                                         </label>
                                                     </p>
@@ -784,7 +791,10 @@ 
                                                             <div class="checkbox">
                                                                 <p>
                                                                     <label>
-                                                                        <input type="checkbox" class="checkbox" name="<?php echo 'try[' . $i; ?>]" <?php if ($try[$i] == 1) echo'checked'; ?> />
+                                                                        <input type="checkbox" class="checkbox" name="<?php echo 'try[' . $i; ?>]" <?php if ($try[$i] == 1) {
+    echo'checked';
+}
+?> />
                                                                         <?php echo get_lang('TryAgain'); ?>
                                                                     </label>
                                                                 </p>
@@ -823,7 +833,10 @@ 
                                             <th ><?php echo get_lang('OAR'); ?>*</th>
                                             <?php if ($objExercise->selectFeedbackType() == EXERCISE_FEEDBACK_TYPE_DIRECT) { ?>
                                                 <th colspan="2" ><?php echo get_lang('Comment'); ?></th>
-                                                <th ><?php if ($answerType == HOT_SPOT_DELINEATION) echo get_lang('Scenario'); ?></th>
+                                                <th ><?php if ($answerType == HOT_SPOT_DELINEATION) {
+    echo get_lang('Scenario');
+}
+?></th>
                                             <?php } else { ?>
                                                 <th colspan="3" ><?php echo get_lang('Comment'); ?></th>
                                             <?php } ?>
@@ -849,7 +862,10 @@ 
                                                 <div class="checkbox">
                                                     <p>
                                                         <label>
-                                                            <input type="checkbox" class="checkbox" name="<?php echo 'try[' . $i; ?>]" <?php if (isset($try[$i]) && $try[$i] == 1) echo'checked'; ?> />
+                                                            <input type="checkbox" class="checkbox" name="<?php echo 'try[' . $i; ?>]" <?php if (isset($try[$i]) && $try[$i] == 1) {
+    echo'checked';
+}
+?> />
                                                             <?php echo get_lang('TryAgain'); ?>
                                                         </label>
                                                     </p>
@@ -998,7 +1014,10 @@ 
                                         <div class="checkbox">
                                             <p>
                                                 <label>
-                                                    <input type="checkbox" class="checkbox" name="try_noerror" <?php if ($try_noerror == 1) echo'checked'; ?> />
+                                                    <input type="checkbox" class="checkbox" name="try_noerror" <?php if ($try_noerror == 1) {
+    echo'checked';
+}
+?> />
                                                     <?php echo get_lang('TryAgain'); ?>
                                                 </label>
                                             </p>

main/admin/user_move_stats.php

Braces +111 added lines, -47 removed lines

@@ -106,7 +106,9 @@ 
                 //Check if the user is registered in the session otherwise we will add it
                 $result = SessionManager::get_users_by_session($new_session_id);
                 if (empty($result) || !in_array($user_id, array_keys($result))) {
-                    if ($debug) echo 'User added to the session';
+                    if ($debug) {
+                        echo 'User added to the session';
+                    }
                     //Registering user to the new session
                     SessionManager::suscribe_users_to_session($new_session_id,array($user_id),false);
                 }
@@ -141,10 +143,11 @@ 
                     $list[$row['exe_id']]= $row;
                 }
 
-                if (!empty($list))
-                    foreach ($list as $exe_id =>$data) {
+                if (!empty($list)) {
+                                    foreach ($list as $exe_id =>$data) {
                         if ($update_database) {
                             $sql = "UPDATE $TABLETRACK_EXERCICES SET session_id = '$new_session_id' WHERE exe_id = $exe_id";
+                }
                             $res = Database::query($sql);
                             $result_message[$TABLETRACK_EXERCICES]++;
                         } else {
@@ -168,10 +171,11 @@ 
                         $list[$row['exe_id']]= $row;
                     }
 
-                    if (!empty($list))
-                        foreach ($list as $exe_id =>$data) {
+                    if (!empty($list)) {
+                                            foreach ($list as $exe_id =>$data) {
                             if ($update_database) {
                                 $sql = "UPDATE $TABLETRACK_EXERCICES SET session_id = '$new_session_id' WHERE exe_id = $exe_id";
+                    }
                                 $res = Database::query($sql);
                                 $result_message[$TABLETRACK_EXERCICES]++;
                             } else {
@@ -196,10 +200,11 @@ 
                     $list[$row['course_access_id']] = $row;
                 }
 
-                if (!empty($list))
-                    foreach ($list as $id => $data) {
+                if (!empty($list)) {
+                                    foreach ($list as $id => $data) {
                         if ($update_database) {
                             $sql = "UPDATE $TBL_TRACK_E_COURSE_ACCESS SET session_id = $new_session_id WHERE course_access_id = $id";
+                }
                             if ($debug) {
                                 echo $sql;
                             }
@@ -218,13 +223,18 @@ 
                 while($row = Database::fetch_array($res,'ASSOC')) {
                     $list[] = $row['access_id'];
                 }
-                if (!empty($list))
-                    foreach ($list as $id) {
+                if (!empty($list)) {
+                                    foreach ($list as $id) {
                         if ($update_database) {
                             $sql = "UPDATE $TBL_TRACK_E_LAST_ACCESS SET access_session_id = $new_session_id WHERE access_id = $id";
-                            if ($debug) echo $sql;
+                }
+                            if ($debug) {
+                                echo $sql;
+                            }
                             $res = Database::query($sql);
-                            if ($debug) var_dump($res);
+                            if ($debug) {
+                                var_dump($res);
+                            }
                             $result_message[$TBL_TRACK_E_LAST_ACCESS]++;
                         }
                     }
@@ -248,13 +258,18 @@ 
                     }
                 }
 
-                if (!empty($list))
-                    foreach ($list as $id=>$data) {
+                if (!empty($list)) {
+                                    foreach ($list as $id=>$data) {
                         if ($update_database) {
                             $sql = "UPDATE $TBL_LP_VIEW SET session_id = $new_session_id WHERE c_id = $course_id AND id = $id ";
-                            if ($debug) var_dump($sql);
+                }
+                            if ($debug) {
+                                var_dump($sql);
+                            }
                             $res = Database::query($sql);
-                            if ($debug) var_dump($res);
+                            if ($debug) {
+                                var_dump($res);
+                            }
                             $result_message[$TBL_LP_VIEW]++;
                         } else {
                             //Getting all information of that lp_item_id
@@ -281,10 +296,11 @@ 
                             $list[$row['id']] = $row;
                         }
                     }
-                    if (!empty($list))
-                        foreach ($list as $id=>$data) {
+                    if (!empty($list)) {
+                                            foreach ($list as $id=>$data) {
                             //Getting all information of that lp_item_id
                             $score    = Tracking::get_avg_student_score($user_id, $origin_course_code,        array($data['lp_id']), $new_session_id);
+                    }
                             $progress = Tracking::get_avg_student_progress($user_id, $origin_course_code,     array($data['lp_id']), $new_session_id);
                             $result_message_compare['LP_VIEW'][$data['lp_id']] = array('score' => $score, 'progress' =>$progress);
                         }
@@ -300,9 +316,13 @@ 
                     $id = $row['ref'];
                     if ($update_database) {
                         $sql = "UPDATE $TBL_AGENDA SET session_id = $new_session_id WHERE c_id = $course_id AND id = $id ";
-                        if ($debug) var_dump($sql);
+                        if ($debug) {
+                            var_dump($sql);
+                        }
                         $res_update = Database::query($sql);
-                        if ($debug) var_dump($res_update);
+                        if ($debug) {
+                            var_dump($res_update);
+                        }
                         $result_message['agenda']++;
                     }
                 }
@@ -314,22 +334,30 @@ 
                 //echo '<h1>Student publication</h1>';
 
                 $sql = "SELECT ref FROM $TBL_ITEM_PROPERTY WHERE tool = 'work' AND insert_user_id = $user_id AND c_id = $course_id";
-                if ($debug) echo $sql;
+                if ($debug) {
+                    echo $sql;
+                }
                 $res = Database::query($sql);
                 while($row = Database::fetch_array($res,'ASSOC')) {
                     $id = $row['ref'];
                     $sql = "SELECT * FROM $TBL_STUDENT_PUBLICATION WHERE id = $id AND session_id = $origin_session_id AND c_id = $course_id";
-                    if ($debug) var_dump($sql);
+                    if ($debug) {
+                        var_dump($sql);
+                    }
                     $sub_res = Database::query($sql);
                     if (Database::num_rows($sub_res) > 0 ) {
                         $data = Database::fetch_array($sub_res,'ASSOC');
-                        if ($debug) var_dump($data);
+                        if ($debug) {
+                            var_dump($data);
+                        }
                         $parent_id = $data['parent_id'];
                         if (isset($data['parent_id']) && !empty($data['parent_id'])) {
                             $sql = "SELECT * FROM $TBL_STUDENT_PUBLICATION WHERE id = $parent_id AND c_id = $course_id";
                             $select_res     = Database::query($sql);
                             $parent_data    = Database::fetch_array($select_res,'ASSOC');
-                            if ($debug)     var_dump($parent_data);
+                            if ($debug) {
+                                var_dump($parent_data);
+                            }
 
                             $sys_course_path = api_get_path(SYS_COURSE_PATH);
                             $course_dir = $sys_course_path . $course_info['path'];
@@ -344,7 +372,9 @@ 
                             $sql = "SELECT * FROM $TBL_STUDENT_PUBLICATION
                             		WHERE description like '%$search_this%' AND url LIKE '%$search_this2%' AND session_id = $new_session_id AND c_id = $course_id
                             		ORDER BY id desc  LIMIT 1";
-                            if ($debug) echo $sql;
+                            if ($debug) {
+                                echo $sql;
+                            }
                             $sub_res = Database::query($sql);
                             $num_rows = Database::num_rows($sub_res);
 
@@ -377,12 +407,16 @@ 
 	                                       date_of_qualification    = '0000-00-00 00:00:00',
 	                                       session_id   = ".$new_session_id;
                                     $rest_insert     = Database::query($sql_add_publication);
-                                    if ($debug) echo ($sql_add_publication);
+                                    if ($debug) {
+                                        echo ($sql_add_publication);
+                                    }
                                     // add the directory
                                     $id = Database::insert_id();
                                     //Folder created
                                     api_item_property_update($course_info, 'work', $id, 'DirectoryCreated', api_get_user_id());
-                                    if ($debug) var_dump($rest_insert);
+                                    if ($debug) {
+                                        var_dump($rest_insert);
+                                    }
                                     $new_parent_id = $id;
                                     $result_message[$TBL_STUDENT_PUBLICATION.' - new folder created called: '.$created_dir]++;
                                 }
@@ -390,7 +424,9 @@ 
 
                             //Creating student_publication_assignment if exists
                             $sql = "SELECT * FROM $TBL_STUDENT_PUBLICATION_ASSIGNMENT WHERE publication_id = $parent_id AND c_id = $course_id";
-                            if ($debug) var_dump($sql);
+                            if ($debug) {
+                                var_dump($sql);
+                            }
                             $rest_select     = Database::query($sql);
                             if (Database::num_rows($rest_select) > 0 ) {
                                 if ($update_database) {
@@ -402,7 +438,9 @@ 
                                        add_to_calendar      = '".$assignment_data['add_to_calendar']."',
                                        enable_qualification = '".$assignment_data['enable_qualification']."',
                                        publication_id       = '".$new_parent_id."'";
-                                    if ($debug) echo $sql_add_publication;
+                                    if ($debug) {
+                                        echo $sql_add_publication;
+                                    }
                                     $rest_select     = Database::query($sql_add_publication);
                                     $id = Database::insert_id();
 
@@ -410,11 +448,15 @@ 
                                         "has_properties         = '".$id."',
                                        view_properties    = '1'
                                        WHERE id   = ".$new_parent_id;
-                                    if ($debug) echo $sql_update;
+                                    if ($debug) {
+                                        echo $sql_update;
+                                    }
                                     $rest_update     = Database::query($sql_update);
 
 
-                                    if ($debug) var_dump($sql_update);
+                                    if ($debug) {
+                                        var_dump($sql_update);
+                                    }
                                     $result_message[$TBL_STUDENT_PUBLICATION_ASSIGNMENT]++;
                                 }
                             }
@@ -437,9 +479,13 @@ 
                                                parent_id    =  ".$new_parent_id ." ,
                                                session_id = ".$new_session_id;
 
-                                if ($debug) echo $sql_add_publication;
+                                if ($debug) {
+                                    echo $sql_add_publication;
+                                }
                                 $rest_insert     = Database::query($sql_add_publication);
-                                if ($debug) var_dump($rest_insert);
+                                if ($debug) {
+                                    var_dump($rest_insert);
+                                }
                                 $id = Database::insert_id();
                                 api_item_property_update($course_info, 'work', $id, 'DocumentAdded', $user_id);
                                 $result_message[$TBL_STUDENT_PUBLICATION]++;
@@ -453,7 +499,9 @@ 
                                     if ($result) {
                                         unlink($full_file_name);
                                         $sql = "DELETE FROM $TBL_STUDENT_PUBLICATION WHERE id= ".$data['id'];
-                                        if ($debug) var_dump($sql);
+                                        if ($debug) {
+                                            var_dump($sql);
+                                        }
                                         $result_delete     = Database::query($sql);
                                         api_item_property_update($course_info, 'work', $data['id'], 'DocumentDeleted', api_get_user_id());
                                     }
@@ -469,22 +517,30 @@ 
                 //10. Dropbox - not neccesary to move categories (no presence of session_id)
 
                 $sql = "SELECT id FROM $TBL_DROPBOX_FILE WHERE uploader_id = $user_id AND session_id = $origin_session_id AND c_id = $course_id";
-                if ($debug) var_dump($sql);
+                if ($debug) {
+                    var_dump($sql);
+                }
                 $res = Database::query($sql);
                 while($row = Database::fetch_array($res,'ASSOC')) {
                     $id = $row['id'];
                     if ($update_database) {
                         $sql = "UPDATE $TBL_DROPBOX_FILE SET session_id = $new_session_id WHERE c_id = $course_id AND id = $id";
-                        if ($debug) var_dump($sql);
+                        if ($debug) {
+                            var_dump($sql);
+                        }
                         $res = Database::query($sql);
-                        if ($debug) var_dump($res);
+                        if ($debug) {
+                            var_dump($res);
+                        }
 
                         $sql = "UPDATE $TBL_DROPBOX_POST SET session_id = $new_session_id WHERE file_id = $id";
-                        if ($debug)
-                            var_dump($sql);
+                        if ($debug) {
+                                                    var_dump($sql);
+                        }
                         $res = Database::query($sql);
-                        if ($debug)
-                            var_dump($res);
+                        if ($debug) {
+                                                    var_dump($res);
+                        }
                         $result_message[$TBL_DROPBOX_FILE]++;
                     }
                 }
@@ -493,23 +549,30 @@ 
 
                 $sql = "SELECT notebook_id FROM $TBL_NOTEBOOK
                         WHERE user_id = $user_id AND session_id = $origin_session_id AND course = '$origin_course_code' AND c_id = $course_id";
-                if ($debug) var_dump($sql);
+                if ($debug) {
+                    var_dump($sql);
+                }
                 $res = Database::query($sql);
                 while($row = Database::fetch_array($res,'ASSOC')) {
                     $id = $row['notebook_id'];
                     if ($update_database) {
                         $sql = "UPDATE $TBL_NOTEBOOK SET session_id = $new_session_id WHERE c_id = $course_id AND notebook_id = $id";
-                        if ($debug) var_dump($sql);
+                        if ($debug) {
+                            var_dump($sql);
+                        }
                         $res = Database::query($sql);
-                        if ($debug) var_dump($res);
+                        if ($debug) {
+                            var_dump($res);
+                        }
                     }
                 }
 
                 if ($update_database) {
                     echo '<h2>'.get_lang('StatsMoved').'</h2>';
-                    if (is_array($result_message))
-                        foreach ($result_message as $table=>$times) {
+                    if (is_array($result_message)) {
+                                            foreach ($result_message as $table=>$times) {
                             echo 'Table '.$table.' - '.$times.' records updated <br />';
+                    }
                         }
                 } else {
                     echo '<h2>'.get_lang('UserInformationOfThisCourse').'</h2>';
@@ -626,10 +689,11 @@ 
 }
 $navigation .= '&nbsp;';
 $page ++;
-if ($page < $nro_pages)
+if ($page < $nro_pages) {
     $navigation .= '<a href="'.api_get_self().'?page='.$page.'">'.get_lang('Next').'</a>';
-else
+} else {
     $navigation .= get_lang('Next');
+}
 
 echo $navigation;
 $user_list      = UserManager::get_user_list(array(), array(), $begin, $default);

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 (

main/reports/templates/exercicesMultiCourses.reports.php

Braces +17 added lines, -10 removed lines

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

main/inc/lib/blog.lib.php

Braces +26 added lines, -18 removed lines

@@ -1009,8 +1009,9 @@ 
             $blog_post_actions .= '</a>';
         }
 
-		if (api_is_allowed('BLOG_' . $blog_id, 'article_rate'))
-			$rating_select = Blog::display_rating_form('post',$blog_id,$post_id);
+		if (api_is_allowed('BLOG_' . $blog_id, 'article_rate')) {
+					$rating_select = Blog::display_rating_form('post',$blog_id,$post_id);
+		}
 
 		$blog_post_text=stripslashes($blog_post_text);
 
@@ -1654,8 +1655,9 @@ 
 
 						$arrPermissions = array();
 
-						while ($row = Database::fetch_array($result))
-							$arrPermissions[] = $row['action'];
+						while ($row = Database::fetch_array($result)) {
+													$arrPermissions[] = $row['action'];
+						}
 
 						    echo '<tr>';
 							echo '<td style="text-align:right; vertical-align:top;">' . get_lang('TaskManager') . ':&nbsp;&nbsp;</td>';
@@ -2332,8 +2334,9 @@ 
 		//Handle leap year
 		$numberofdays = array (0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
 
-		if(($year % 400 == 0) or ($year % 4 == 0 and $year % 100 <> 0))
-			$numberofdays[2] = 29;
+		if(($year % 400 == 0) or ($year % 4 == 0 and $year % 100 <> 0)) {
+					$numberofdays[2] = 29;
+		}
 
 		//Get the first day of the month
 		$dayone = getdate(mktime(0, 0, 0, $month, 1, $year));
@@ -2363,8 +2366,9 @@ 
 		if( Database::num_rows($result) > 0) {
 			while($blog_post = Database::fetch_array($result)) {
 				// If the day of this post is not yet in the array, add it.
-				if (!in_array($blog_post['post_day'], $posts))
-					$posts[] = $blog_post['post_day'];
+				if (!in_array($blog_post['post_day'], $posts)) {
+									$posts[] = $blog_post['post_day'];
+				}
 			}
 		}
 
@@ -2403,8 +2407,9 @@ 
 
 		echo "<tr>\n";
 
-		for($ii = 1; $ii < 8; $ii ++)
-			echo "<td class=\"weekdays\">", $DaysShort[$ii % 7], "</td>";
+		for($ii = 1; $ii < 8; $ii ++) {
+					echo "<td class=\"weekdays\">", $DaysShort[$ii % 7], "</td>";
+		}
 
 		echo "</tr>";
 
@@ -2414,8 +2419,9 @@ 
 		while ($curday <= $numberofdays[$month]) {
 			echo "<tr>";
 			for ($ii = 0; $ii < 7; $ii ++) {
-				if (($curday == -1) && ($ii == $startdayofweek))
-					$curday = 1;
+				if (($curday == -1) && ($ii == $startdayofweek)) {
+									$curday = 1;
+				}
 
 			 	if (($curday > 0) && ($curday <= $numberofdays[$month])) {
 					$bgcolor = $ii < 5 ? $class="class=\"days_week\"" : $class="class=\"days_weekend\"";
@@ -2429,10 +2435,11 @@ 
 					echo "<td " . $class.">";
 
 					// If there are posts on this day, create a filter link.
-					if(in_array($curday, $posts))
-						echo '<a href="blog.php?blog_id=' . $blog_id . '&filter=' . $year . '-' . $month . '-' . $curday . '&month=' . $month . '&year=' . $year . '" title="' . get_lang('ViewPostsOfThisDay') . '">' . $curday . '</a>';
-					else
-						echo $dayheader;
+					if(in_array($curday, $posts)) {
+											echo '<a href="blog.php?blog_id=' . $blog_id . '&filter=' . $year . '-' . $month . '-' . $curday . '&month=' . $month . '&year=' . $year . '" title="' . get_lang('ViewPostsOfThisDay') . '">' . $curday . '</a>';
+					} else {
+											echo $dayheader;
+					}
 
 					if (count($tasks) > 0) {
 						if (isset($tasks[$curday]) && is_array($tasks[$curday])) {
@@ -2446,8 +2453,9 @@ 
 
 					echo "</td>";
 					$curday ++;
-				} else
-					echo "<td>&nbsp;</td>";
+				} else {
+									echo "<td>&nbsp;</td>";
+				}
 			}
 			echo "</tr>";
 		}

main/inc/lib/browser/Browser.php

Braces +16 added lines, -32 removed lines

@@ -1152,68 +1152,52 @@
         if (stripos($this->_agent, 'windows') !== false)
         {
             $this->_platform = self::PLATFORM_WINDOWS;
-        }
-        else if (stripos($this->_agent, 'iPad') !== false)
+        } else if (stripos($this->_agent, 'iPad') !== false)
         {
             $this->_platform = self::PLATFORM_IPAD;
-        }
-        else if (stripos($this->_agent, 'iPod') !== false)
+        } else if (stripos($this->_agent, 'iPod') !== false)
         {
             $this->_platform = self::PLATFORM_IPOD;
-        }
-        else if (stripos($this->_agent, 'iPhone') !== false)
+        } else if (stripos($this->_agent, 'iPhone') !== false)
         {
             $this->_platform = self::PLATFORM_IPHONE;
-        }
-        elseif (stripos($this->_agent, 'mac') !== false)
+        } elseif (stripos($this->_agent, 'mac') !== false)
         {
             $this->_platform = self::PLATFORM_APPLE;
-        }
-        elseif (stripos($this->_agent, 'android') !== false)
+        } elseif (stripos($this->_agent, 'android') !== false)
         {
             $this->_platform = self::PLATFORM_ANDROID;
-        }
-        elseif (stripos($this->_agent, 'linux') !== false)
+        } elseif (stripos($this->_agent, 'linux') !== false)
         {
             $this->_platform = self::PLATFORM_LINUX;
-        }
-        else if (stripos($this->_agent, 'Nokia') !== false)
+        } else if (stripos($this->_agent, 'Nokia') !== false)
         {
             $this->_platform = self::PLATFORM_NOKIA;
-        }
-        else if (stripos($this->_agent, 'BlackBerry') !== false)
+        } else if (stripos($this->_agent, 'BlackBerry') !== false)
         {
             $this->_platform = self::PLATFORM_BLACKBERRY;
-        }
-        elseif (stripos($this->_agent, 'FreeBSD') !== false)
+        } elseif (stripos($this->_agent, 'FreeBSD') !== false)
         {
             $this->_platform = self::PLATFORM_FREEBSD;
-        }
-        elseif (stripos($this->_agent, 'OpenBSD') !== false)
+        } elseif (stripos($this->_agent, 'OpenBSD') !== false)
         {
             $this->_platform = self::PLATFORM_OPENBSD;
-        }
-        elseif (stripos($this->_agent, 'NetBSD') !== false)
+        } elseif (stripos($this->_agent, 'NetBSD') !== false)
         {
             $this->_platform = self::PLATFORM_NETBSD;
-        }
-        elseif (stripos($this->_agent, 'OpenSolaris') !== false)
+        } elseif (stripos($this->_agent, 'OpenSolaris') !== false)
         {
             $this->_platform = self::PLATFORM_OPENSOLARIS;
-        }
-        elseif (stripos($this->_agent, 'SunOS') !== false)
+        } elseif (stripos($this->_agent, 'SunOS') !== false)
         {
             $this->_platform = self::PLATFORM_SUNOS;
-        }
-        elseif (stripos($this->_agent, 'OS\/2') !== false)
+        } elseif (stripos($this->_agent, 'OS\/2') !== false)
         {
             $this->_platform = self::PLATFORM_OS2;
-        }
-        elseif (stripos($this->_agent, 'BeOS') !== false)
+        } elseif (stripos($this->_agent, 'BeOS') !== false)
         {
             $this->_platform = self::PLATFORM_BEOS;
-        }
-        elseif (stripos($this->_agent, 'win') !== false)
+        } elseif (stripos($this->_agent, 'win') !== false)
         {
             $this->_platform = self::PLATFORM_WINDOWS;
         }