chamilo / chamilo-lms

main/inc/lib/statistics.lib.php

Indentation +1 added lines, -1 removed lines

@@ -666,7 +666,7 @@
         $res = Database::query($sql);
         $count1 = Database::fetch_object($res);
         $sql = "SELECT COUNT(*) AS n FROM $user_table as u $table ".
-               "WHERE LENGTH(picture_uri) > 0 $url_condition2";
+                "WHERE LENGTH(picture_uri) > 0 $url_condition2";
         $res = Database::query($sql);
         $count2 = Database::fetch_object($res);
         // #users without picture

Braces +1 added lines, -1 removed lines

@@ -579,7 +579,7 @@
                 GROUP BY date(login_date)";
 
         $res = Database::query($sql);
-        while ($row = Database::fetch_array($res,'ASSOC')){
+        while ($row = Database::fetch_array($res,'ASSOC')) {
             $totalLogin[$row['login_date']] = $row['number'];
         }
 

Spacing +34 added lines, -34 removed lines

@@ -104,10 +104,10 @@ 
         $course_user_table = Database::get_main_table(TABLE_MAIN_COURSE_USER);
         $course_table = Database::get_main_table(TABLE_MAIN_COURSE);
         $user_table = Database::get_main_table(TABLE_MAIN_USER);
-        $access_url_rel_user_table= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+        $access_url_rel_user_table = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
         $current_url_id = api_get_current_access_url_id();
-        $active_filter = $onlyActive?' AND active=1':'';
-        $status_filter = isset($status)?' AND status = '.intval($status):'';
+        $active_filter = $onlyActive ? ' AND active=1' : '';
+        $status_filter = isset($status) ? ' AND status = '.intval($status) : '';
 
         if (api_is_multiple_url_enabled()) {
             $sql = "SELECT COUNT(DISTINCT(u.user_id)) AS number
@@ -131,7 +131,7 @@ 
                     FROM $user_table
                     WHERE 1=1 $status_filter $active_filter";
             if (isset($categoryCode)) {
-                $status_filter = isset($status)?' AND status = '.intval($status):'';
+                $status_filter = isset($status) ? ' AND status = '.intval($status) : '';
                 $sql = "SELECT COUNT(DISTINCT(cu.user_id)) AS number
                         FROM $course_user_table cu, $course_table c
                         WHERE
@@ -156,7 +156,7 @@ 
     public static function countSessions()
     {
         $session_table = Database::get_main_table(TABLE_MAIN_SESSION);
-        $access_url_rel_session_table= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
+        $access_url_rel_session_table = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
         if (api_is_multiple_url_enabled()) {
             $current_url_id = api_get_current_access_url_id();
             $sql = "SELECT COUNT(id) AS number
@@ -179,9 +179,9 @@ 
     public static function getNumberOfActivities()
     {
         // Database table definitions
-        $track_e_default  = Database::get_main_table(TABLE_STATISTIC_TRACK_E_DEFAULT);
+        $track_e_default = Database::get_main_table(TABLE_STATISTIC_TRACK_E_DEFAULT);
         $table_user = Database::get_main_table(TABLE_MAIN_USER);
-        $access_url_rel_user_table= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+        $access_url_rel_user_table = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
         $current_url_id = api_get_current_access_url_id();
         if (api_is_multiple_url_enabled()) {
             $sql = "SELECT count(default_id) AS total_number_of_items
@@ -229,7 +229,7 @@ 
         $from = intval($from);
         $numberOfItems = intval($numberOfItems);
 
-        if (!in_array($direction, array('ASC','DESC'))) {
+        if (!in_array($direction, array('ASC', 'DESC'))) {
             $direction = 'DESC';
         }
 
@@ -280,7 +280,7 @@ 
         $sql .= " LIMIT $from,$numberOfItems ";
 
         $res = Database::query($sql);
-        $activities = array ();
+        $activities = array();
         while ($row = Database::fetch_row($res)) {
             if (strpos($row[1], '_object') === false && strpos($row[1], '_array') === false) {
                 $row[2] = $row[2];
@@ -350,7 +350,7 @@ 
                 FROM $categoryTable
                 ORDER BY tree_pos";
         $res = Database::query($sql);
-        $categories = array ();
+        $categories = array();
         while ($category = Database::fetch_object($res)) {
             $categories[$category->code] = $category->name;
         }
@@ -371,7 +371,7 @@ 
             $data_max = ($data_max < $value ? $value : $data_max);
         }
         reset($data);
-        $result = array ();
+        $result = array();
         $delta = $max / $data_max;
         foreach ($data as $index => $value) {
             $result[$index] = (int) round($value * $delta);
@@ -405,9 +405,9 @@ 
             } else {
                 $number_label = self::makeSizeString($number);
             }
-            $percentage = ($total>0?number_format(100*$number/$total, 1, ',', '.'):'0');
+            $percentage = ($total > 0 ? number_format(100 * $number / $total, 1, ',', '.') : '0');
 
-            echo '<tr class="row_'.($i%2 == 0 ? 'odd' : 'even').'">
+            echo '<tr class="row_'.($i % 2 == 0 ? 'odd' : 'even').'">
                     <td width="150">'.$subtitle.'</td>
                     <td width="550">'.Display::bar_progress($percentage, false).'</td>
                     <td align="right">'.$number_label.'</td>';
@@ -415,7 +415,7 @@ 
                 echo '<td align="right"> '.$percentage.'%</td>';
             }
             echo '</tr>';
-            $i ++;
+            $i++;
         }
         if ($showTotal) {
             if (!$isFileSize) {
@@ -441,11 +441,11 @@ 
         $table_url = null;
         $where_url = null;
         $now = api_get_utc_datetime();
-        $where_url_last = ' WHERE login_date > DATE_SUB("' . $now . '",INTERVAL 1 %s)';
+        $where_url_last = ' WHERE login_date > DATE_SUB("'.$now.'",INTERVAL 1 %s)';
         if (api_is_multiple_url_enabled()) {
             $table_url = ", $access_url_rel_user_table";
             $where_url = " WHERE login_user_id=user_id AND access_url_id='".$current_url_id."'";
-            $where_url_last = ' AND login_date > DATE_SUB("' . $now . '",INTERVAL 1 %s)';
+            $where_url_last = ' AND login_date > DATE_SUB("'.$now.'",INTERVAL 1 %s)';
         }
 
         $period = get_lang('PeriodMonth');
@@ -464,7 +464,7 @@ 
                         GROUP BY stat_date 
                         ORDER BY stat_date ";
                 $sql_last_x = "SELECT DATE_FORMAT( login_date, '%H' ) AS stat_date , count( login_id ) AS number_of_logins 
-                               FROM ".$table.$table_url.$where_url.sprintf($where_url_last,'DAY')." 
+                               FROM ".$table.$table_url.$where_url.sprintf($where_url_last, 'DAY')." 
                                GROUP BY stat_date 
                                ORDER BY stat_date ";
                 break;
@@ -476,7 +476,7 @@ 
                         GROUP BY stat_date 
                         ORDER BY DATE_FORMAT( login_date, '%w' ) ";
                 $sql_last_x = "SELECT DATE_FORMAT( login_date, '%w' ) AS stat_date, count( login_id ) AS number_of_logins 
-                               FROM ".$table.$table_url.$where_url.sprintf($where_url_last,'WEEK')." 
+                               FROM ".$table.$table_url.$where_url.sprintf($where_url_last, 'WEEK')." 
                                GROUP BY stat_date 
                                ORDER BY DATE_FORMAT( login_date, '%w' ) ";
                 break;
@@ -527,7 +527,7 @@ 
             $where_url = " AND login_user_id=user_id AND access_url_id='".$current_url_id."'";
         } else {
             $table_url = '';
-            $where_url='';
+            $where_url = '';
         }
         $now = api_get_utc_datetime();
         $field = 'login_user_id';
@@ -566,7 +566,7 @@ 
             $where_url = " AND login_user_id=user_id AND access_url_id='".$current_url_id."'";
         } else {
             $table_url = '';
-            $where_url='';
+            $where_url = '';
         }
         $now = api_get_utc_datetime();
         $field = 'login_user_id';
@@ -579,7 +579,7 @@ 
                 GROUP BY date(login_date)";
 
         $res = Database::query($sql);
-        while ($row = Database::fetch_array($res,'ASSOC')){
+        while ($row = Database::fetch_array($res, 'ASSOC')) {
             $totalLogin[$row['login_date']] = $row['number'];
         }
 
@@ -679,7 +679,7 @@ 
         $url_condition2 = null;
         $table = null;
         if (api_is_multiple_url_enabled()) {
-            $url_condition =  ", $access_url_rel_user_table as url WHERE url.user_id=u.user_id AND access_url_id='".$current_url_id."'";
+            $url_condition = ", $access_url_rel_user_table as url WHERE url.user_id=u.user_id AND access_url_id='".$current_url_id."'";
             $url_condition2 = " AND url.user_id=u.user_id AND access_url_id='".$current_url_id."'";
             $table = ", $access_url_rel_user_table as url ";
         }
@@ -712,7 +712,7 @@ 
             'width=200px',
             false
         );
-        $renderer =& $form->defaultRenderer();
+        $renderer = & $form->defaultRenderer();
         $renderer->setCustomElementTemplate('<span>{element}</span> ');
         $form->addElement('hidden', 'report', 'activities');
         $form->addElement('hidden', 'activities_direction', 'DESC');
@@ -762,10 +762,10 @@ 
         $columns[1] = 'access_date';
         $sql_order[SORT_ASC] = 'ASC';
         $sql_order[SORT_DESC] = 'DESC';
-        $per_page = isset($_GET['per_page'])?intval($_GET['per_page']) : 10;
-        $page_nr = isset($_GET['page_nr'])?intval($_GET['page_nr']) : 1;
-        $column = isset($_GET['column'])?intval($_GET['column']) : 0;
-        $date_diff = isset($_GET['date_diff'])?intval($_GET['date_diff']) : 60;
+        $per_page = isset($_GET['per_page']) ? intval($_GET['per_page']) : 10;
+        $page_nr = isset($_GET['page_nr']) ? intval($_GET['page_nr']) : 1;
+        $column = isset($_GET['column']) ? intval($_GET['column']) : 0;
+        $date_diff = isset($_GET['date_diff']) ? intval($_GET['date_diff']) : 60;
         $direction = isset($_GET['direction']) ? $_GET['direction'] : SORT_ASC;
 
         if (!in_array($direction, array(SORT_ASC, SORT_DESC))) {
@@ -793,25 +793,25 @@ 
                         access_url_id='".$current_url_id."'
                    GROUP BY t.c_id
                    HAVING t.c_id <> ''
-                   AND DATEDIFF( '".api_get_utc_datetime()."' , access_date ) <= ". $date_diff;
+                   AND DATEDIFF( '".api_get_utc_datetime()."' , access_date ) <= ".$date_diff;
         } else {
             $sql = "SELECT * FROM $table t
                    GROUP BY t.c_id
                    HAVING t.c_id <> ''
-                   AND DATEDIFF( '".api_get_utc_datetime()."' , access_date ) <= ". $date_diff;
+                   AND DATEDIFF( '".api_get_utc_datetime()."' , access_date ) <= ".$date_diff;
         }
         $sql .= ' ORDER BY '.$columns[$column].' '.$sql_order[$direction];
-        $from = ($page_nr -1) * $per_page;
+        $from = ($page_nr - 1) * $per_page;
         $sql .= ' LIMIT '.$from.','.$per_page;
 
         echo '<p>'.get_lang('LastAccess').' &gt;= '.$date_diff.' '.get_lang('Days').'</p>';
         $res = Database::query($sql);
         if (Database::num_rows($res) > 0) {
-            $courses = array ();
+            $courses = array();
             while ($obj = Database::fetch_object($res)) {
                 $courseInfo = api_get_course_info_by_id($obj->c_id);
-                $course = array ();
-                $course[]= '<a href="'.api_get_path(WEB_COURSE_PATH).$courseInfo['code'].'">'.$courseInfo['code'].' <a>';
+                $course = array();
+                $course[] = '<a href="'.api_get_path(WEB_COURSE_PATH).$courseInfo['code'].'">'.$courseInfo['code'].' <a>';
                 // Allow sort by date hiding the numerical date
                 $course[] = '<span style="display:none;">'.$obj->access_date.'</span>'.api_convert_and_format_date($obj->access_date);
                 $courses[] = $course;
@@ -937,7 +937,7 @@ 
             $where_url = " AND login_user_id=user_id AND access_url_id='".$current_url_id."'";
         } else {
             $table_url = '';
-            $where_url='';
+            $where_url = '';
         }
         $now = api_get_utc_datetime();
         $sql[get_lang('ThisDay')] =

main/inc/lib/events_dispatcher.class.php

Braces +3 added lines, -1 removed lines

@@ -18,9 +18,11 @@
 
         foreach ($event_config[$event_name]["actions"] as $func) {
             $execute = true;
-            if (!function_exists($func)) // if the function doesn't exist, we log
+            if (!function_exists($func)) {
+                // if the function doesn't exist, we log
             {
                 error_log("EventsDispatcher warning : ".$func." does not exist.");
+            }
                 $execute = false;
             }
 

Doc Comments +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
     /**
      * @param string $event_name
      * @param array $event_data
-     * @return bool
+     * @return false|null
      */
     public static function events($event_name, $event_data = array())
     {

main/tracking/logins_details.php

Braces +5 added lines, -4 removed lines

@@ -182,10 +182,11 @@
                 echo "<td style='padding-left : 40px;' valign='top'>" . $beautifulDateTime . "</td>";
                 echo"</tr>";
                 // $limit is used to select only results between $results[$j] (current login) and next one
-                if ($j == ( sizeof($results) - 1 ))
-                    $limit = date("Y-m-d H:i:s", $nextReqDate);
-                else
-                    $limit = $results[$j + 1];
+                if ($j == ( sizeof($results) - 1 )) {
+                                    $limit = date("Y-m-d H:i:s", $nextReqDate);
+                } else {
+                                    $limit = $results[$j + 1];
+                }
                 // select all access to tool between displayed date and next displayed date or now() if
                 // displayed date is the last login date
                 $sql = "SELECT access_tool, count(access_tool)

Indentation -1 removed lines

@@ -7,7 +7,6 @@
  * 	@author Sebastien Piraux
  *
  * 	@package chamilo.tracking
-
  */
 /**
  * Code

Spacing +25 added lines, -25 removed lines

@@ -75,13 +75,13 @@ 
     // check if uid is tutor of this group
     $courseId = api_get_course_int_id();
 
-    if (( $is_allowedToTrack || $is_allowedToTrackEverybodyInCourse)) {
+    if (($is_allowedToTrack || $is_allowedToTrackEverybodyInCourse)) {
         if ($is_allowedToTrackEverybodyInCourse) {
             $sql = "SELECT u.firstname,u.lastname, u.email
                     FROM $TABLECOURSUSER cu , $TABLEUSER u
                     WHERE
                         cu.user_id = u.user_id AND
-                        cu.relation_type<>" . COURSE_RELATION_TYPE_RRHH . " AND
+                        cu.relation_type<>".COURSE_RELATION_TYPE_RRHH." AND
                         cu.c_id = '$courseId' AND
                         u.user_id = '$uInfo'";
         } else {
@@ -97,21 +97,21 @@ 
             $res[2] == "" ? $res2 = get_lang('NoEmail') : $res2 = Display::encrypted_mailto_link($res[2]);
 
             echo "<tr><td>";
-            echo $informationsAbout . " : <br>";
+            echo $informationsAbout." : <br>";
             echo "<ul>\n"
-            . "<li>" . get_lang('FirstName') . " : " . $res[0] . "</li>\n"
-            . "<li>" . get_lang('LastName') . " : " . $res[1] . "</li>\n"
-            . "<li>" . get_lang('Email') . " : " . $res2 . "</li>\n"
+            . "<li>".get_lang('FirstName')." : ".$res[0]."</li>\n"
+            . "<li>".get_lang('LastName')." : ".$res[1]."</li>\n"
+            . "<li>".get_lang('Email')." : ".$res2."</li>\n"
             . "</ul>";
             echo "</td></tr>";
             /*             * ***** MENU ******* */
             echo "<tr>
                 <td>
-                [<a href='userLog.php?uInfo=$uInfo&view=$view'>" . get_lang('Back') . "</a>]
+                [<a href='userLog.php?uInfo=$uInfo&view=$view'>".get_lang('Back')."</a>]
         ";
             echo "  &nbsp;&nbsp;&nbsp;||&nbsp;&nbsp;&nbsp;
-                [<a href='" . api_get_self() . "?uInfo=$uInfo&view=$view&period=week&reqdate=$reqdate' class='specialLink'>" . get_lang('PeriodWeek') . "</a>]
-                [<a href='" . api_get_self() . "?uInfo=$uInfo&view=$view&period=month&reqdate=$reqdate' class='specialLink'>" . get_lang('PeriodMonth') . "</a>]
+                [<a href='" . api_get_self()."?uInfo=$uInfo&view=$view&period=week&reqdate=$reqdate' class='specialLink'>".get_lang('PeriodWeek')."</a>]
+                [<a href='" . api_get_self()."?uInfo=$uInfo&view=$view&period=month&reqdate=$reqdate' class='specialLink'>".get_lang('PeriodMonth')."</a>]
                 &nbsp;&nbsp;&nbsp;||&nbsp;&nbsp;&nbsp;
         ";
             switch ($period) {
@@ -120,8 +120,8 @@ 
                     $previousReqDate = $reqdate - 7 * 86400;
                     $nextReqDate = $reqdate + 7 * 86400;
                     echo "
-                    [<a href='" . api_get_self() . "?uInfo=$uInfo&view=$view&period=week&reqdate=$previousReqDate' class='specialLink'>" . get_lang('PreviousWeek') . "</a>]
-                    [<a href='" . api_get_self() . "?uInfo=$uInfo&view=$view&period=week&reqdate=$nextReqDate' class='specialLink'>" . get_lang('NextWeek') . "</a>]
+                    [<a href='" . api_get_self()."?uInfo=$uInfo&view=$view&period=week&reqdate=$previousReqDate' class='specialLink'>".get_lang('PreviousWeek')."</a>]
+                    [<a href='" . api_get_self()."?uInfo=$uInfo&view=$view&period=week&reqdate=$nextReqDate' class='specialLink'>".get_lang('NextWeek')."</a>]
                 ";
                     break;
                 default:
@@ -132,8 +132,8 @@ 
                     $previousReqDate = mktime(1, 1, 1, date("m", $reqdate) - 1, 1, date("Y", $reqdate));
                     $nextReqDate = mktime(1, 1, 1, date("m", $reqdate) + 1, 1, date("Y", $reqdate));
                     echo "
-                    [<a href='" . api_get_self() . "?uInfo=$uInfo&view=$view&period=month&reqdate=$previousReqDate' class='specialLink'>" . get_lang('PreviousMonth') . "</a>]
-                    [<a href='" . api_get_self() . "?uInfo=$uInfo&view=$view&period=month&reqdate=$nextReqDate' class='specialLink'>" . get_lang('NextMonth') . "</a>]
+                    [<a href='" . api_get_self()."?uInfo=$uInfo&view=$view&period=month&reqdate=$previousReqDate' class='specialLink'>".get_lang('PreviousMonth')."</a>]
+                    [<a href='" . api_get_self()."?uInfo=$uInfo&view=$view&period=month&reqdate=$nextReqDate' class='specialLink'>".get_lang('NextMonth')."</a>]
                 ";
                     break;
             }
@@ -153,7 +153,7 @@ 
                         AND YEAR(access_date) = YEAR(FROM_UNIXTIME('$reqdate'))
                         GROUP BY DAYOFMONTH(access_date)
                         ORDER BY access_date ASC";
-                $displayedDate = $MonthsLong[date("n", $reqdate) - 1] . date(" Y", $reqdate);
+                $displayedDate = $MonthsLong[date("n", $reqdate) - 1].date(" Y", $reqdate);
                 break;
             case "week" :
                 $sql = "SELECT access_date
@@ -165,24 +165,24 @@ 
                         GROUP BY DAYOFMONTH(access_date)
                         ORDER BY access_date ASC";
                 $weeklowreqdate = ($reqdate - (86400 * date("w", $reqdate)));
-                $weekhighreqdate = ($reqdate + (86400 * (6 - date("w", $reqdate)) ));
-                $displayedDate = get_lang('From') . " " . date("d ", $weeklowreqdate) . $MonthsLong[date("n", $weeklowreqdate) - 1] . date(" Y", $weeklowreqdate)
-                        . " " . get_lang('To') . " " . date("d ", $weekhighreqdate) . $MonthsLong[date("n", $weekhighreqdate) - 1] . date(" Y", $weekhighreqdate);
+                $weekhighreqdate = ($reqdate + (86400 * (6 - date("w", $reqdate))));
+                $displayedDate = get_lang('From')." ".date("d ", $weeklowreqdate).$MonthsLong[date("n", $weeklowreqdate) - 1].date(" Y", $weeklowreqdate)
+                        . " ".get_lang('To')." ".date("d ", $weekhighreqdate).$MonthsLong[date("n", $weekhighreqdate) - 1].date(" Y", $weekhighreqdate);
                 break;
         }
         echo "<tr><td>";
         $results = StatsUtils::getManyResults1Col($sql);
         /*             * * display of the displayed period  ** */
         echo "<table width='100%' cellpadding='2' cellspacing='1' border='0' align=center>";
-        echo "<td bgcolor='#E6E6E6'>" . $displayedDate . "</td>";
+        echo "<td bgcolor='#E6E6E6'>".$displayedDate."</td>";
         if (is_array($results)) {
             for ($j = 0; $j < sizeof($results); $j++) {
                 $beautifulDateTime = api_convert_and_format_date($results[$j], null, date_default_timezone_get());
                 echo "<tr>";
-                echo "<td style='padding-left : 40px;' valign='top'>" . $beautifulDateTime . "</td>";
+                echo "<td style='padding-left : 40px;' valign='top'>".$beautifulDateTime."</td>";
                 echo"</tr>";
                 // $limit is used to select only results between $results[$j] (current login) and next one
-                if ($j == ( sizeof($results) - 1 ))
+                if ($j == (sizeof($results) - 1))
                     $limit = date("Y-m-d H:i:s", $nextReqDate);
                 else
                     $limit = $results[$j + 1];
@@ -192,8 +192,8 @@ 
                         FROM $TABLETRACK_ACCESS
                         WHERE access_user_id = $uInfo
                             AND access_tool IS NOT NULL
-                            AND access_date > '" . $results[$j] . "'
-                            AND access_date < '" . $limit . "'
+                            AND access_date > '".$results[$j]."'
+                            AND access_date < '" . $limit."'
                             AND c_id = $courseId
                         GROUP BY access_tool
                         ORDER BY access_tool ASC";
@@ -204,8 +204,8 @@ 
                     echo "<table width='50%' cellpadding='0' cellspacing='0' border='0'>\n";
                     for ($k = 0; $k < count($results2); $k++) {
                         echo "<tr>\n";
-                        echo "<td width='70%' style='padding-left : 60px;'>" . get_lang($results2[$k][0]) . "</td>\n";
-                        echo "<td width='30%' align='right' style='padding-right : 40px'>" . $results2[$k][1] . " " . get_lang('Visits') . "</td>\n";
+                        echo "<td width='70%' style='padding-left : 60px;'>".get_lang($results2[$k][0])."</td>\n";
+                        echo "<td width='30%' align='right' style='padding-right : 40px'>".$results2[$k][1]." ".get_lang('Visits')."</td>\n";
                         echo "</tr>";
                     }
                     echo "</table>\n";
@@ -215,7 +215,7 @@ 
             }
         } else {
             echo "<tr>";
-            echo "<td colspan='2' bgcolor='#eeeeee'>" . get_lang('NoResult') . "</td>";
+            echo "<td colspan='2' bgcolor='#eeeeee'>".get_lang('NoResult')."</td>";
             echo "</tr>";
         }
         echo "</table>";

main/tracking/courseLog.php

Indentation +1 added lines, -1 removed lines

@@ -111,7 +111,7 @@
                             get_lang('HideColumn'),
                             array('align' => 'absmiddle', 'hspace' => '3px'),
                             ICON_SIZE_SMALL
-                         ) . "</div>'
+                            ) . "</div>'
                     );
                 }
             );

Spacing +13 added lines, -13 removed lines

@@ -111,7 +111,7 @@ 
                             get_lang('HideColumn'),
                             array('align' => 'absmiddle', 'hspace' => '3px'),
                             ICON_SIZE_SMALL
-                         ) . "</div>'
+                         )."</div>'
                     );
                 }
             );
