chamilo / chamilo-lms

main/inc/lib/grade_model.lib.php

Doc Comments +2 added lines, -2 removed lines

@@ -259,10 +259,10 @@
     }
 
     /**
-     * @param $form
+     * @param CatForm $form
      * @param string $name
      * @param null $default_value
-     * @return bool
+     * @return false|null
      */
     public function fill_grade_model_select_in_form(&$form, $name = 'gradebook_model_id', $default_value = null)
     {

Indentation +12 added lines, -12 removed lines

@@ -51,15 +51,15 @@ 
     /**
      * Displays the title + grid
      */
-	public function display()
+    public function display()
     {
-		// action links
-		echo '<div class="actions" style="margin-bottom:20px">';
+        // action links
+        echo '<div class="actions" style="margin-bottom:20px">';
         echo '<a href="grade_models.php">'.Display::return_icon('back.png',get_lang('Back'),'', ICON_SIZE_MEDIUM).'</a>';
-		echo '<a href="'.api_get_self().'?action=add">'.Display::return_icon('add.png', get_lang('Add'), '', ICON_SIZE_MEDIUM).'</a>';
-		echo '</div>';
+        echo '<a href="'.api_get_self().'?action=add">'.Display::return_icon('add.png', get_lang('Add'), '', ICON_SIZE_MEDIUM).'</a>';
+        echo '</div>';
         echo Display::grid_html('grade_model');
-	}
+    }
 
     /**
      * Returns a Form validator Obj
@@ -117,7 +117,7 @@ 
         }
 
         $form->addElement('hidden', 'maxvalue', '100');
-		$form->addElement('hidden', 'minvalue', '0');
+        $form->addElement('hidden', 'minvalue', '0');
         $renderer = & $form->defaultRenderer();
 
         $component_array = array();
@@ -192,7 +192,7 @@ 
         // Setting the rules
         $form->addRule('name', get_lang('ThisFieldIsRequired'), 'required');
 
-		return $form;
+        return $form;
     }
 
     /**
@@ -255,7 +255,7 @@ 
      */
     public function delete($id)
     {
-	    parent::delete($id);
+        parent::delete($id);
     }
 
     /**
@@ -309,11 +309,11 @@ 
     /**
      * GradeModelComponents constructor.
      */
-	public function __construct()
+    public function __construct()
     {
         parent::__construct();
         $this->table = Database::get_main_table(TABLE_GRADE_MODEL_COMPONENTS);
-	}
+    }
 
     /**
      * @param array $params
@@ -322,7 +322,7 @@ 
      */
     public function save($params, $show_query = false)
     {
-	    $id = parent::save($params, $show_query);
+        $id = parent::save($params, $show_query);
 
         return $id;
     }

Spacing +7 added lines, -7 removed lines

