From 0f3f5434d84fc26a9ce9c7890ff754d5757447b9 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Tue, 1 Apr 2014 17:30:51 +0200 Subject: [PATCH] Minor - format code. --- main/inc/lib/sessionmanager.lib.php | 19 ++++-- main/inc/lib/usermanager.lib.php | 3 +- main/mySpace/access_details.php | 96 ++++++++++++++++------------- main/mySpace/myStudents.php | 9 ++- 4 files changed, 73 insertions(+), 54 deletions(-) diff --git a/main/inc/lib/sessionmanager.lib.php b/main/inc/lib/sessionmanager.lib.php index 20b752a8b9..534a2578fb 100644 --- a/main/inc/lib/sessionmanager.lib.php +++ b/main/inc/lib/sessionmanager.lib.php @@ -2547,16 +2547,23 @@ class SessionManager /** * Gets the list of courses by session filtered by access_url - * @param int session id - * @return array list of courses + * + * @param $userId + * @param $sessionId + * @param null $from + * @param null $limit + * @param null $column + * @param null $direction + * @param bool $getCount + * @return array */ public static function getAllCoursesFollowedByUser( $userId, $sessionId, - $from, - $limit, - $column, - $direction, + $from = null, + $limit = null, + $column = null, + $direction = null, $getCount = false ) { if (empty($sessionId)) { diff --git a/main/inc/lib/usermanager.lib.php b/main/inc/lib/usermanager.lib.php index 46acfd35ba..2e1f194915 100644 --- a/main/inc/lib/usermanager.lib.php +++ b/main/inc/lib/usermanager.lib.php @@ -3733,7 +3733,6 @@ class UserManager $result = Database::query($sql); $row = Database::fetch_array($result); //var_dump($sql); - //var_dump($row); return $row['count']; } @@ -3756,7 +3755,7 @@ class UserManager $result = Database::query($sql); $users = array(); if (Database::num_rows($result) > 0) { - //var_dump($sql); + while ($row = Database::fetch_array($result)) { $users[$row['user_id']] = $row; } diff --git a/main/mySpace/access_details.php b/main/mySpace/access_details.php index f0ae6de58e..20f892a3ec 100644 --- a/main/mySpace/access_details.php +++ b/main/mySpace/access_details.php @@ -10,7 +10,7 @@ * @param string $course_code the course code * @author Julio Montoya * @author Jorge Frisancho Jibaja - select between dates -* +* */ /** * Code @@ -41,24 +41,24 @@ $quote_simple = "'"; $htmlHeadXtra[] = ''; $htmlHeadXtra[] = ''; - -$htmlHeadXtra[] = ''; - $htmlHeadXtra[] = ''; $htmlHeadXtra[] = ''; @@ -163,31 +162,30 @@ $interbreadcrumb[] = array ('url' => '#', 'name' => get_lang('AccessDetails')); Display :: display_header(''); $main_user_info = api_get_user_info($user_id); $result_to_print = ''; - -$sql_result = MySpace::get_connections_to_course($user_id, $course_code); +$sql_result = MySpace::get_connections_to_course($user_id, $course_code); $result_to_print = convert_to_string($sql_result); echo Display::page_header(get_lang('DetailsStudentInCourse')); -echo Display::page_subheader(get_lang('User').': '.api_get_person_name($main_user_info['firstName'], $main_user_info['lastName']).' - '.get_lang('Course').': '.$course_code); +echo Display::page_subheader( + get_lang('User').': '.api_get_person_name($main_user_info['firstName'], $main_user_info['lastName']).' - '.get_lang('Course').': '.$course_code +); $form = new FormValidator('myform', 'post', "javascript:get(document.getElementById('myform'));", null, array('id' => 'myform')); $form->addElement('text', 'from', get_lang('From'), array('id' => 'date_from')); $form->addElement('text', 'to', get_lang('Until'), array('id' => 'date_to')); - $form->addElement('style_submit_button', 'reset', get_lang('Reset'), array('onclick' => "javascript:window.location='access_details.php?course=".$course_code."&student=".$user_id."&cidReq=".$course_code."';")); $form->display(); ?>
-

'.get_lang('Total').': '.$rst['total'].'
'; $foo_stats .= ''.get_lang('Average').': '.$rst['avg'].'
'; - $foo_stats .= ''.get_lang('Quantity').' : '.$rst['times'].'
'; + $foo_stats .= ''.get_lang('Quantity').' : '.$rst['times'].'
'; echo $foo_stats; } else { echo Display::display_warning_message(get_lang('NoDataAvailable')); @@ -198,13 +196,24 @@ $form->display();
-

+
+ +

display(); echo $result_to_print; } else { Display::display_warning_message(get_lang('NoDataAvailable')); - } + } ?>
- + echo '
+
+
'; }?>
diff --git a/main/mySpace/myStudents.php b/main/mySpace/myStudents.php index 5fbcd94b2a..b922a806af 100644 --- a/main/mySpace/myStudents.php +++ b/main/mySpace/myStudents.php @@ -304,7 +304,7 @@ if (isset($message)) { $token = Security::get_token(); if (!empty($student_id)) { - + // Actions bar echo '
'; echo ''.Display::return_icon('back.png', get_lang('Back'),'',ICON_SIZE_MEDIUM).''; @@ -317,8 +317,11 @@ if (!empty($student_id)) { $send_mail = Display :: return_icon('mail_send_na.png', get_lang('SendMail'),'',ICON_SIZE_MEDIUM); } echo $send_mail; - if (!empty($student_id) && !empty ($_GET['course'])) { //only show link to connection details if course and student were defined in the URL - echo '' . Display :: return_icon('statistics.png', get_lang('AccessDetails'),'',ICON_SIZE_MEDIUM).''; + if (!empty($student_id) && !empty($_GET['course'])) { + //only show link to connection details if course and student were defined in the URL + + echo ''. + Display :: return_icon('statistics.png', get_lang('AccessDetails'),'',ICON_SIZE_MEDIUM).''; } if (api_can_login_as($student_id)) { echo ''.