@@ -146,7 +146,7 @@ 
 $TABLETRACK_LINKS       = Database::get_main_table(TABLE_STATISTIC_TRACK_E_LINKS);
 $TABLETRACK_DOWNLOADS   = Database::get_main_table(TABLE_STATISTIC_TRACK_E_DOWNLOADS);
 $TABLETRACK_ACCESS_2    = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ACCESS);
-$TABLETRACK_EXERCISES 	= Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
+$TABLETRACK_EXERCISES = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
 $TABLECOURSUSER = Database::get_main_table(TABLE_MAIN_COURSE_USER);
 $TABLECOURSE = Database::get_main_table(TABLE_MAIN_COURSE);
 $table_user = Database::get_main_table(TABLE_MAIN_USER);
@@ -156,8 +156,8 @@ 
 
 // Breadcrumbs.
 if (isset($_GET['origin']) && $_GET['origin'] == 'resume_session') {
-    $interbreadcrumb[] = array('url' => '../admin/index.php','name' => get_lang('PlatformAdmin'));
-    $interbreadcrumb[] = array('url' => '../session/session_list.php','name' => get_lang('SessionList'));
+    $interbreadcrumb[] = array('url' => '../admin/index.php', 'name' => get_lang('PlatformAdmin'));
+    $interbreadcrumb[] = array('url' => '../session/session_list.php', 'name' => get_lang('SessionList'));
     $interbreadcrumb[] = array('url' => '../session/resume_session.php?id_session='.$sessionId, 'name' => get_lang('SessionOverview'));
 }
 