@@ -16,7 +16,7 @@ 
     public function __construct()
     {
         parent::__construct();
-        $this->table =  Database::get_main_table(TABLE_GRADE_MODEL);
+        $this->table = Database::get_main_table(TABLE_GRADE_MODEL);
     }
 
     /**
@@ -55,7 +55,7 @@ 
     {
 		// action links
 		echo '<div class="actions" style="margin-bottom:20px">';
-        echo '<a href="grade_models.php">'.Display::return_icon('back.png',get_lang('Back'),'', ICON_SIZE_MEDIUM).'</a>';
+        echo '<a href="grade_models.php">'.Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM).'</a>';
 		echo '<a href="'.api_get_self().'?action=add">'.Display::return_icon('add.png', get_lang('Add'), '', ICON_SIZE_MEDIUM).'</a>';
 		echo '</div>';
         echo Display::grid_html('grade_model');
@@ -129,7 +129,7 @@ 
             $form->addElement('hidden', 'components['.$i.'][id]', null);
 
             $template_percentage =
-            '<div id=' . $i . ' style="display: '.(($i<=$nr_items)?'inline':'none').';" class="form-group">                
+            '<div id='.$i.' style="display: '.(($i <= $nr_items) ? 'inline' : 'none').';" class="form-group">                
                 <label for="" class="col-sm-2 control-label">
                     {label}
                 </label>
@@ -143,11 +143,11 @@ 
 
             $template_title =
             '&nbsp{element} <!-- BEGIN error --> <span class="form_error">{error}</span><!-- END error -->
-             <a href="javascript:plusItem(' . ($counter+1) . ')">
-                '.Display::return_icon('add.png', get_lang('Add'), ['id' => 'plus-' . ($counter+1), 'style' => 'display: '.(($counter>=$nr_items) ? 'inline':'none') ]).'
+             <a href="javascript:plusItem(' . ($counter + 1).')">
+                '.Display::return_icon('add.png', get_lang('Add'), ['id' => 'plus-'.($counter + 1), 'style' => 'display: '.(($counter >= $nr_items) ? 'inline' : 'none')]).'
             </a>
-            <a href="javascript:minItem(' . ($counter) . ')">
-                '.Display::return_icon('delete.png', get_lang('Delete'), ['id' => 'min-' . ($counter), 'style' => 'display: '.(($counter>=$nr_items) ? 'inline':'none') ]).'
+            <a href="javascript:minItem(' . ($counter).')">
+                '.Display::return_icon('delete.png', get_lang('Delete'), ['id' => 'min-'.($counter), 'style' => 'display: '.(($counter >= $nr_items) ? 'inline' : 'none')]).'
             </a>
             </div></div>';
             $renderer->setElementTemplate($template_title, 'components['.$i.'][title]');

main/attendance/attendance_add.php

Spacing +6 added lines, -6 removed lines

@@ -12,7 +12,7 @@ 
 
 // error messages
 if (isset($error)) {
-    Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'),false);
+    Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'), false);
 }
 
 if (!isset($error)) {
@@ -28,7 +28,7 @@ 
 $form->addElement('hidden', 'sec_token', $token);
 
 $form->addText('title', get_lang('Title'), true);
-$form->applyFilter('title','html_filter');
+$form->applyFilter('title', 'html_filter');
 $form->addHtmlEditor(
     'description',
     get_lang('Description'),
@@ -41,7 +41,7 @@ 
 if ((api_get_session_id() != 0 && Gradebook::is_active()) || api_get_session_id() == 0) {
     $form->addButtonAdvancedSettings('id_qualify');
 
-    $form->addElement('html','<div id="id_qualify_options" style="display:none">');
+    $form->addElement('html', '<div id="id_qualify_options" style="display:none">');
 
     // Qualify Attendance for gradebook option
     $form->addElement(
@@ -51,7 +51,7 @@ 
         get_lang('QualifyAttendanceGradebook'),
         'onclick="javascript: if(this.checked){document.getElementById(\'options_field\').style.display = \'block\';}else{document.getElementById(\'options_field\').style.display = \'none\';}"'
     );
-    $form->addElement('html','<div id="options_field" style="display:none">');
+    $form->addElement('html', '<div id="options_field" style="display:none">');
 
     GradebookUtils::load_gradebook_select_in_tool($form);
 
@@ -64,8 +64,8 @@ 
         'value="0.00" Style="width:40px" onfocus="javascript: this.select();"'
     );
     $form->applyFilter('attendance_weight', 'html_filter');
-    $form->addElement('html','</div>');
-    $form->addElement('html','</div>');
+    $form->addElement('html', '</div>');
+    $form->addElement('html', '</div>');
 }
 $form->addButtonCreate(get_lang('Save'));
 $form->display();

main/attendance/attendance_edit.php

Spacing +6 added lines, -6 removed lines

@@ -12,7 +12,7 @@ 
 
 // error messages
 if (isset($error)) {
-    Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'),false);
+    Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'), false);
 }
 
 if (!isset($error)) {
@@ -49,18 +49,18 @@ 
 if (Gradebook::is_active()) {
     if (!empty($attendance_qualify_title) || !empty($attendance_weight)) {
         $form->addButtonAdvancedSettings('id_qualify');
-        $form->addElement('html','<div id="id_qualify_options" style="display:block">');
+        $form->addElement('html', '<div id="id_qualify_options" style="display:block">');
         $form->addElement(
             'checkbox',
             'attendance_qualify_gradebook',
             '',
             get_lang('QualifyAttendanceGradebook'),
-            array('checked'=>'true','onclick'=>'javascript: if(this.checked){document.getElementById(\'options_field\').style.display = \'block\';}else{document.getElementById(\'options_field\').style.display = \'none\';}')
+            array('checked'=>'true', 'onclick'=>'javascript: if(this.checked){document.getElementById(\'options_field\').style.display = \'block\';}else{document.getElementById(\'options_field\').style.display = \'none\';}')
         );
-        $form->addElement('html','<div id="options_field" style="display:block">');
+        $form->addElement('html', '<div id="options_field" style="display:block">');
     } else {
         $form->addButtonAdvancedSettings('id_qualify');
-        $form->addElement('html','<div id="id_qualify_options" style="display:none">');
+        $form->addElement('html', '<div id="id_qualify_options" style="display:none">');
         $form->addElement(
             'checkbox',
             'attendance_qualify_gradebook',
@@ -68,7 +68,7 @@ 
             get_lang('QualifyAttendanceGradebook'),
             'onclick="javascript: if(this.checked){document.getElementById(\'options_field\').style.display = \'block\';}else{document.getElementById(\'options_field\').style.display = \'none\';}"'
         );
-        $form->addElement('html','<div id="options_field" style="display:none">');
+        $form->addElement('html', '<div id="options_field" style="display:none">');
     }
     GradebookUtils::load_gradebook_select_in_tool($form);
     $form->addElement('text', 'attendance_qualify_title', get_lang('TitleColumnGradebook'));

main/attendance/attendance_sheet.php

Spacing +16 added lines, -16 removed lines

@@ -24,7 +24,7 @@ 
     $form = new FormValidator(
             'filter',
             'post',
-            'index.php?action=attendance_sheet_list&' . api_get_cidreq().'&attendance_id=' . $attendance_id,
+            'index.php?action=attendance_sheet_list&'.api_get_cidreq().'&attendance_id='.$attendance_id,
             null,
             array(),
             'inline'
@@ -215,7 +215,7 @@ 
                             <th width="100px"><?php echo get_lang('AttendancesFaults')?></th>
                         </tr>
                         <tr class="tableFloatingHeaderOriginal" >
-                            <th width="10px"><?php echo '#';?></th>
+                            <th width="10px"><?php echo '#'; ?></th>
                             <th width="10px"><?php echo get_lang('Photo')?></th>
                             <th width="150px"><?php echo get_lang('LastName')?></th>
                             <th width="140px"><?php echo get_lang('FirstName')?></th>
@@ -229,9 +229,9 @@ 
                         foreach ($users_in_course as $data) {
                             $faults = 0;
                             if ($i % 2 == 0) {
-                                $class='row_odd';
+                                $class = 'row_odd';
                             } else {
-                                $class='row_even';
+                                $class = 'row_even';
                             }
                             $username = api_htmlentities(sprintf(get_lang('LoginX'), $data['username']), ENT_QUOTES);
                             ?>
@@ -241,7 +241,7 @@ 
                                 <td><span title="<?php echo $username ?>"><?php echo $data['lastname'] ?></span></td>
                                 <td><?php echo $data['firstname'] ?></td>
                                 <td>
-                                    <div class="attendance-faults-bar" style="background-color:<?php echo (!empty($data['result_color_bar'])?$data['result_color_bar']:'none') ?>">
+                                    <div class="attendance-faults-bar" style="background-color:<?php echo (!empty($data['result_color_bar']) ? $data['result_color_bar'] : 'none') ?>">
                                         <?php echo $data['attendance_result'] ?>
                                     </div>
                                 </td>
@@ -263,7 +263,7 @@ 
                     foreach ($attendant_calendar as $calendar) {
                         $date = $calendar['date'];
                         $time = $calendar['time'];
-                        $datetime = '<div class="grey">'. $date . ' - ' . $time . '</div>';
+                        $datetime = '<div class="grey">'.$date.' - '.$time.'</div>';
 
                         $img_lock = Display::return_icon(
                             'lock-closed.png',
@@ -272,21 +272,21 @@ 
                         );
 
                         if (!empty($calendar['done_attendance'])) {
-                            $datetime = '<div class="blue">' . $date . ' - ' . $time . '</div>';
+                            $datetime = '<div class="blue">'.$date.' - '.$time.'</div>';
                         }
                         $disabled_check = 'disabled = "true"';
                         $input_hidden = '<input type="hidden" id="hidden_input_'.$calendar['id'].'" name="hidden_input[]" value="" disabled />';
                         if ($next_attendance_calendar_id == $calendar['id']) {
                             $input_hidden = '<input type="hidden" id="hidden_input_'.$calendar['id'].'" name="hidden_input[]" value="'.$calendar['id'].'" />';
                             $disabled_check = '';
-                            $img_lock = Display::return_icon('lock-closed.png',get_lang('DateLock'),array('class'=>'img_unlock','id'=>'datetime_column_'.$calendar['id']));
+                            $img_lock = Display::return_icon('lock-closed.png', get_lang('DateLock'), array('class'=>'img_unlock', 'id'=>'datetime_column_'.$calendar['id']));
                         }
 
                         $result .= '<th>';
                         $result .= '<div class="date-attendance">'.$datetime.'&nbsp;';
 
                         if (api_is_allowed_to_edit(null, true)) {
-                            $result .= '<span id="attendance_lock" style="cursor:pointer">'.(!$is_locked_attendance || api_is_platform_admin()?$img_lock:'').'</span>';
+                            $result .= '<span id="attendance_lock" style="cursor:pointer">'.(!$is_locked_attendance || api_is_platform_admin() ? $img_lock : '').'</span>';
                         }
 
                         if ($is_locked_attendance == false) {
@@ -297,7 +297,7 @@ 
                     }
                 } else {
                     $result  = '<th width="2000px"><span><a href="index.php?'.api_get_cidreq().'&action=calendar_list&attendance_id='.$attendance_id.'">';
-                    $result .= Display::return_icon('attendance_calendar.png',get_lang('AttendanceCalendar'),'',ICON_SIZE_MEDIUM).' '.get_lang('GoToAttendanceCalendar').'</a></span></th>';
+                    $result .= Display::return_icon('attendance_calendar.png', get_lang('AttendanceCalendar'), '', ICON_SIZE_MEDIUM).' '.get_lang('GoToAttendanceCalendar').'</a></span></th>';
                 }
 
                 echo '<tr class="tableFloatingHeader row_odd" style="position: absolute; top: 0px; left: 0px; visibility: hidden; margin:0px;padding:0px">';
@@ -311,7 +311,7 @@ 
                 $i = 0;
                 foreach ($users_in_course as $user) {
                     $class = '';
-                    if ($i%2 == 0) {
+                    if ($i % 2 == 0) {
                         $class = 'row_even';
                     } else {
                         $class = 'row_odd';
@@ -358,7 +358,7 @@ 
                                     echo '<input type="checkbox" name="check_presence['.$calendar['id'].'][]" value="'.$user['user_id'].'" '.$disabled.' '.$checked.' />';
                                     echo '<span class="anchor_'.$calendar['id'].'"></span>';
                                 } else {
-                                    echo $presence ? Display::return_icon('checkbox_on.gif',get_lang('Presence')) : Display::return_icon('checkbox_off.gif',get_lang('Presence'));
+                                    echo $presence ? Display::return_icon('checkbox_on.gif', get_lang('Presence')) : Display::return_icon('checkbox_off.gif', get_lang('Presence'));
                                 }
                             } else {
                                 switch ($presence) {
@@ -389,7 +389,7 @@ 
                         </td>';
                     }
                     echo '</tr>';
-                    $i++ ;
+                    $i++;
                 }
                 echo '</tbody></table>';
                 echo '</div></div>';
@@ -417,13 +417,13 @@ 
     echo Display::page_header(get_lang('AttendanceSheetReport'));
     // View for students
     ?>
-    <?php if(!empty($users_presence)) { ?>
+    <?php if (!empty($users_presence)) { ?>
         <div>
             <table width="250px;">
                 <tr>
                     <td><?php echo get_lang('ToAttend').': ' ?></td>
                     <td>
-                        <center><div class="attendance-faults-bar" style="background-color:<?php echo (!empty($faults['color_bar'])?$faults['color_bar']:'none') ?>">
+                        <center><div class="attendance-faults-bar" style="background-color:<?php echo (!empty($faults['color_bar']) ? $faults['color_bar'] : 'none') ?>">
                         <?php echo $faults['faults'].'/'.$faults['total'].' ('.$faults['faults_porcent'].'%)' ?></div></center>
                     </td>
                 </tr>
@@ -448,7 +448,7 @@ 
                 ?>
                 <tr class="<?php echo $class ?>">
                     <td>
-                        <?php echo $presence['presence'] ? Display::return_icon('checkbox_on.gif',get_lang('Presence')) : Display::return_icon('checkbox_off.gif',get_lang('Presence')) ?>
+                        <?php echo $presence['presence'] ? Display::return_icon('checkbox_on.gif', get_lang('Presence')) : Display::return_icon('checkbox_off.gif', get_lang('Presence')) ?>
                         <?php echo "&nbsp; ".$presence['date_time'] ?>
                     </td>
                 </tr>

main/inc/lib/dashboard.lib.php

Indentation +39 added lines, -39 removed lines

@@ -307,8 +307,8 @@ 
             }
         }
 
-		return $block_data;
-	}
+        return $block_data;
+    }
 
     /**
      * get data about enabled dashboard block (stored insise block table)
@@ -491,42 +491,42 @@ 
         return $data;
     }
 
-	/**
-	 * This function update extra user blocks data after closing a dashboard block
-	 * @param int 		User id
-	 * @param string	plugin path
-	 * @param integer $user_id
-	 * @return bool
-	 */
-	public static function close_user_block($user_id, $path)
+    /**
+     * This function update extra user blocks data after closing a dashboard block
+     * @param int 		User id
+     * @param string	plugin path
+     * @param integer $user_id
+     * @return bool
+     */
+    public static function close_user_block($user_id, $path)
     {
-		$enabled_dashboard_blocks = self::get_enabled_dashboard_blocks($path);
-		$user_block_data = self::get_user_block_data($user_id);
-
-		foreach ($enabled_dashboard_blocks as $enabled_block) {
-			unset($user_block_data[$enabled_block['id']]);
-		}
-
-		// get columns and blocks id for updating extra user data
-		$columns = array();
-		$user_blocks_id = array();
-		foreach ($user_block_data as $data) {
-			$user_blocks_id[$data['block_id']] = true;
-			$columns[$data['block_id']] = $data['column'];
-		}
-
-		// update extra user blocks data
-		$upd_extra_field = self::store_user_blocks($user_id, $user_blocks_id, $columns);
-
-		return $upd_extra_field;
-	}
-
-	/**
-	 * get links for styles from dashboard plugins
-	 * @return string   links
-	 */
-	public static function get_links_for_styles_from_dashboard_plugins() {
-
-		return '<link rel="stylesheet" href="'.api_get_path(WEB_PLUGIN_PATH).'dashboard/css/default.css" type="text/css" />'.PHP_EOL;
-	}
+        $enabled_dashboard_blocks = self::get_enabled_dashboard_blocks($path);
+        $user_block_data = self::get_user_block_data($user_id);
+
+        foreach ($enabled_dashboard_blocks as $enabled_block) {
+            unset($user_block_data[$enabled_block['id']]);
+        }
+
+        // get columns and blocks id for updating extra user data
+        $columns = array();
+        $user_blocks_id = array();
+        foreach ($user_block_data as $data) {
+            $user_blocks_id[$data['block_id']] = true;
+            $columns[$data['block_id']] = $data['column'];
+        }
+
+        // update extra user blocks data
+        $upd_extra_field = self::store_user_blocks($user_id, $user_blocks_id, $columns);
+
+        return $upd_extra_field;
+    }
+
+    /**
+     * get links for styles from dashboard plugins
+     * @return string   links
+     */
+    public static function get_links_for_styles_from_dashboard_plugins() {
+
+        return '<link rel="stylesheet" href="'.api_get_path(WEB_PLUGIN_PATH).'dashboard/css/default.css" type="text/css" />'.PHP_EOL;
+    }
 }

