diff --git a/main/mySpace/admin.php b/main/mySpace/admin.php
old mode 100755
new mode 100644
index 13648a66a2..8afa4631c0
--- a/main/mySpace/admin.php
+++ b/main/mySpace/admin.php
@@ -1,4 +1,5 @@
"index.php", "name" => get_lang('MySpace'));
+$interbreadcrumb[] = array("url" => "index.php", "name" => get_lang('MySpace'));
Display :: display_header($nameTools);
api_display_tool_title($nameTools);
// Database Table Definitions
-$tbl_course = Database :: get_main_table(TABLE_MAIN_COURSE);
-$tbl_user = Database :: get_main_table(TABLE_MAIN_USER);
-$tbl_session = Database :: get_main_table(TABLE_MAIN_SESSION);
-$tbl_session_course = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE);
-$tbl_session_rel_user = Database :: get_main_table(TABLE_MAIN_SESSION_USER);
-$tbl_admin = Database :: get_main_table(TABLE_MAIN_ADMIN);
+$tbl_course = Database :: get_main_table(TABLE_MAIN_COURSE);
+$tbl_user = Database :: get_main_table(TABLE_MAIN_USER);
+$tbl_session = Database :: get_main_table(TABLE_MAIN_SESSION);
+$tbl_session_course = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE);
+$tbl_session_rel_user = Database :: get_main_table(TABLE_MAIN_SESSION_USER);
+$tbl_admin = Database :: get_main_table(TABLE_MAIN_ADMIN);
/**
* MAIN PART
*/
-
/*
* liste nominative avec coordonnies et lien vers les cours et les stagiaires dont il est le responsable.
*/
if (isset($_POST['export'])) {
- $order_clause = api_is_western_name_order(PERSON_NAME_DATA_EXPORT) ? ' ORDER BY firstname, lastname' : ' ORDER BY lastname, firstname';
+ $order_clause = api_is_western_name_order(PERSON_NAME_DATA_EXPORT) ? ' ORDER BY firstname, lastname' : ' ORDER BY lastname, firstname';
} else {
- $order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname' : ' ORDER BY lastname, firstname';
+ $order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname' : ' ORDER BY lastname, firstname';
}
$sql_admins = "SELECT user.user_id,lastname,firstname,email
FROM $tbl_user as user, $tbl_admin as admin
- WHERE admin.user_id=user.user_id".$order_clause;
+ WHERE admin.user_id=user.user_id" . $order_clause;
$result_admins = Database::query($sql_admins);
if (api_is_western_name_order()) {
- echo '
| '.get_lang('FirstName').' | '.get_lang('LastName').' | '.get_lang('Email').' |
';
+ echo '| ' . get_lang('FirstName') . ' | ' . get_lang('LastName') . ' | ' . get_lang('Email') . ' |
';
} else {
- echo '| '.get_lang('LastName').' | '.get_lang('FirstName').' | '.get_lang('Email').' |
';
+ echo '| ' . get_lang('LastName') . ' | ' . get_lang('FirstName') . ' | ' . get_lang('Email') . ' |
';
}
if (api_is_western_name_order(PERSON_NAME_DATA_EXPORT)) {
- $header[] = get_lang('FirstName', '');
- $header[] = get_lang('LastName', '');
+ $header[] = get_lang('FirstName', '');
+ $header[] = get_lang('LastName', '');
} else {
- $header[] = get_lang('LastName', '');
- $header[] = get_lang('FirstName', '');
+ $header[] = get_lang('LastName', '');
+ $header[] = get_lang('FirstName', '');
}
$header[] = get_lang('Email', '');
if (Database::num_rows($result_admins) > 0) {
- while ($admins = Database::fetch_array($result_admins)) {
-
- $user_id = $admins["user_id"];
- $lastname = $admins["lastname"];
- $firstname = $admins["firstname"];
- $email = $admins["email"];
-
- if ($i % 2 == 0) {
- $css_class = "row_odd";
- if ($i % 20 == 0 && $i != 0) {
- if (api_is_western_name_order()) {
- echo '| '.get_lang('FirstName').' | '.get_lang('LastName').' | '.get_lang('Email').' |
';
- } else {
- echo '| '.get_lang('LastName').' | '.get_lang('FirstName').' | '.get_lang('Email').' |
';
- }
- }
- } else {
- $css_class = "row_even";
- }
-
- $i++;
-
- if (api_is_western_name_order()) {
- echo "| $firstname | $lastname | $email |
";
- } else {
- echo "| $lastname | $firstname | $email |
";
- }
-
- if (api_is_western_name_order(PERSON_NAME_DATA_EXPORT)) {
- $data[$user_id]["firstname"] = $firstname;
- $data[$user_id]["lastname"] = $lastname;
- } else {
- $data[$user_id]["lastname"] = $lastname;
- $data[$user_id]["firstname"] = $firstname;
- }
- $data[$user_id]["email"] = $email;
- }
+ while ($admins = Database::fetch_array($result_admins)) {
+
+ $user_id = $admins["user_id"];
+ $lastname = $admins["lastname"];
+ $firstname = $admins["firstname"];
+ $email = $admins["email"];
+
+ if ($i % 2 == 0) {
+ $css_class = "row_odd";
+ if ($i % 20 == 0 && $i != 0) {
+ if (api_is_western_name_order()) {
+ echo '| ' . get_lang('FirstName') . ' | ' . get_lang('LastName') . ' | ' . get_lang('Email') . ' |
';
+ } else {
+ echo '| ' . get_lang('LastName') . ' | ' . get_lang('FirstName') . ' | ' . get_lang('Email') . ' |
';
+ }
+ }
+ } else {
+ $css_class = "row_even";
+ }
+
+ $i++;
+
+ if (api_is_western_name_order()) {
+ echo "| $firstname | $lastname | $email |
";
+ } else {
+ echo "| $lastname | $firstname | $email |
";
+ }
+
+ if (api_is_western_name_order(PERSON_NAME_DATA_EXPORT)) {
+ $data[$user_id]["firstname"] = $firstname;
+ $data[$user_id]["lastname"] = $lastname;
+ } else {
+ $data[$user_id]["lastname"] = $lastname;
+ $data[$user_id]["firstname"] = $firstname;
+ }
+ $data[$user_id]["email"] = $email;
+ }
} else {
- // No results
- echo '| '.get_lang('NoResults').' |
';
+ // No results
+ echo '| ' . get_lang('NoResults') . ' |
';
}
echo '
';
if (isset($_POST['export'])) {
- export_csv($header, $data, 'administrators.csv');
+ export_csv($header, $data, 'administrators.csv');
}
echo "
";
-echo "
';
@@ -174,11 +174,4 @@ if (isset($_POST['export'])){
echo "
";
echo "
';
echo "
";
diff --git a/main/mySpace/reussite.php b/main/mySpace/reussite.php
old mode 100755
new mode 100644
index ae671a3128..e56fa2296e
--- a/main/mySpace/reussite.php
+++ b/main/mySpace/reussite.php
@@ -69,7 +69,7 @@ if (!empty($_GET['session'])) {
$moyenne_test = null;
}
- echo '| '.$session['name'].' | '.(is_null($moyenne_test) ? '' : $moyenne_test.'%').' | |
';
+ echo '| '.$session['name'].' | '.(is_null($moyenne_test) ? '' : $moyenne_test.'%').' | |
';
}
echo '
';
} else {
@@ -102,17 +102,11 @@ if (!empty($_GET['session'])) {
} else {
$moyenne_test = null;
}
- echo '| '.$course['title'].' | '.(is_null($moyenne_test) ? '' : $moyenne_test.'%').' | |
';
+ echo '| '.$course['title'].' | '.(is_null($moyenne_test) ? '' : $moyenne_test.'%').' | |
';
}
echo '';
} else {
echo get_lang('NoCourse');
}
}
-/*
-==============================================================================
- FOOTER
-==============================================================================
-*/
-
-Display :: display_footer();
+Display :: display_footer();
\ No newline at end of file
diff --git a/main/mySpace/session.php b/main/mySpace/session.php
index f34f4e247d..ecf5551980 100644
--- a/main/mySpace/session.php
+++ b/main/mySpace/session.php
@@ -156,7 +156,7 @@ if ($nb_sessions > 0) {
$table -> addRow($row);
}
- $table -> setColAttributes(2, array('align' => 'center'));
+ //$table -> setColAttributes(2, array('align' => 'center'));
$table -> display();
if ($export_csv) {
diff --git a/main/mySpace/student.php b/main/mySpace/student.php
index a194a2555e..c222c4be19 100644
--- a/main/mySpace/student.php
+++ b/main/mySpace/student.php
@@ -168,11 +168,11 @@ if (api_is_allowed_to_create_course() || api_is_drh()) {
if (count($students) > 0) {
$table = new SortableTable('tracking_student', 'count_student_coached', null, ($is_western_name_order xor $sort_by_first_name) ? 1 : 0);
if ($is_western_name_order) {
- $table -> set_header(0, get_lang('FirstName'), false, 'align="center');
- $table -> set_header(1, get_lang('LastName'), false, 'align="center');
+ $table -> set_header(0, get_lang('FirstName'), false);
+ $table -> set_header(1, get_lang('LastName'), false);
} else {
- $table -> set_header(0, get_lang('LastName'), false, 'align="center');
- $table -> set_header(1, get_lang('FirstName'), false, 'align="center');
+ $table -> set_header(0, get_lang('LastName'), false);
+ $table -> set_header(1, get_lang('FirstName'), false);
}
/* $table -> set_header(2, get_lang('Time'), false);
$table -> set_header(3, get_lang('Progress'), false);
@@ -267,8 +267,7 @@ if (api_is_allowed_to_create_course() || api_is_drh()) {
$row[] = $first_date;
$row[] = $string_date;
- if ($export_csv) {
-
+ if ($export_csv) {
$row[count($row) - 1] = strip_tags($row[count($row) - 1]);
$row[count($row) - 2] = strip_tags($row[count($row) - 2]);
$csv_content[] = $row;
@@ -297,11 +296,6 @@ if (api_is_allowed_to_create_course() || api_is_drh()) {
foreach ($all_datas as $row) {
$table -> addRow($row, 'align="right"');
}
- $table -> updateColAttributes(0, array('align' => 'left'));
- $table -> updateColAttributes(1, array('align' => 'left'));
- /* $table -> updateColAttributes(7, array('align' => 'left'));
- $table -> updateColAttributes(8, array('align' => 'left'));
- $table -> setColAttributes(9, array('align' => 'center'));*/
$table -> display();
} else {
echo Display::display_warning_message(get_lang('NoStudent'));
diff --git a/main/mySpace/teachers.php b/main/mySpace/teachers.php
index 01e447425c..b314adb8a2 100644
--- a/main/mySpace/teachers.php
+++ b/main/mySpace/teachers.php
@@ -171,7 +171,7 @@ if (count($formateurs) > 0) {
}
} else {
// No results
- echo '| '.get_lang("NoResults").' |
';
+ echo '| '.get_lang("NoResults").' |
';
}
echo '';