@@ -228,21 +228,21 @@ 
 if (!empty($sessionId)) {
     $actionsLeft .= Display::url(
         Display::return_icon('attendance_list.png', get_lang('Logins'), '', ICON_SIZE_MEDIUM),
-        api_get_path(WEB_CODE_PATH) . 'attendance/index.php?' . api_get_cidreq() . '&action=calendar_logins'
+        api_get_path(WEB_CODE_PATH).'attendance/index.php?'.api_get_cidreq().'&action=calendar_logins'
     );
 }
 
 $actionsRight = '<div class="pull-right">';
 $actionsRight .= '<a href="javascript: void(0);" onclick="javascript: window.print();">'.
-    Display::return_icon('printer.png', get_lang('Print'),'',ICON_SIZE_MEDIUM).'</a>';
+    Display::return_icon('printer.png', get_lang('Print'), '', ICON_SIZE_MEDIUM).'</a>';
 
 $addional_param = '';
 if (isset($_GET['additional_profile_field'])) {
-    $addional_param ='additional_profile_field='.intval($_GET['additional_profile_field']);
+    $addional_param = 'additional_profile_field='.intval($_GET['additional_profile_field']);
 }
 $users_tracking_per_page = '';
 if (isset($_GET['users_tracking_per_page'])) {
-    $users_tracking_per_page= '&users_tracking_per_page='.intval($_GET['users_tracking_per_page']);
+    $users_tracking_per_page = '&users_tracking_per_page='.intval($_GET['users_tracking_per_page']);
 }
 $actionsRight .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&export=csv&'.$addional_param.$users_tracking_per_page.'">
      '.Display::return_icon('export_csv.png', get_lang('ExportAsCSV'), '', ICON_SIZE_MEDIUM).'</a>';