Spacing +10 added lines, -10 removed lines

@@ -68,7 +68,7 @@ 
                         'tr',
                         Display::tag(
                             'td',
-                            get_lang('CheckFilePermissions') . ' ' . Security::remove_XSS($plugin_info_file),
+                            get_lang('CheckFilePermissions').' '.Security::remove_XSS($plugin_info_file),
                             array('colspan' => '3')
                         )
                     );
@@ -81,7 +81,7 @@ 
             foreach ($disabled_blocks_data as $disabled_block) {
                 echo '<tr style="background-color:#eee">';
                 echo '<td><center><input type="checkbox" name="disabled_block" value="true" checked disabled /></center>';
-                for ($j = 0 ; $j < count($table_cols); $j++) {
+                for ($j = 0; $j < count($table_cols); $j++) {
                     if (isset($disabled_block[strtolower($table_cols[$j])])) {
                         if ($j == 2) {
                             echo '<td>';
@@ -192,10 +192,10 @@ 
             // clean from block data
             if (!empty($not_selected_blocks_id)) {
                 $sql_check = "SELECT id FROM $tbl_block 
-                              WHERE id IN(".implode(',',$not_selected_blocks_id).")";
+                              WHERE id IN(".implode(',', $not_selected_blocks_id).")";
                 $rs_check = Database::query($sql_check);
                 if (Database::num_rows($rs_check) > 0) {
-                    $del = "DELETE FROM $tbl_block WHERE id IN(".implode(',',$not_selected_blocks_id).")";
+                    $del = "DELETE FROM $tbl_block WHERE id IN(".implode(',', $not_selected_blocks_id).")";
                     Database::query($del);
                 }
             }
@@ -215,7 +215,7 @@ 
                         $affected_rows = Database::affected_rows($result);
                     } else {
                         // insert
-                        $plugin_info_file = $dashboard_pluginpath . $testplugin . "/$testplugin.info";
+                        $plugin_info_file = $dashboard_pluginpath.$testplugin."/$testplugin.info";
                         $plugin_info = array();
                         if (file_exists($plugin_info_file)) {
                             $plugin_info = api_parse_info_file($plugin_info_file);
@@ -285,7 +285,7 @@ 
         // We check if plugin exists inside directory for updating active field
         $sql = "SELECT * FROM $tbl_block";
         $rs = Database::query($sql);
-        if (Database::num_rows($rs) > 0){
+        if (Database::num_rows($rs) > 0) {
             while ($row = Database::fetch_array($rs)) {
                 if (!in_array($row['path'], $possibleplugins)) {
                     $active = 0;
@@ -393,13 +393,13 @@ 
                     echo '<td>'.$block['description'].'</td>';
                     echo '<td>
                             <select class="selectpicker show-tick form-control" name="columns['.$block['id'].']">
-                            <option value="1" '.(isset($user_block_data[$block['id']]) && $user_block_data[$block['id']]['column']==1?'selected':'').' >1</option>
-                            <option value="2" '.(isset($user_block_data[$block['id']]) && $user_block_data[$block['id']]['column']==2?'selected':'').' >2</option>
+                            <option value="1" '.(isset($user_block_data[$block['id']]) && $user_block_data[$block['id']]['column'] == 1 ? 'selected' : '').' >1</option>
+                            <option value="2" '.(isset($user_block_data[$block['id']]) && $user_block_data[$block['id']]['column'] == 2 ? 'selected' : '').' >2</option>
                             </select>
                           </td>';
                     echo '</tr>';
                 } else {
-                    echo Display::tag('tr',  Display::tag('td', get_lang('Error').' '.$controller_class, array('colspan'=>'3')));
+                    echo Display::tag('tr', Display::tag('td', get_lang('Error').' '.$controller_class, array('colspan'=>'3')));
                 }
             }
 
@@ -449,7 +449,7 @@ 
      */
     public static function store_user_blocks($user_id, $enabled_blocks, $columns)
     {
-        $selected_blocks_id  = array();
+        $selected_blocks_id = array();
         if (is_array($enabled_blocks) && count($enabled_blocks) > 0) {
             $selected_blocks_id = array_keys($enabled_blocks);
         }

Doc Comments +1 added lines, -1 removed lines

@@ -498,7 +498,7 @@
 	 * @param int 		User id
 	 * @param string	plugin path
 	 * @param integer $user_id
-	 * @return bool
+	 * @return false|string
 	 */
 	public static function close_user_block($user_id, $path)
     {

main/inc/lib/link.lib.php

Doc Comments +10 added lines, -1 removed lines

@@ -477,6 +477,7 @@ 
      *
      * Get link info
      * @param int link id
+     * @param integer $id
      * @return array link info
      *
      **/
@@ -1058,7 +1059,9 @@ 
     /**
      * Displays the edit, delete and move icons
      * @param int   Category ID
-     * @return void
+     * @param integer $currentCategory
+     * @param integer $countCategories
+     * @return string
      * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
      */
     public static function showCategoryAdminTools($category, $currentCategory, $countCategories)
@@ -1222,6 +1225,7 @@ 
     /**
      * CSV file import functions
      * @author René Haentjens , Ghent University
+     * @param string $catname
      */
     public static function get_cat($catname)
     {
@@ -1261,6 +1265,11 @@ 
     /**
      * CSV file import functions
      * @author René Haentjens , Ghent University
+     * @param string $url
+     * @param string $title
+     * @param string $description
+     * @param string $on_homepage
+     * @param string $hidden
      */
     public static function put_link($url, $cat, $title, $description, $on_homepage, $hidden)
     {

Spacing +104 added lines, -104 removed lines

@@ -79,11 +79,11 @@ 
         $params['session_id'] = api_get_session_id();
         $params['category_id'] = isset($params['category_id']) ? $params['category_id'] : 0;
 
-        $sql =  "SELECT MAX(display_order)
+        $sql = "SELECT MAX(display_order)
                 FROM  ".$this->table."
                 WHERE
                     c_id = $courseId AND
-                    category_id = '" . intval($params['category_id'])."'";
+                    category_id = '".intval($params['category_id'])."'";
         $result = Database:: query($sql);
         list ($orderMax) = Database:: fetch_row($result);
         $order = $orderMax + 1;
@@ -184,7 +184,7 @@ 
 
             // We ensure URL to be absolute.
             if (strpos($urllink, '://') === false) {
-                $urllink = 'http://' . $urllink;
+                $urllink = 'http://'.$urllink;
             }
 
             // If the title is empty, we use the URL as title.
@@ -206,7 +206,7 @@ 
                     'c_id' => $course_id,
                     'url' => $urllink,
                     'title' => $title,
-                    'description' => $description ,
+                    'description' => $description,
                     'category_id' => $selectcategory,
                     'on_homepage' => $onhomepage,
                     'target' => $target,
@@ -217,9 +217,9 @@ 
                 if ((api_get_setting('search_enabled') == 'true') &&
                     $link_id && extension_loaded('xapian')
                 ) {
-                    require_once api_get_path(LIBRARY_PATH) . 'search/ChamiloIndexer.class.php';
-                    require_once api_get_path(LIBRARY_PATH) . 'search/IndexableChunk.class.php';
-                    require_once api_get_path(LIBRARY_PATH) . 'specific_fields_manager.lib.php';
+                    require_once api_get_path(LIBRARY_PATH).'search/ChamiloIndexer.class.php';
+                    require_once api_get_path(LIBRARY_PATH).'search/IndexableChunk.class.php';
+                    require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php';
 
                     $course_int_id = $_course['real_id'];
                     $courseCode = $_course['code'];
@@ -232,7 +232,7 @@ 
                         if (isset($_REQUEST[$specific_field['code']])) {
                             $sterms = trim($_REQUEST[$specific_field['code']]);
                             if (!empty($sterms)) {
-                                $all_specific_terms .= ' ' . $sterms;
+                                $all_specific_terms .= ' '.$sterms;
                                 $sterms = explode(',', $sterms);
                                 foreach ($sterms as $sterm) {
                                     $ic_slide->addTerm(
@@ -259,12 +259,12 @@ 
                         SE_COURSE_ID => $courseCode,
                         SE_TOOL_ID => TOOL_LINK,
                         SE_DATA => array(
-                            'link_id' => (int)$link_id
+                            'link_id' => (int) $link_id
                         ),
-                        SE_USER => (int)api_get_user_id(),
+                        SE_USER => (int) api_get_user_id(),
                     );
                     $ic_slide->xapian_data = serialize($xapian_data);
-                    $description = $all_specific_terms . ' ' . $description;
+                    $description = $all_specific_terms.' '.$description;
                     $ic_slide->addValue('content', $description);
 
                     // Add category name if set.
@@ -276,7 +276,7 @@ 
                         $sql_cat = sprintf(
                             $sql_cat,
                             $table_link_category,
-                            (int)$selectcategory,
+                            (int) $selectcategory,
                             $course_int_id
                         );
                         $result = Database:: query($sql_cat);
@@ -393,7 +393,7 @@ 
                 // but the visibility is set to 2 (in item_property).
                 // This will make a restore function possible for the platform administrator.
                 $sql = "UPDATE $tbl_link SET on_homepage='0'
-                        WHERE c_id = $course_id AND id='" . $id . "'";
+                        WHERE c_id = $course_id AND id='".$id."'";
                 Database:: query($sql);
 
                 api_item_property_update(
@@ -409,12 +409,12 @@ 
                 break;
             case 'category':
                 // First we delete the category itself and afterwards all the links of this category.
-                $sql = "DELETE FROM " . $tbl_categories . "
-                        WHERE c_id = $course_id AND id='" . $id . "'";
+                $sql = "DELETE FROM ".$tbl_categories."
+                        WHERE c_id = $course_id AND id='".$id."'";
                 Database:: query($sql);
 
-                $sql = "DELETE FROM " . $tbl_link . "
-                        WHERE c_id = $course_id AND category_id='" . $id . "'";
+                $sql = "DELETE FROM ".$tbl_link."
+                        WHERE c_id = $course_id AND category_id='".$id."'";
                 Database:: query($sql);
 
                 api_item_property_update(
@@ -451,16 +451,16 @@ 
             $res = Database:: query($sql);
             if (Database:: num_rows($res) > 0) {
                 $row = Database:: fetch_array($res);
-                require_once api_get_path(LIBRARY_PATH) . 'search/ChamiloIndexer.class.php';
+                require_once api_get_path(LIBRARY_PATH).'search/ChamiloIndexer.class.php';
                 $di = new ChamiloIndexer();
-                $di->remove_document((int)$row['search_did']);
+                $di->remove_document((int) $row['search_did']);
             }
             $sql = 'DELETE FROM %s WHERE course_code=\'%s\' AND tool_id=\'%s\' AND ref_id_high_level=%s LIMIT 1';
             $sql = sprintf($sql, $tbl_se_ref, $course_id, TOOL_LINK, $link_id);
             Database:: query($sql);
 
             // Remove terms from db.
-            require_once api_get_path(LIBRARY_PATH) . 'specific_fields_manager.lib.php';
+            require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php';
             delete_all_values_for_item($course_id, TOOL_DOCUMENT, $link_id);
         }
     }
@@ -482,7 +482,7 @@ 
         }
 
         $sql = "SELECT * FROM $tbl_link
-                WHERE c_id = $course_id AND id='" . intval($id) . "' ";
+                WHERE c_id = $course_id AND id='".intval($id)."' ";
         $result = Database::query($sql);
         $data = array();
         if (Database::num_rows($result)) {
@@ -512,7 +512,7 @@ 
 
         // We ensure URL to be absolute.
         if (strpos($values['url'], '://') === false) {
-            $values['url'] = 'http://' . $_POST['url'];
+            $values['url'] = 'http://'.$_POST['url'];
         }
 
         // If the title is empty, we use the URL as title.
@@ -535,7 +535,7 @@ 
 
         // Finding the old category_id.
         $sql = "SELECT * FROM $tbl_link
-                WHERE c_id = $course_id AND id='" . $id . "'";
+                WHERE c_id = $course_id AND id='".$id."'";
         $result = Database:: query($sql);
         $row = Database:: fetch_array($result);
         $category_id = $row['category_id'];
@@ -545,7 +545,7 @@ 
                     FROM $tbl_link 
                     WHERE
                         c_id = $course_id AND
-                        category_id='" . intval($values['category_id']) . "'";
+                        category_id='".intval($values['category_id'])."'";
             $result = Database:: query($sql);
             list ($max_display_order) = Database:: fetch_row($result);
             $max_display_order++;
@@ -614,7 +614,7 @@ 
                             $_REQUEST[$specific_field['code']]
                         );
                         if (!empty($sterms)) {
-                            $all_specific_terms .= ' ' . $sterms;
+                            $all_specific_terms .= ' '.$sterms;
                             $sterms = explode(',', $sterms);
                             foreach ($sterms as $sterm) {
                                 $ic_slide->addTerm(
@@ -641,13 +641,13 @@ 
                     SE_COURSE_ID => $course_id,
                     SE_TOOL_ID => TOOL_LINK,
                     SE_DATA => array(
-                        'link_id' => (int)$id
+                        'link_id' => (int) $id
                     ),
-                    SE_USER => (int)api_get_user_id(),
+                    SE_USER => (int) api_get_user_id(),
 
                 );
                 $ic_slide->xapian_data = serialize($xapian_data);
-                $link_description = $all_specific_terms . ' ' . $link_description;
+                $link_description = $all_specific_terms.' '.$link_description;
                 $ic_slide->addValue('content', $link_description);
 
                 // Add category name if set.
@@ -675,7 +675,7 @@ 
                 $di = new ChamiloIndexer();
                 isset ($_POST['language']) ? $lang = Database:: escape_string($_POST['language']) : $lang = 'english';
                 $di->connectDb(null, null, $lang);
-                $di->remove_document((int)$se_ref['search_did']);
+                $di->remove_document((int) $se_ref['search_did']);
                 $di->addChunk($ic_slide);
 
                 // Index and return search engine document id.
@@ -796,7 +796,7 @@ 
         $sql = "SELECT *, linkcat.id
                 FROM $tblLinkCategory linkcat
                 WHERE
-                    linkcat.c_id = " . $courseId . "
+                    linkcat.c_id = ".$courseId."
                     $sessionCondition
                 ORDER BY linkcat.display_order DESC";
 
@@ -808,10 +808,10 @@ 
                 INNER JOIN $tblItemProperty itemproperties
                 ON (linkcat.id = itemproperties.ref AND linkcat.c_id = itemproperties.c_id)
                 WHERE
-                    itemproperties.tool = '" . TOOL_LINK_CATEGORY . "' AND
+                    itemproperties.tool = '".TOOL_LINK_CATEGORY."' AND
                     (itemproperties.visibility = '0' OR itemproperties.visibility = '1')
                     $sessionCondition AND
-                    linkcat.c_id = " . $courseId . "
+                    linkcat.c_id = ".$courseId."
                 ORDER BY linkcat.display_order DESC";
 
         $result = Database::query($sql);
@@ -834,10 +834,10 @@ 
                 INNER JOIN $tblItemProperty itemproperties
                 ON (linkcat.id = itemproperties.ref AND linkcat.c_id = itemproperties.c_id)
                 WHERE
-                    itemproperties.tool = '" . TOOL_LINK_CATEGORY . "' AND
+                    itemproperties.tool = '".TOOL_LINK_CATEGORY."' AND
                     (itemproperties.visibility = '0' OR itemproperties.visibility = '1')
                     $sessionCondition AND
-                    linkcat.c_id = " . $courseId . "
+                    linkcat.c_id = ".$courseId."
                 ORDER BY linkcat.display_order DESC
                 ";
         $result = Database::query($sql);
@@ -867,12 +867,12 @@ 
                 INNER JOIN $TABLE_ITEM_PROPERTY itemproperties
                 ON (link.id=itemproperties.ref AND link.c_id = itemproperties.c_id)
                 WHERE
-                    itemproperties.tool='" . TOOL_LINK . "' AND
-                    link.category_id='" . $catid . "' AND
+                    itemproperties.tool='".TOOL_LINK."' AND
+                    link.category_id='" . $catid."' AND
                     (itemproperties.visibility='0' OR itemproperties.visibility='1')
                     $condition_session AND
-                    link.c_id = " . $course_id . " AND
-                    itemproperties.c_id = " . $course_id . "
+                    link.c_id = ".$course_id." AND
+                    itemproperties.c_id = " . $course_id."
                 ORDER BY link.display_order ASC";
         $result = Database:: query($sql);
         $numberoflinks = Database:: num_rows($result);
@@ -895,23 +895,23 @@ 
                         'check-circle-o',
                         'default btn-sm',
                         array(
-                            'onclick' => "check_url('" . $myrow['id'] . "', '" . addslashes($myrow['url']) . "');",
+                            'onclick' => "check_url('".$myrow['id']."', '".addslashes($myrow['url'])."');",
                             'title' => get_lang('CheckURL')
                         )
                     );
                     $link_validator .= Display::span(
                         '',
                         array(
-                        'id' => 'url_id_' . $myrow['id'],
+                        'id' => 'url_id_'.$myrow['id'],
                         'class' => 'check-link'
                         )
                     );
 
                     if ($session_id == $myrow['session_id']) {
-                        $url = api_get_self() . '?' . api_get_cidreq() .
-                            '&action=editlink&category=' . (!empty ($category) ? $category : '') .
-                            '&id=' . $myrow['id'] .
-                            '&category_id=' . $myrow['id'];
+                        $url = api_get_self().'?'.api_get_cidreq().
+                            '&action=editlink&category='.(!empty ($category) ? $category : '').
+                            '&id='.$myrow['id'].
+                            '&category_id='.$myrow['id'];
                         $title = get_lang('Edit');
                         $toolbar .= Display::toolbarButton(
                             '',
@@ -924,10 +924,10 @@ 
                         );
 
                         if ($myrow['visibility'] == '1') {
-                            $url .= 'link.php?' . api_get_cidreq() .
-                                '&sec_token=' . $token .
-                                '&action=invisible&id=' . $myrow['id'] .
-                                '&scope=link&category_id=' . $myrow['category_id'];
+                            $url .= 'link.php?'.api_get_cidreq().
+                                '&sec_token='.$token.
+                                '&action=invisible&id='.$myrow['id'].
+                                '&scope=link&category_id='.$myrow['category_id'];
                             $title = get_lang('MakeInvisible');
                             $toolbar .= Display::toolbarButton(
                                 '',
@@ -941,7 +941,7 @@ 
                         }
 
                         if ($myrow['visibility'] == '0') {
-                            $url .= 'link.php?' . api_get_cidreq() .'&sec_token=' . $token .'&action=visible&id=' . $myrow['id'] .'&scope=link&category_id=' . $myrow['category_id'];
+                            $url .= 'link.php?'.api_get_cidreq().'&sec_token='.$token.'&action=visible&id='.$myrow['id'].'&scope=link&category_id='.$myrow['category_id'];
                             $title = get_lang('MakeVisible');
                             $toolbar .= Display::toolbarButton(
                                 '',
@@ -962,24 +962,24 @@ 
                         ];
                         $toolbar .= Display::toolbarButton(
                             get_lang('MoveUp'),
-                            'link.php?' . api_get_cidreq() . '&' . http_build_query($moveLinkParams),
+                            'link.php?'.api_get_cidreq().'&'.http_build_query($moveLinkParams),
                             'level-up',
                             'default',
-                            ['class' => 'btn-sm ' . ($i === 1 ? 'disabled' : '')],
+                            ['class' => 'btn-sm '.($i === 1 ? 'disabled' : '')],
                             false
                         );
                         $moveLinkParams['action'] = 'move_link_down';
                         $toolbar .= Display::toolbarButton(
                             get_lang('MoveDown'),
-                            'link.php?' . api_get_cidreq() . '&' . http_build_query($moveLinkParams),
+                            'link.php?'.api_get_cidreq().'&'.http_build_query($moveLinkParams),
                             'level-down',
                             'default',
-                            ['class' => 'btn-sm ' . ($i === $numberoflinks ? 'disabled' : '')],
+                            ['class' => 'btn-sm '.($i === $numberoflinks ? 'disabled' : '')],
                             false
                         );
 
-                        $url .= api_get_self() . '?' . api_get_cidreq() .'&sec_token=' . $token .'&action=deletelink&id=' . $myrow['id'] .'&category_id=' . $myrow['category_id'];
-                        $event = "javascript: if(!confirm('" . get_lang('LinkDelconfirm') . "'))return false;";
+                        $url .= api_get_self().'?'.api_get_cidreq().'&sec_token='.$token.'&action=deletelink&id='.$myrow['id'].'&category_id='.$myrow['category_id'];
+                        $event = "javascript: if(!confirm('".get_lang('LinkDelconfirm')."'))return false;";
                         $title = get_lang('Delete');
 
                         $toolbar .= Display::toolbarButton(
@@ -1017,7 +1017,7 @@ 
                     $content .= '<div class="pull-right"><div class="btn-group">'.$toolbar.'</div></div>';
                     $content .= '<h4 class="list-group-item-heading">';
                     $content .= $iconLink;
-                    $url =  'link_goto.php?' . api_get_cidreq() .'&link_id=' . $myrow['id'] .'&link_url=' . urlencode($myrow['url']);
+                    $url = 'link_goto.php?'.api_get_cidreq().'&link_id='.$myrow['id'].'&link_url='.urlencode($myrow['url']);
                     $content .= Display::tag(
                         'a',
                         Security:: remove_XSS($myrow['title']),
@@ -1030,7 +1030,7 @@ 
                     $content .= $session_img;
                     $content .= '</h4>';
 
-                    $content .= '<p class="list-group-item-text">' . $myrow['description'] . '</p>';
+                    $content .= '<p class="list-group-item-text">'.$myrow['description'].'</p>';
                     $content .= '</div>';
                 } else {
                     if (api_is_allowed_to_edit(null, true)) {
@@ -1038,7 +1038,7 @@ 
                         $content .= '<div class="pull-right"><div class="btn-group">'.$toolbar.'</div></div>';
                         $content .= '<h4 class="list-group-item-heading">';
                         $content .= $iconLink;
-                        $url = 'link_goto.php?' . api_get_cidreq() .'&link_id=' . $myrow['id'] . "&link_url=" . urlencode($myrow['url']);
+                        $url = 'link_goto.php?'.api_get_cidreq().'&link_id='.$myrow['id']."&link_url=".urlencode($myrow['url']);
                         $content .= Display::tag(
                             'a',
                             Security:: remove_XSS($myrow['title']),
@@ -1051,7 +1051,7 @@ 
                         $content .= $link_validator;
                         $content .= $session_img;
                         $content .= '</h4>';
-                        $content .= '<p class="list-group-item-text">' . $myrow['description'] . '</p>';
+                        $content .= '<p class="list-group-item-text">'.$myrow['description'].'</p>';
                         $content .= '</div>';
                     }
                 }
@@ -1073,58 +1073,58 @@ 
     {
         $categoryId = $category['id'];
         $token = null;
-        $tools = '<a href="' . api_get_self() . '?' . api_get_cidreq() . '&sec_token=' . $token . '&action=editcategory&id=' . $categoryId . '&category_id=' . $categoryId . '" title=' . get_lang('Modify') . '">' .
+        $tools = '<a href="'.api_get_self().'?'.api_get_cidreq().'&sec_token='.$token.'&action=editcategory&id='.$categoryId.'&category_id='.$categoryId.'" title='.get_lang('Modify').'">'.
             Display:: return_icon(
                 'edit.png',
                 get_lang('Modify'),
                 array(),
                 ICON_SIZE_SMALL
-            ) . '</a>';
+            ).'</a>';
 
         // DISPLAY MOVE UP COMMAND only if it is not the top link.
         if ($currentCategory != 0) {
-            $tools .= '<a href="' . api_get_self() . '?' . api_get_cidreq() . '&sec_token=' . $token . '&action=up&up='.$categoryId.'&category_id='.$categoryId.'" title="'.get_lang('Up').'">'.
+            $tools .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&sec_token='.$token.'&action=up&up='.$categoryId.'&category_id='.$categoryId.'" title="'.get_lang('Up').'">'.
                 Display:: return_icon(
                     'up.png',
                     get_lang('Up'),
                     array(),
                     ICON_SIZE_SMALL
-                ) . '</a>';
+                ).'</a>';
         } else {
             $tools .= Display:: return_icon(
                 'up_na.png',
                 get_lang('Up'),
                 array(),
                 ICON_SIZE_SMALL
-            ) . '</a>';
+            ).'</a>';
         }
 
         // DISPLAY MOVE DOWN COMMAND only if it is not the bottom link.
-        if ($currentCategory < $countCategories-1) {
-            $tools .= '<a href="' . api_get_self() . '?' . api_get_cidreq() .'&sec_token=' . $token .'&action=down&down=' . $categoryId .'&category_id=' . $categoryId . '">'.
+        if ($currentCategory < $countCategories - 1) {
+            $tools .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&sec_token='.$token.'&action=down&down='.$categoryId.'&category_id='.$categoryId.'">'.
                 Display:: return_icon(
                     'down.png',
                     get_lang('Down'),
                     array(),
                     ICON_SIZE_SMALL
-                ) . '</a>';
+                ).'</a>';
         } else {
             $tools .= Display:: return_icon(
                     'down_na.png',
                     get_lang('Down'),
                     array(),
                     ICON_SIZE_SMALL
-                ) . '</a>';
+                ).'</a>';
         }
 
-        $tools .= '<a href="' . api_get_self() . '?' . api_get_cidreq() .'&sec_token=' . $token .'&action=deletecategory&id='.$categoryId.            "&category_id=$categoryId\"
-            onclick=\"javascript: if(!confirm('" . get_lang('CategoryDelconfirm') . "')) return false;\">".
+        $tools .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&sec_token='.$token.'&action=deletecategory&id='.$categoryId."&category_id=$categoryId\"
+            onclick=\"javascript: if(!confirm('".get_lang('CategoryDelconfirm')."')) return false;\">".
             Display:: return_icon(
                 'delete.png',
                 get_lang('Delete'),
                 array(),
                 ICON_SIZE_SMALL
-            ) . '</a>';
+            ).'</a>';
 
         return $tools;
     }
@@ -1180,12 +1180,12 @@ 
                     $nextlinkOrder = $sortrow['display_order'];
 
                     Database:: query(
-                        "UPDATE " . $movetable . "
+                        "UPDATE ".$movetable."
                         SET display_order = '$nextlinkOrder'
                         WHERE c_id = $courseId  AND id =  '$thiscatlinkId'"
                     );
                     Database:: query(
-                        "UPDATE " . $movetable . "
+                        "UPDATE ".$movetable."
                         SET display_order = '$thislinkOrder'
                         WHERE c_id = $courseId  AND id =  '$nextlinkId'"
                     );
@@ -1213,10 +1213,10 @@ 
         $course_id = api_get_course_int_id();
 
         $result = Database:: query(
-            "SELECT id FROM " . $tbl_categories . "
-            WHERE c_id = $course_id AND category_title='" . Database::escape_string(
+            "SELECT id FROM ".$tbl_categories."
+            WHERE c_id = $course_id AND category_title='".Database::escape_string(
                 $catname
-            ) . "'"
+            )."'"
         );
         if (Database:: num_rows($result) >= 1 && ($row = Database:: fetch_array(
                 $result
@@ -1226,7 +1226,7 @@ 
         }
 
         $result = Database:: query(
-            "SELECT MAX(display_order) FROM " . $tbl_categories . " WHERE c_id = $course_id "
+            "SELECT MAX(display_order) FROM ".$tbl_categories." WHERE c_id = $course_id "
         );
         list ($max_order) = Database:: fetch_row($result);
 
@@ -1253,19 +1253,19 @@ 
         $tbl_link = Database:: get_course_table(TABLE_LINK);
         $course_id = api_get_course_int_id();
 
-        $urleq = "url='" . Database:: escape_string($url) . "'";
-        $cateq = "category_id=" . intval($cat);
+        $urleq = "url='".Database:: escape_string($url)."'";
+        $cateq = "category_id=".intval($cat);
 
         $result = Database:: query("
             SELECT id FROM $tbl_link
-            WHERE c_id = $course_id AND " . $urleq . ' AND ' . $cateq
+            WHERE c_id = $course_id AND ".$urleq.' AND '.$cateq
         );
 
         if (Database:: num_rows($result) >= 1 && ($row = Database:: fetch_array($result))) {
             $sql = "UPDATE $tbl_link SET 
-                        title = '" . Database:: escape_string($title) . "', 
-                        description = '" . Database:: escape_string($description) . "'
-                    WHERE c_id = $course_id AND  id='" . Database:: escape_string($row['id']) . "'";
+                        title = '".Database:: escape_string($title)."', 
+                        description = '" . Database:: escape_string($description)."'
+                    WHERE c_id = $course_id AND  id='".Database:: escape_string($row['id'])."'";
             Database:: query($sql);
 
             $ipu = 'LinkUpdated';
@@ -1274,18 +1274,18 @@ 
             // Add new link
             $result = Database:: query(
                 "SELECT MAX(display_order) FROM  $tbl_link
-                WHERE c_id = $course_id AND category_id='" . intval($cat) . "'"
+                WHERE c_id = $course_id AND category_id='".intval($cat)."'"
             );
             list ($max_order) = Database:: fetch_row($result);
 
             Database:: query(
                 "INSERT INTO $tbl_link (c_id, url, title, description, category_id, display_order, on_homepage)
-                VALUES (" . api_get_course_int_id() . ",
-                '" . Database:: escape_string($url) . "',
-                '" . Database:: escape_string($title) . "',
-                '" . Database:: escape_string($description) . "',
-                '" . intval($cat) . "','" . (intval($max_order) + 1) . "',
-                '" . intval($on_homepage) .
+                VALUES (".api_get_course_int_id().",
+                '" . Database:: escape_string($url)."',
+                '" . Database:: escape_string($title)."',
+                '" . Database:: escape_string($description)."',
+                '" . intval($cat)."','".(intval($max_order) + 1)."',
+                '" . intval($on_homepage).
                 "')"
             );
 
@@ -1362,30 +1362,30 @@ 
                     )
                 ) { // possibly in <...>
                     if (($kwlist = trim($regs[1])) != '') {
-                        $kw = '<i kw="' . htmlspecialchars($kwlist) . '">';
+                        $kw = '<i kw="'.htmlspecialchars($kwlist).'">';
                     } else {
                         $kw = '';
                     }
                     // i.e. assume only one of the $hide_fields will be present
                     // and if found, hide the value as expando property of an <i> tag
                 } elseif (trim($value)) {
-                    $d .= ', ' . $key . ':' . $value;
+                    $d .= ', '.$key.':'.$value;
                 }
             }
         }
         if (!empty($d)) {
-            $d = substr($d, 2) . ' - ';
+            $d = substr($d, 2).' - ';
         }
 
         return Link::put_link(
             $url,
             $cat,
             $title,
-            $kw . ereg_replace(
+            $kw.ereg_replace(
                 '\[((/?(b|big|i|small|sub|sup|u))|br/)\]',
                 '<\\1>',
-                htmlspecialchars($d . $linkdata['description'])
-            ) . ($kw ? '</i>' : ''),
+                htmlspecialchars($d.$linkdata['description'])
+            ).($kw ? '</i>' : ''),
             $linkdata['on_homepage'] ? '1' : '0',
             $linkdata['hidden'] ? '1' : '0'
         );
@@ -1506,19 +1506,19 @@ 
         echo '<div class="actions">';
         if (api_is_allowed_to_edit(null, true)) {
             echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=addlink&category_id='.$categoryId.'">'.
-                Display::return_icon('new_link.png', get_lang('LinkAdd'),'',ICON_SIZE_MEDIUM).'</a>';
+                Display::return_icon('new_link.png', get_lang('LinkAdd'), '', ICON_SIZE_MEDIUM).'</a>';
             echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=addcategory&category_id='.$categoryId.'">'.
-                Display::return_icon('new_folder.png', get_lang('CategoryAdd'),'',ICON_SIZE_MEDIUM).'</a>';
+                Display::return_icon('new_folder.png', get_lang('CategoryAdd'), '', ICON_SIZE_MEDIUM).'</a>';
         }
 
         $categories = Link::getLinkCategories($course_id, $session_id);
         $count = count($categories);
         if (!empty($count)) {
             echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=list&show=none">';
-            echo Display::return_icon('forum_listview.png', get_lang('FlatView'), '', ICON_SIZE_MEDIUM) . ' </a>';
+            echo Display::return_icon('forum_listview.png', get_lang('FlatView'), '', ICON_SIZE_MEDIUM).' </a>';
 
             echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=list&show=all">';
-            echo Display::return_icon('forum_nestedview.png', get_lang('NestedView'), '', ICON_SIZE_MEDIUM) . '</a>';
+            echo Display::return_icon('forum_nestedview.png', get_lang('NestedView'), '', ICON_SIZE_MEDIUM).'</a>';
         }
         echo '</div>';
 
@@ -1550,12 +1550,12 @@ 
             $strVisibility = '';
             $visibilityClass = null;
             if ($myrow['visibility'] == '1') {
-                $strVisibility =  '<a href="link.php?' . api_get_cidreq() .  '&sec_token='.$token.'&action=invisible&id=' . $myrow['id'] . '&scope=' . TOOL_LINK_CATEGORY . '" title="' . get_lang('Hide') . '">' .
-                    Display :: return_icon('visible.png', get_lang('Hide'), array (), ICON_SIZE_SMALL) . '</a>';
+                $strVisibility = '<a href="link.php?'.api_get_cidreq().'&sec_token='.$token.'&action=invisible&id='.$myrow['id'].'&scope='.TOOL_LINK_CATEGORY.'" title="'.get_lang('Hide').'">'.
+                    Display :: return_icon('visible.png', get_lang('Hide'), array(), ICON_SIZE_SMALL).'</a>';
             } elseif ($myrow['visibility'] == '0') {
                 $visibilityClass = 'text-muted';
-                $strVisibility =  ' <a href="link.php?' . api_get_cidreq() .  '&sec_token='.$token.'&action=visible&id=' . $myrow['id'] . '&scope=' . TOOL_LINK_CATEGORY . '" title="' . get_lang('Show') . '">' .
-                    Display :: return_icon('invisible.png', get_lang('Show'), array (), ICON_SIZE_SMALL) . '</a>';
+                $strVisibility = ' <a href="link.php?'.api_get_cidreq().'&sec_token='.$token.'&action=visible&id='.$myrow['id'].'&scope='.TOOL_LINK_CATEGORY.'" title="'.get_lang('Show').'">'.
+                    Display :: return_icon('invisible.png', get_lang('Show'), array(), ICON_SIZE_SMALL).'</a>';
             }
 
             $header = '';

main/inc/lib/lp_item.lib.php

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
 

     public function __construct($in_c_id = 0, $in_id = 0)

     {

-        if ($in_c_id > 0 && $in_id >0) {

+        if ($in_c_id > 0 && $in_id > 0) {

             $item_view_table = Database::get_course_table(TABLE_LP_ITEM);

             $sql = "SELECT * FROM $item_view_table

                     WHERE

src/Chamilo/CourseBundle/Entity/CForumThread.php

Doc Comments +1 added lines, -1 removed lines

@@ -181,7 +181,7 @@
 
     /**
      * set threadPeerQualify
-     * @param $threadPeerQualify
+     * @param integer $threadPeerQualify
      * @return $this
      */
     public function setThreadPeerQualify($threadPeerQualify)

main/social/profile.php

Indentation +1 added lines, -1 removed lines

@@ -607,7 +607,7 @@
                                 .' width="40px">';
                     $userInfo = api_get_user_info($user_invitation_id);
                     $invitations .= '<a href="'.api_get_path(WEB_PATH).'main/social/profile.php?u='.$user_invitation_id.'">'
-                                 .api_get_person_name($userInfo['firstname'],$userInfo['lastname']).'</a>';
+                                    .api_get_person_name($userInfo['firstname'],$userInfo['lastname']).'</a>';
                     
                     $invitations .='<div class="pull-right">';
                     $invitations .=  '<a title="'.get_lang('SocialAddToFriends').'" id="btn_accepted_'.$user_invitation_id.'" class="btn btn-default btn-sm" onclick="register_friend(this)" href="javascript:void(0)">'

Spacing +59 added lines, -59 removed lines

@@ -58,9 +58,9 @@ 
 
     Display::addFlash(Display::return_message(get_lang('MessageSent')));
 
-    $url = api_get_path(WEB_CODE_PATH) . 'social/profile.php';
+    $url = api_get_path(WEB_CODE_PATH).'social/profile.php';
     $url .= empty($_SERVER['QUERY_STRING']) ? '' : '?'.Security::remove_XSS($_SERVER['QUERY_STRING']);
-    header('Location: ' . $url);
+    header('Location: '.$url);
     exit;
 
 } else if (!empty($_POST['social_wall_new_msg']) && !empty($_POST['messageId'])) {
@@ -75,9 +75,9 @@ 
         MESSAGE_STATUS_WALL
     );
     Display::addFlash(Display::return_message(get_lang('MessageSent')));
-    $url = api_get_path(WEB_CODE_PATH) . 'social/profile.php';
+    $url = api_get_path(WEB_CODE_PATH).'social/profile.php';
     $url .= empty($_SERVER['QUERY_STRING']) ? '' : '?'.Security::remove_XSS($_SERVER['QUERY_STRING']);
-    header('Location: ' . $url);
+    header('Location: '.$url);
     exit;
 
 } else if (isset($_GET['messageId'])) {
@@ -89,7 +89,7 @@ 
             $status = SocialManager::deleteMessage($messageId);
 
             Display::addFlash(Display::return_message(get_lang('MessageDeleted')));
-            header('Location: ' . api_get_path(WEB_CODE_PATH) . 'social/profile.php');
+            header('Location: '.api_get_path(WEB_CODE_PATH).'social/profile.php');
             exit;
         }
     }
@@ -153,16 +153,16 @@ 
 
 $ajax_url = api_get_path(WEB_AJAX_PATH).'message.ajax.php';
 $socialAjaxUrl = api_get_path(WEB_AJAX_PATH).'social.ajax.php';
-$javascriptDir = api_get_path(LIBRARY_PATH) . 'javascript/';
+$javascriptDir = api_get_path(LIBRARY_PATH).'javascript/';
 api_block_anonymous_users();
 $locale = api_get_language_isocode();
 // Add Jquery scroll pagination plugin
 $htmlHeadXtra[] = api_get_js('jscroll/jquery.jscroll.js');
 // Add Jquery Time ago plugin
 $htmlHeadXtra[] = api_get_asset('jquery-timeago/jquery.timeago.js');
-$timeAgoLocaleDir = $javascriptDir . 'jquery-timeago/locales/jquery.timeago.' . $locale . '.js';
+$timeAgoLocaleDir = $javascriptDir.'jquery-timeago/locales/jquery.timeago.'.$locale.'.js';
 if (file_exists($timeAgoLocaleDir)) {
-    $htmlHeadXtra[] = api_get_js('jquery-timeago/locales/jquery.timeago.' . $locale . '.js');
+    $htmlHeadXtra[] = api_get_js('jquery-timeago/locales/jquery.timeago.'.$locale.'.js');
 }
 
 $htmlHeadXtra[] = '<script>
@@ -170,7 +170,7 @@ 
 $(document).ready(function (){
     var container = $("#wallMessages");
     container.jscroll({
-        loadingHtml: "<div class=\"well_border\">' . get_lang('Loading') . ' </div>",
+        loadingHtml: "<div class=\"well_border\">' . get_lang('Loading').' </div>",
         nextSelector: "a.nextPage:last",
         contentSelector: "",
         callback: timeAgo
@@ -200,8 +200,8 @@ 
 );
 
 if (isset($_GET['u']) && is_numeric($_GET['u']) && $_GET['u'] != api_get_user_id()) {
-    $info_user =   api_get_user_info($_GET['u']);
-    $interbreadcrumb[]= array(
+    $info_user = api_get_user_info($_GET['u']);
+    $interbreadcrumb[] = array(
         'url' => '#',
         'name' => $info_user['complete_name']
     );
@@ -225,7 +225,7 @@ 
 $list = [];
 if (is_array($personal_course_list)) {
     foreach ($personal_course_list as $my_course) {
-        if ($i<=10) {
+        if ($i <= 10) {
             $list[] = SocialManager::get_logged_user_course_html($my_course, $i);
             $course_list_code[] = array('code' => $my_course['code']);
         } else {
@@ -263,13 +263,13 @@ 
 $social_wall_block = $wallSocialAddPost;
 
 // Social Post Wall
-$posts = SocialManager::getWallMessagesByUser($my_user_id, $friendId) ;
+$posts = SocialManager::getWallMessagesByUser($my_user_id, $friendId);
 
 $social_post_wall_block = empty($posts) ? '<p>'.get_lang("NoPosts").'</p>' : $posts;
 
 $socialAutoExtendLink = Display::url(
     get_lang('SeeMore'),
-    $socialAjaxUrl . '?u='. $my_user_id . '&a=listWallMessage&start=10&length=5',
+    $socialAjaxUrl.'?u='.$my_user_id.'&a=listWallMessage&start=10&length=5',
     array(
         'class' => 'nextPage next',
     )
@@ -291,12 +291,12 @@ 
                 $(".spinner").html("'.
                     '<div class=\'text-center\'>'.
                         '<em class=\'fa fa-spinner fa-pulse fa-1x\'></em>'.
-                        '<p>'. get_lang('Loading') . ' ' . get_lang('Preview') .'</p>'.
+                        '<p>'.get_lang('Loading').' '.get_lang('Preview').'</p>'.
                     '</div>'.
                 '");
             },
             type: "POST",
-            url: "'. api_get_path(WEB_AJAX_PATH) .'social.ajax.php?a=readUrlWithOpenGraph",
+            url: "'. api_get_path(WEB_AJAX_PATH).'social.ajax.php?a=readUrlWithOpenGraph",
             data: "social_wall_new_msg_main=" + e.originalEvent.clipboardData.getData("text"),
             success: function(response) {
                 $("[name=\'wall_post_button\']").prop( "disabled", false );
@@ -391,7 +391,7 @@ 
                                 .$tags['tag']
                                 .'</a>';
                         }
-                        if (is_array($user_tags) && count($user_tags)>0) {
+                        if (is_array($user_tags) && count($user_tags) > 0) {
                             $extra_information_value .= '<li class="list-group-item">'.ucfirst($extraFieldInfo['display_text']).': '
                                 .' '.implode('', $tag_tmp).'</li>';
                         }
@@ -415,7 +415,7 @@ 
                         $extra_information_value .= '<li class="list-group-item">'.$data.'</li>';
                         break;
                     default:
-                        $extra_information_value .= '<li class="list-group-item">'.ucfirst($extraFieldInfo['display_text']) . ': ' . $data . '</li>';
+                        $extra_information_value .= '<li class="list-group-item">'.ucfirst($extraFieldInfo['display_text']).': '.$data.'</li>';
                         break;
                 }
             }
@@ -424,7 +424,7 @@ 
         // if there are information to show
         if (!empty($extra_information_value)) {
 
-            $extra_information_value = '<ul class="list-group">' . $extra_information_value . '</ul>';
+            $extra_information_value = '<ul class="list-group">'.$extra_information_value.'</ul>';
 
             $extra_information .= Display::panelCollapse(
                 get_lang('ExtraInformation'),
@@ -504,10 +504,10 @@ 
 
         if ($i > $max_numbers_of_group) {
             if (api_get_user_id() == $user_id) {
-                $my_groups .=  '<div class="box_shared_profile_group_actions">'
+                $my_groups .= '<div class="box_shared_profile_group_actions">'
                     .'<a href="groups.php?#tab_browse-1">'.get_lang('SeeAllMyGroups').'</a></div>';
             } else {
-                $my_groups .=  '<div class="box_shared_profile_group_actions">'
+                $my_groups .= '<div class="box_shared_profile_group_actions">'
                     .'<a href="'.api_get_path(WEB_CODE_PATH).'social/profile_friends_and_groups.inc.php'
                     .'?view=mygroups&height=390&width=610&user_id='.$user_id.'"'
                     .' class="ajax" title="'.get_lang('SeeAll').'" >'
@@ -520,7 +520,7 @@ 
         $i = 1;
         foreach ($grid_my_groups as $group) {
             $my_groups .= '<div class="panel-body">';
-            $my_groups .=  $group[0];
+            $my_groups .= $group[0];
             $my_groups .= '</div>';
             $i++;
         }
@@ -543,7 +543,7 @@ 
                 $i++;
             }
         }
-        $social_course_block .=  $my_courses;
+        $social_course_block .= $my_courses;
     }
 
     // Block Social Sessions
@@ -564,7 +564,7 @@ 
 
     // Images uploaded by course
     $file_list = '';
-    if (is_array($course_list_code) && count($course_list_code)>0) {
+    if (is_array($course_list_code) && count($course_list_code) > 0) {
         foreach ($course_list_code as $course) {
             $file_list .= UserManager::get_user_upload_files_by_course(
                 $user_id,
@@ -576,7 +576,7 @@ 
 
     $count_pending_invitations = 0;
     if (!isset($_GET['u']) ||
-        (isset($_GET['u']) && $_GET['u']==api_get_user_id())
+        (isset($_GET['u']) && $_GET['u'] == api_get_user_id())
     ) {
         $pending_invitations = SocialManager::get_list_invitation_of_friends_by_user_id(api_get_user_id());
         $list_get_path_web = SocialManager::get_list_web_path_user_invitation_by_user_id(api_get_user_id());
@@ -585,23 +585,23 @@ 
 
     if (!empty($production_list) || !empty($file_list) || $count_pending_invitations > 0) {
         // Pending invitations
-        if (!isset($_GET['u']) || (isset($_GET['u']) && $_GET['u']==api_get_user_id())) {
+        if (!isset($_GET['u']) || (isset($_GET['u']) && $_GET['u'] == api_get_user_id())) {
             if ($count_pending_invitations > 0) {
-                $invitations =  '<ul class="list-group">';
+                $invitations = '<ul class="list-group">';
                 for ($i = 0; $i < $count_pending_invitations; $i++) {
                     $user_invitation_id = $pending_invitations[$i]['user_sender_id'];
-                    $invitations .=  '<li id="dpending_'.$user_invitation_id.'" class="list-group-item">';
-                    $invitations .=  '<img class="img-rounded" '
+                    $invitations .= '<li id="dpending_'.$user_invitation_id.'" class="list-group-item">';
+                    $invitations .= '<img class="img-rounded" '
                                 .' src="'.$list_get_path_web[$i]['dir'].'/'.$list_get_path_web[$i]['file'].'"'
                                 .' width="40px">';
                     $userInfo = api_get_user_info($user_invitation_id);
                     $invitations .= '<a href="'.api_get_path(WEB_PATH).'main/social/profile.php?u='.$user_invitation_id.'">'
-                                 .api_get_person_name($userInfo['firstname'],$userInfo['lastname']).'</a>';
+                                 .api_get_person_name($userInfo['firstname'], $userInfo['lastname']).'</a>';
 
-                    $invitations .='<div class="pull-right">';
+                    $invitations .= '<div class="pull-right">';
                     $invitations .= Display::toolbarButton(
                         get_lang('SocialAddToFriends'),
-                        api_get_path(WEB_AJAX_PATH) . 'social.ajax.php?' . http_build_query([
+                        api_get_path(WEB_AJAX_PATH).'social.ajax.php?'.http_build_query([
                             'a' => 'add_friend',
                             'friend_id' => $user_invitation_id,
                             'is_my_friend' => 'friend'
@@ -612,8 +612,8 @@ 
                         false
                     );
                     $invitations .= '</div>';
-                    $invitations .=  '<div id="id_response"></div>';
-                    $invitations .=  '</li>';
+                    $invitations .= '<div id="id_response"></div>';
+                    $invitations .= '</li>';
                 }
                 $invitations .= '</ul>';
                 $listInvitations = Display::panelCollapse(
@@ -628,51 +628,51 @@ 
         }
 
         // Productions
-        $production_list =  UserManager::build_production_list($user_id);
+        $production_list = UserManager::build_production_list($user_id);
         $product_content = '';
         if (!empty($production_list)) {
             $product_content .= '<div><h3>'.get_lang('MyProductions').'</h3></div>';
-            $product_content .=  $production_list;
-            $socialRightInformation .=  SocialManager::social_wrapper_div($product_content, 4);
+            $product_content .= $production_list;
+            $socialRightInformation .= SocialManager::social_wrapper_div($product_content, 4);
         }
 
         $images_uploaded = null;
         // Images uploaded by course
         if (!empty($file_list)) {
-            $images_uploaded .=  '<div><h3>'.get_lang('ImagesUploaded').'</h3></div>';
-            $images_uploaded .=  '<div class="social-content-information">';
-            $images_uploaded .=  $file_list;
-            $images_uploaded .=  '</div>';
-            $socialRightInformation .=  SocialManager::social_wrapper_div($images_uploaded, 4);
+            $images_uploaded .= '<div><h3>'.get_lang('ImagesUploaded').'</h3></div>';
+            $images_uploaded .= '<div class="social-content-information">';
+            $images_uploaded .= $file_list;
+            $images_uploaded .= '</div>';
+            $socialRightInformation .= SocialManager::social_wrapper_div($images_uploaded, 4);
         }
     }
 
     if (!empty($user_info['competences']) || !empty($user_info['diplomas'])
-        || !empty($user_info['openarea']) || !empty($user_info['teach']) ) {
+        || !empty($user_info['openarea']) || !empty($user_info['teach'])) {
 
-        $more_info .=  '<div><h3>'.get_lang('MoreInformation').'</h3></div>';
+        $more_info .= '<div><h3>'.get_lang('MoreInformation').'</h3></div>';
         if (!empty($user_info['competences'])) {
-            $more_info .=  '<br />';
-                $more_info .=  '<div class="social-actions-message"><strong>'.get_lang('MyCompetences').'</strong></div>';
-                $more_info .=  '<div class="social-profile-extended">'.$user_info['competences'].'</div>';
-            $more_info .=  '<br />';
+            $more_info .= '<br />';
+                $more_info .= '<div class="social-actions-message"><strong>'.get_lang('MyCompetences').'</strong></div>';
+                $more_info .= '<div class="social-profile-extended">'.$user_info['competences'].'</div>';
+            $more_info .= '<br />';
         }
         if (!empty($user_info['diplomas'])) {
-            $more_info .=  '<div class="social-actions-message"><strong>'.get_lang('MyDiplomas').'</strong></div>';
-            $more_info .=  '<div class="social-profile-extended">'.$user_info['diplomas'].'</div>';
-            $more_info .=  '<br />';
+            $more_info .= '<div class="social-actions-message"><strong>'.get_lang('MyDiplomas').'</strong></div>';
+            $more_info .= '<div class="social-profile-extended">'.$user_info['diplomas'].'</div>';
+            $more_info .= '<br />';
         }
         if (!empty($user_info['openarea'])) {
-            $more_info .=  '<div class="social-actions-message"><strong>'.get_lang('MyPersonalOpenArea').'</strong></div>';
-            $more_info .=  '<div class="social-profile-extended">'.$user_info['openarea'].'</div>';
-            $more_info .=  '<br />';
+            $more_info .= '<div class="social-actions-message"><strong>'.get_lang('MyPersonalOpenArea').'</strong></div>';
+            $more_info .= '<div class="social-profile-extended">'.$user_info['openarea'].'</div>';
+            $more_info .= '<br />';
         }
         if (!empty($user_info['teach'])) {
-            $more_info .=  '<div class="social-actions-message"><strong>'.get_lang('MyTeach').'</strong></div>';
-            $more_info .=  '<div class="social-profile-extended">'.$user_info['teach'].'</div>';
-            $more_info .=  '<br />';
+            $more_info .= '<div class="social-actions-message"><strong>'.get_lang('MyTeach').'</strong></div>';
+            $more_info .= '<div class="social-profile-extended">'.$user_info['teach'].'</div>';
+            $more_info .= '<br />';
         }
-        $socialRightInformation .=  SocialManager::social_wrapper_div($more_info, 4);
+        $socialRightInformation .= SocialManager::social_wrapper_div($more_info, 4);
     }
 }
 
@@ -694,7 +694,7 @@ 
 $tpl->assign('social_right_information', $socialRightInformation);
 $tpl->assign('social_auto_extend_link', $socialAutoExtendLink);
 
-$formModalTpl =  new Template();
+$formModalTpl = new Template();
 $formModalTpl->assign('invitation_form', MessageManager::generate_invitation_form('send_invitation'));
 $formModals = $formModalTpl->fetch('default/social/form_modals.tpl');