From 6e27190325de18fe44f66f3e1bfded418bf97e8f Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Tue, 26 Jul 2011 11:08:18 +0200 Subject: [PATCH] Removing notices/warnings --- main/inc/lib/social.lib.php | 3 ++- main/inc/lib/tracking.lib.php | 2 +- main/mySpace/index.php | 9 +++------ main/social/groups.php | 6 ++---- main/social/profile.php | 6 ++---- main/tracking/courseLog.php | 7 ++----- 6 files changed, 12 insertions(+), 21 deletions(-) diff --git a/main/inc/lib/social.lib.php b/main/inc/lib/social.lib.php index be6f9abca1..70c2c0858a 100755 --- a/main/inc/lib/social.lib.php +++ b/main/inc/lib/social.lib.php @@ -517,7 +517,7 @@ class SocialManager extends UserManager { $session = array(); $session['title'] = $my_course['session_name']; - if ( $my_course['date_start']=='0000-00-00' ) { + if ($my_course['date_start']=='0000-00-00') { $session['dates'] = get_lang('WithoutTimeLimits'); if ( api_get_setting('show_session_coach') === 'true' ) { $session['coach'] = get_lang('GeneralCoach').': '.api_get_person_name($sessioncoach['firstname'], $sessioncoach['lastname']); @@ -531,6 +531,7 @@ class SocialManager extends UserManager { $active = ($date_start <= $now && $date_end >= $now)?true:false; } } + $my_course['id_session'] = isset($my_course['id_session']) ? $my_course['id_session'] : 0; $output = array ($my_course['user_course_cat'], $result, $my_course['id_session'], $session, 'active'=>$active); } else { $output = array ($my_course['user_course_cat'], $result); diff --git a/main/inc/lib/tracking.lib.php b/main/inc/lib/tracking.lib.php index fe2ebe5eba..ca2f860a8d 100755 --- a/main/inc/lib/tracking.lib.php +++ b/main/inc/lib/tracking.lib.php @@ -3065,7 +3065,7 @@ class TrackingCourseLog { foreach ($extra_fields as $key=>$field) { // show only extra fields that are visible + and can be filtered, added by J.Montoya if ($field[6]==1 && $field[8] == 1) { - if ($field[0] == $_GET['additional_profile_field'] ) { + if (isset($_GET['additional_profile_field']) && $field[0] == $_GET['additional_profile_field'] ) { $selected = 'selected="selected"'; } else { $selected = ''; diff --git a/main/mySpace/index.php b/main/mySpace/index.php index 7b98f4d6ef..020d81cee7 100755 --- a/main/mySpace/index.php +++ b/main/mySpace/index.php @@ -1,9 +1,6 @@ */ -/** - * Initialization - */ + $cidReset = true; $language_file = array('userInfo'); require_once '../inc/global.inc.php'; @@ -369,7 +367,7 @@ if ($group_id != 0 ) { /*$join_url = ''.Display::return_icon('group_join.png', get_lang('JoinGroup'), array('hspace'=>'6')).''.get_lang('JoinGroup').' '; $item_4 = '
'.$join_url. $url_open.get_lang('SeeMore').$url_close.'
';*/ - $grid_item_2 = $item_0.$item_1.$item_2.$item_3.$item_4; + $grid_item_2 = $item_0.$item_1.$item_2.$item_3; $grid_my_groups[]= array($grid_item_2); } } diff --git a/main/social/profile.php b/main/social/profile.php index b06d9cfce5..632f5b1c8a 100755 --- a/main/social/profile.php +++ b/main/social/profile.php @@ -6,9 +6,7 @@ * @author Isaac Flores Paz * @package chamilo.social */ -/** - * Initialization - */ + $language_file = array('userInfo'); $cidReset = true; require_once '../inc/global.inc.php'; @@ -469,7 +467,7 @@ if ($show_full_profile) { if (api_get_user_id() == $user_id) { //$item_actions = ''; } - $grid_my_groups[]= array($item_name,$url_open.$result['picture_uri'].$url_close, $item_description.$item_actions); + $grid_my_groups[]= array($item_name,$url_open.$result['picture_uri'].$url_close, $item_actions); $i++; } } diff --git a/main/tracking/courseLog.php b/main/tracking/courseLog.php index 4af7d83bc5..a5ddf91b3b 100755 --- a/main/tracking/courseLog.php +++ b/main/tracking/courseLog.php @@ -4,9 +4,6 @@ /** * @package chamilo.tracking */ -/** - * Code - */ /* INIT SECTION */ @@ -161,13 +158,13 @@ echo ''.Dis if ($_GET['studentlist'] == 'false') { echo ' - '.Display::return_icon('export_csv.png', get_lang('ExportAsCSV'),'','32').''; - + '.Display::return_icon('export_csv.png', get_lang('ExportAsCSV'),'','32').''; } elseif ($_GET['studentlist'] == '' || $_GET['studentlist'] == 'true') { $addional_param = ''; if (isset($_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']); }