@@ -266,7 +266,7 @@ 
 $course_name = get_lang('Course').' '.$courseInfo['name'];
 if ($session_id) {
     $titleSession = Display::return_icon('session.png', get_lang('Session'), array(), ICON_SIZE_SMALL).' '.api_get_session_name($session_id);
-    $titleCourse =  Display::return_icon('course.png', get_lang('Course'), array(), ICON_SIZE_SMALL).' '.$course_name;
+    $titleCourse = Display::return_icon('course.png', get_lang('Course'), array(), ICON_SIZE_SMALL).' '.$course_name;
 } else {
     $titleSession = Display::return_icon('course.png', get_lang('Course'), array(), ICON_SIZE_SMALL).' '.$courseInfo['name'];
 }
@@ -306,7 +306,7 @@ 
     $html .= '<ul class="session-list">';
     foreach ($sessionList as $session) {
         $url = api_get_path(WEB_CODE_PATH).'mySpace/course.php?session_id='.$session['id'].'&cidReq='.$courseInfo['code'];
-        $html .= Display::tag('li', $iconCourse . ' ' . Display::url($session['name'], $url));
+        $html .= Display::tag('li', $iconCourse.' '.Display::url($session['name'], $url));
     }
     $html .= '</ul>';
 }
@@ -321,12 +321,12 @@ 
     $form = new FormValidator(
         'reminder_form',
         'get',
-        api_get_path(WEB_CODE_PATH).'announcements/announcements.php?' . api_get_cidreq(),
+        api_get_path(WEB_CODE_PATH).'announcements/announcements.php?'.api_get_cidreq(),
         null,
         ['style' => 'margin-bottom: 10px'],
         FormValidator::LAYOUT_INLINE
     );
-    $options = array (
+    $options = array(
         2 => sprintf($getLangXDays, 2),
         3 => sprintf($getLangXDays, 3),
         4 => sprintf($getLangXDays, 4),
@@ -339,7 +339,7 @@ 
     );
     $el = $form->addSelect(
         'since',
-        Display::returnFontAwesomeIcon('warning') . get_lang('RemindInactivesLearnersSince'),
+        Display::returnFontAwesomeIcon('warning').get_lang('RemindInactivesLearnersSince'),
         $options,
         ['class' => 'col-sm-3']
     );

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

@@ -508,7 +508,7 @@
     $csv_headers[] = get_lang('FirstLoginInCourse', '');
     $csv_headers[] = get_lang('LatestLoginInCourse', '');
 
-    if (isset($_GET['additional_profile_field']) AND is_numeric($_GET['additional_profile_field'])) {
+    if (isset($_GET['additional_profile_field']) and is_numeric($_GET['additional_profile_field'])) {
         $csv_headers[] = $extra_info['display_text'];
     }
     ob_end_clean();

main/install/index.php

Braces +4 added lines, -1 removed lines

@@ -445,7 +445,10 @@
     }
 }
     ?>
-    <input type="hidden" name="updatePath"         value="<?php if (!$badUpdatePath) echo api_htmlentities($proposedUpdatePath, ENT_QUOTES); ?>" />
+    <input type="hidden" name="updatePath"         value="<?php if (!$badUpdatePath) {
+    echo api_htmlentities($proposedUpdatePath, ENT_QUOTES);
+}
+?>" />
     <input type="hidden" name="urlAppendPath"      value="<?php echo api_htmlentities($urlAppendPath, ENT_QUOTES); ?>" />
     <input type="hidden" name="pathForm"           value="<?php echo api_htmlentities($pathForm, ENT_QUOTES); ?>" />
     <input type="hidden" name="urlForm"            value="<?php echo api_htmlentities($urlForm, ENT_QUOTES); ?>" />

main/admin/access_url_edit_users_to_url.php

Indentation +1 added lines, -1 removed lines

@@ -261,7 +261,7 @@
     ?>
     <option value="<?php echo $enreg['user_id']; ?>"><?php echo $enreg['username'].' - '.api_get_person_name($enreg['firstname'], $enreg['lastname']); ?></option>
     <?php
-     }
+        }
     unset($nosessionUsersList);
     ?>
     </select>

Spacing +15 added lines, -15 removed lines

@@ -59,7 +59,7 @@ 
 function send() {
 	if (document.formulaire.access_url_id.value!=0) {
 		document.formulaire.form_sent.value=0;
-		document.formulaire.add_type.value=\'' . $add_type . '\';
+		document.formulaire.add_type.value=\'' . $add_type.'\';
 		document.formulaire.submit();
 	}
 }
@@ -95,17 +95,17 @@ 
             $result = UrlManager::update_urls_rel_user($UserList, $access_url_id);
             $url_info = UrlManager::get_url_data_from_id($access_url_id);
             if (!empty($result)) {
-                $message .= 'URL: ' . $url_info['url'] . '<br />';
+                $message .= 'URL: '.$url_info['url'].'<br />';
             }
 
             if (!empty($result['users_added'])) {
-                $message .= '<h4>' . get_lang('UsersAdded') . ':</h4>';
+                $message .= '<h4>'.get_lang('UsersAdded').':</h4>';
                 $i = 1;
                 $user_added_list = array();
                 foreach ($result['users_added'] as $user) {
                     $user_info = api_get_user_info($user);
                     if (!empty($user_info)) {
-                        $user_added_list[] = $i . '. ' . api_get_person_name($user_info['firstname'], $user_info['lastname'], null, null, null, null, $user_info['username']);
+                        $user_added_list[] = $i.'. '.api_get_person_name($user_info['firstname'], $user_info['lastname'], null, null, null, null, $user_info['username']);
                         $i++;
                     }
                 }
@@ -115,13 +115,13 @@ 
             }
 
             if (!empty($result['users_deleted'])) {
-                $message .= '<br /><h4>' . get_lang('UsersDeleted') . ': </h4>';
+                $message .= '<br /><h4>'.get_lang('UsersDeleted').': </h4>';
                 $user_deleted_list = array();
                 $i = 1;
                 foreach ($result['users_deleted'] as $user) {
                     $user_info = api_get_user_info($user);
                     if (!empty($user_info)) {
-                        $user_deleted_list [] = $i . '. ' . api_get_person_name($user_info['firstname'], $user_info['lastname']);
+                        $user_deleted_list [] = $i.'. '.api_get_person_name($user_info['firstname'], $user_info['lastname']);
                         $i++;
                     }
                 }
@@ -142,7 +142,7 @@ 
 echo '<div class="actions">';
 echo Display::url(
     Display::return_icon('view_more_stats.gif', get_lang('AddUserToURL'), ''),
-    api_get_path(WEB_CODE_PATH) . 'admin/access_url_add_users_to_url.php'
+    api_get_path(WEB_CODE_PATH).'admin/access_url_add_users_to_url.php'
 );
 echo '</div>';
 
@@ -167,7 +167,7 @@ 
     }
 
     $sql = "SELECT u.user_id, lastname, firstname, username
-	  	  	FROM $tbl_user u WHERE status <> " . ANONYMOUS . " " .
+	  	  	FROM $tbl_user u WHERE status <> ".ANONYMOUS." ".
             $order_clause;
     $result = Database::query($sql);
     $Users = Database::store_result($result);
@@ -180,11 +180,11 @@ 
 }
 
 if ($add_type == 'multiple') {
-    $link_add_type_unique = '<a href="' . api_get_self() . '?add_type=unique&access_url_id=' . $access_url_id . '">' . get_lang('SessionAddTypeUnique') . '</a>';
+    $link_add_type_unique = '<a href="'.api_get_self().'?add_type=unique&access_url_id='.$access_url_id.'">'.get_lang('SessionAddTypeUnique').'</a>';
     $link_add_type_multiple = get_lang('SessionAddTypeMultiple');
 } else {
     $link_add_type_unique = get_lang('SessionAddTypeUnique');
-    $link_add_type_multiple = '<a href="' . api_get_self() . '?add_type=multiple&access_url_id=' . $access_url_id . '">' . get_lang('SessionAddTypeMultiple') . '</a>';
+    $link_add_type_multiple = '<a href="'.api_get_self().'?add_type=multiple&access_url_id='.$access_url_id.'">'.get_lang('SessionAddTypeMultiple').'</a>';
 }
 $url_list = UrlManager::get_url_data();
 ?>
@@ -196,7 +196,7 @@ 
 <form name="formulaire" method="post" action="<?php echo api_get_self(); ?>" style="margin:0px;" <?php if ($ajax_search) {
     echo ' onsubmit="valide();"';
 } ?> >
-    <?php echo get_lang('SelectUrl') . ' : '; ?>
+    <?php echo get_lang('SelectUrl').' : '; ?>
 <select name="access_url_id" onchange="javascript:send();">
 <option value="0"> <?php echo get_lang('SelectUrl') ?></option>
         <?php
@@ -232,7 +232,7 @@ 
     <td>
     <h3>
     <?php
-        $total_users = count($nosessionUsersList) +  count($sessionUsersList);
+        $total_users = count($nosessionUsersList) + count($sessionUsersList);
         echo get_lang('TotalAvailableUsers').' '.$total_users;
     ?>
     </h3>
@@ -242,7 +242,7 @@ 
   <td align="center"><b><?php echo get_lang('UserListInPlatform') ?> : <?php echo count($nosessionUsersList); ?></b>
   </td>
   <td></td>
-  <td align="center"><b><?php echo get_lang('UserListIn') . ' ' . $url_selected; ?> : <?php echo count($sessionUsersList); ?></b></td>
+  <td align="center"><b><?php echo get_lang('UserListIn').' '.$url_selected; ?> : <?php echo count($sessionUsersList); ?></b></td>
 </tr>
 <tr>
   <td align="center">
@@ -302,9 +302,9 @@ 
 		<br />
         <?php
         if (isset($_GET['add'])) {
-            echo '<button class="save" type="button" onclick="valide()" >' . get_lang('AddUsersToURL') . '</button>';
+            echo '<button class="save" type="button" onclick="valide()" >'.get_lang('AddUsersToURL').'</button>';
         } else {
-            echo '<button class="save" type="button" onclick="valide()" >' . get_lang('EditUsersToURL') . '</button>';
+            echo '<button class="save" type="button" onclick="valide()" >'.get_lang('EditUsersToURL').'</button>';
         }
         ?>
 	</td>

main/mySpace/progression.php

Indentation +27 added lines, -27 removed lines

@@ -33,36 +33,36 @@
 $result_course = Database::query($sql_course);
 
 if (Database::num_rows($result_course) > 0) {
-	if (isset($_POST['export'])) {
-		$export_result = export_csv($header, $data, 'test.csv'); // TODO: There is no data for exporting yet.
-		Display :: display_error_message($export_result);
-	}
-	echo '<table class="data_table"><tr><th>'.get_lang('Course').'</th><th>'.get_lang('TempsFrequentation').'</th><th>'.get_lang('Progression').'</th><th>'.get_lang('MoyenneTest').'</th></tr>';
-	$header = array(get_lang('Course', ''), get_lang('TempsFrequentation', ''), get_lang('Progression', ''), get_lang('MoyenneTest', ''));
-	while ($a_course = Database::fetch_array($result_course)) {
-		// TODO: This query is to be checked, there are no HotPotatoes tests results.
-		$sql_moy_test = "SELECT exe_result,exe_weighting
+    if (isset($_POST['export'])) {
+        $export_result = export_csv($header, $data, 'test.csv'); // TODO: There is no data for exporting yet.
+        Display :: display_error_message($export_result);
+    }
+    echo '<table class="data_table"><tr><th>'.get_lang('Course').'</th><th>'.get_lang('TempsFrequentation').'</th><th>'.get_lang('Progression').'</th><th>'.get_lang('MoyenneTest').'</th></tr>';
+    $header = array(get_lang('Course', ''), get_lang('TempsFrequentation', ''), get_lang('Progression', ''), get_lang('MoyenneTest', ''));
+    while ($a_course = Database::fetch_array($result_course)) {
+        // TODO: This query is to be checked, there are no HotPotatoes tests results.
+        $sql_moy_test = "SELECT exe_result,exe_weighting
 			FROM $tbl_track_exercice
 			WHERE c_id = ".$a_course['id'];
-		$result_moy_test = Database::query($sql_moy_test);
-		$result = 0;
-		$weighting = 0;
-		while ($moy_test = Database::fetch_array($result_moy_test)) {
-			$result = $result + $moy_test['exe_result'];
-			$weighting = $weighting + $moy_test['exe_weighting'];
-		}
-		if ($weighting != 0) {
-			$moyenne_test = round(($result * 100) / $weighting);
-		} else {
-			$moyenne_test = null;
-		}
-		echo '<tr><td>'.$a_course['title'].'</td><td> </td><td> </td><td>'.(is_null($moyenne_test) ? '' : $moyenne_test.'%').'</td> </tr>';
-	}
-	echo '</table>';
-	echo "<br /><br />";
-	echo "<form method='post'><input type='submit' name='export' value='".get_lang('ExportExcel')."'/><form>";
+        $result_moy_test = Database::query($sql_moy_test);
+        $result = 0;
+        $weighting = 0;
+        while ($moy_test = Database::fetch_array($result_moy_test)) {
+            $result = $result + $moy_test['exe_result'];
+            $weighting = $weighting + $moy_test['exe_weighting'];
+        }
+        if ($weighting != 0) {
+            $moyenne_test = round(($result * 100) / $weighting);
+        } else {
+            $moyenne_test = null;
+        }
+        echo '<tr><td>'.$a_course['title'].'</td><td> </td><td> </td><td>'.(is_null($moyenne_test) ? '' : $moyenne_test.'%').'</td> </tr>';
+    }
+    echo '</table>';
+    echo "<br /><br />";
+    echo "<form method='post'><input type='submit' name='export' value='".get_lang('ExportExcel')."'/><form>";
 } else {
-	echo get_lang('NoCourse');
+    echo get_lang('NoCourse');
 }
 
 Display :: display_footer();

main/auth/ldap/newUser.php

Indentation +7 added lines, -7 removed lines

@@ -21,17 +21,17 @@
 
 if ($ldap_login_success)
 {
-	//error_log('Found user '.$login.' on LDAP server',0);
-	/*
+    //error_log('Found user '.$login.' on LDAP server',0);
+    /*
 		In here, we know that
 		- the user does not exist in dokeos
 		- the users login and password are correct
 	*/
-	$info_array = ldap_find_user_info($login);
-	ldap_put_user_info_locally($login, $info_array);
+    $info_array = ldap_find_user_info($login);
+    ldap_put_user_info_locally($login, $info_array);
 } else {
     //error_log('Could not find '.$login.' on LDAP server',0);
-	$loginFailed = true;
-	unset($_user['user_id']);
-	$uidReset = false;
+    $loginFailed = true;
+    unset($_user['user_id']);
+    $uidReset = false;
 }

Braces +1 added lines, -2 removed lines

@@ -19,8 +19,7 @@
 
 $ldap_login_success = ldap_login($login, $password);
 
-if ($ldap_login_success)
-{
+if ($ldap_login_success) {
 	//error_log('Found user '.$login.' on LDAP server',0);
 	/*
 		In here, we know that

main/inc/ajax/skill.ajax.php

Indentation +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
                     //$gradebook['name'] = $gradebook['name'];
                     //$gradebook_list[]  = $gradebook;
                 } else {
-                  //  $gradebook['name'] = $gradebook_list[$gradebook['parent_id']]['name'].' > '.$gradebook['name'];
+                    //  $gradebook['name'] = $gradebook_list[$gradebook['parent_id']]['name'].' > '.$gradebook['name'];
                     //$gradebook_list[]  = $gradebook;
                 }
             }