';
- if ( $col == 2 && $i == 1 ) {
+ if ($col == 2 && $i == 1) {
if ($right === true) {
$html .= '
';
$html .= (isset($content[$i]) ? $content[$i] : '');
diff --git a/main/lp/learnpath.class.php b/main/lp/learnpath.class.php
index 28e5d7e064..1e2310c85f 100755
--- a/main/lp/learnpath.class.php
+++ b/main/lp/learnpath.class.php
@@ -5911,8 +5911,7 @@ class learnpath
public function build_action_menu($returnContent = false)
{
$gradebook = isset($_GET['gradebook']) ? Security :: remove_XSS($_GET['gradebook']) : null;
- $actionsLeft = null;
-
+ $actionsLeft = '';
$actionsLeft .= '
' . Display :: return_icon('preview_view.png', get_lang('Display'),'',ICON_SIZE_MEDIUM).' ';
$actionsLeft .= '
' . Display :: return_icon('upload_audio.png', get_lang('UpdateAllAudioFragments'),'',ICON_SIZE_MEDIUM).'';
$actionsLeft .= '
' . Display :: return_icon('settings.png', get_lang('CourseSettings'),'',ICON_SIZE_MEDIUM).'';
@@ -5927,15 +5926,16 @@ class learnpath
'href' => 'lp_controller.php?'.api_get_cidreq().'&action=clear_prerequisites&lp_id=' . $_SESSION['oLP']->lp_id,
),
);
- $actionsRigth = Display::group_button(get_lang('PrerequisitesOptions'), $buttons);
-
+ $actionsRight = Display::group_button(get_lang('PrerequisitesOptions'), $buttons);
+
+ $toolbar = Display::toolbarAction('actions-lp-controller', array($actionsLeft, $actionsRight));
if ($returnContent) {
- return $toolbar=null;
+
+ return $toolbar;
}
-
- echo $toolbar = Display::toolbarAction('actions-lp-controller', array(0 => $actionsLeft, 1 => $actionsRigth));
-
+
+ echo $toolbar;
}
/**
@@ -9962,7 +9962,7 @@ EOD;
$fs = new \Symfony\Component\Filesystem\Filesystem;
$fs->mirror($main_code_path, $archive_path.$temp_dir_short);
-
+
// Finalize the imsmanifest structure, add to the zip, then return the zip.
diff --git a/main/mySpace/course.php b/main/mySpace/course.php
index bfc146b277..96f50d8cfb 100755
--- a/main/mySpace/course.php
+++ b/main/mySpace/course.php
@@ -114,20 +114,18 @@ if (api_is_drh() || api_is_session_admin() || api_is_platform_admin()) {
$actionsLeft .= $item;
}
}
+
if (count($a_courses) > 0) {
-
$actionsRight .= Display::url(
Display::return_icon('printer.png', get_lang('Print'), array(), 32),
'javascript: void(0);',
array('onclick'=>'javascript: window.print();')
);
-
+
}
-
- $toolbar = Display::toolbarAction('toolbar-course', $content = array( 0 => $actionsLeft, 1 => $actionsRight ));
+ $toolbar = Display::toolbarAction('toolbar-course', [$actionsLeft, $actionsRight]);
echo $toolbar;
-
echo Display::page_header($title);
}
@@ -300,7 +298,6 @@ function get_courses($from, $limit, $column, $direction)
return $courseList;
}
-
$table = new SortableTable(
'tracking_course',
'get_count_courses',
diff --git a/main/mySpace/student.php b/main/mySpace/student.php
index f797c5c4bf..dc125d18c8 100755
--- a/main/mySpace/student.php
+++ b/main/mySpace/student.php
@@ -241,8 +241,7 @@ $actionsRight .= Display::url(
api_get_self().'?export=csv&keyword='.$keyword
);
-
-$toolbar = Display::toolbarAction('toolbar-student', $content = array( 0 => $actionsLeft, 1 => $actionsRight ));
+$toolbar = Display::toolbarAction('toolbar-student', [$actionsLeft, $actionsRight]);
$table = new SortableTable(
'tracking_student',
diff --git a/main/mySpace/teachers.php b/main/mySpace/teachers.php
index 1cda57a4bd..7aca611356 100755
--- a/main/mySpace/teachers.php
+++ b/main/mySpace/teachers.php
@@ -208,7 +208,7 @@ $actionsRight .= Display::url(
);
-$toolbar = Display::toolbarAction('toolbar-teachers', $content = array( 0 => $actionsLeft, 1 => $actionsRight ));
+$toolbar = Display::toolbarAction('toolbar-teachers', [$actionsLeft, $actionsRight]);
$table = new SortableTable(
'tracking_teachers',
diff --git a/main/mySpace/users.php b/main/mySpace/users.php
index 988407b2ca..ab12d6bfc3 100755
--- a/main/mySpace/users.php
+++ b/main/mySpace/users.php
@@ -197,9 +197,16 @@ if (api_is_drh()) {
}
}
-$actionsRight = Display::url(Display::return_icon('printer.png', get_lang('Print'), array(), ICON_SIZE_MEDIUM), 'javascript: void(0);', array('onclick'=>'javascript: window.print();'));
-$actionsRight .= Display::url(Display::return_icon('export_csv.png', get_lang('ExportAsCSV'), array(), ICON_SIZE_MEDIUM), api_get_self().'?export=csv&keyword='.$keyword);
-$toolbar = Display::toolbarAction('toolbar-user', $content = array( 0 => $actionsLeft, 1 => $actionsRight ));
+$actionsRight = Display::url(
+ Display::return_icon('printer.png', get_lang('Print'), array(), ICON_SIZE_MEDIUM),
+ 'javascript: void(0);',
+ array('onclick'=>'javascript: window.print();')
+);
+$actionsRight .= Display::url(
+ Display::return_icon('export_csv.png', get_lang('ExportAsCSV'), array(), ICON_SIZE_MEDIUM),
+ api_get_self().'?export=csv&keyword='.$keyword
+);
+$toolbar = Display::toolbarAction('toolbar-user', [$actionsLeft, $actionsRight]);
$table = new SortableTable(
'tracking_student',
diff --git a/main/tracking/courseLog.php b/main/tracking/courseLog.php
index 40118605e2..8cd4514ebb 100755
--- a/main/tracking/courseLog.php
+++ b/main/tracking/courseLog.php
@@ -261,21 +261,15 @@ $form_search->addElement('hidden', 'session_id', $sessionId);
$form_search->addElement('hidden', 'id_session', $sessionId);
$form_search->addElement('text', 'user_keyword');
$form_search->addButtonSearch(get_lang('SearchUsers'));
-
-
-echo Display::toolbarAction('toolbar-courselog', array( 0 => $actionsLeft, 1 => $form_search->returnForm(), 2 => $actionsRight ), 3);
+echo Display::toolbarAction('toolbar-courselog', [$actionsLeft, $form_search->returnForm(), $actionsRight], 3);
$course_name = get_lang('Course').' '.$courseInfo['name'];
-
if ($session_id) {
$titleSession = Display::return_icon('session.png', get_lang('Session'), array(), ICON_SIZE_SMALL).' '.api_get_session_name($session_id);
$titleCourse = Display::return_icon('course.png', get_lang('Course'), array(), ICON_SIZE_SMALL).' '.$course_name;
-
} else {
$titleSession = Display::return_icon('course.png', get_lang('Course'), array(), ICON_SIZE_SMALL).' '.$courseInfo['name'];
}
-
-
$teacherList = CourseManager::get_teacher_list_from_course_code_to_string(
$courseInfo['code'],
',',
diff --git a/main/tracking/exams.php b/main/tracking/exams.php
index 797d9a79f9..810dbe1e14 100755
--- a/main/tracking/exams.php
+++ b/main/tracking/exams.php
@@ -68,7 +68,6 @@ if ($global) {
while ($row = Database::fetch_array($result)) {
$exerciseList[$row['id']] = $row['title'];
}
-
$form->addElement('select', 'exercise_id', get_lang('Exercise'), $exerciseList);
}
@@ -83,13 +82,9 @@ if (!$exportToXLS) {
Display :: display_header(get_lang('Reporting'));
$actionsLeft = $actionsRight ='';
if ($global) {
-
$actionsLeft .= '
'.
Display::return_icon('stats.png', get_lang('MyStats'), '', ICON_SIZE_MEDIUM);
$actionsLeft .= '';
-
-
-
$courseLink = '';
$courseInfo = api_get_course_info();
@@ -101,7 +96,6 @@ if (!$exportToXLS) {
Display::return_icon('export_excel.png',get_lang('ExportAsXLS'),'',ICON_SIZE_MEDIUM).'';
$actionsRight .= '
'.
Display::return_icon('printer.png',get_lang('Print'),'',ICON_SIZE_MEDIUM).'';
-
$menuItems[] = Display::url(
Display::return_icon('teacher.png', get_lang('TeacherInterface'), array(), 32),
@@ -122,7 +116,7 @@ if (!$exportToXLS) {
$nb_menu_items = count($menuItems);
if ($nb_menu_items > 1) {
- foreach ($menuItems as $key=> $item) {
+ foreach ($menuItems as $key => $item) {
$actionsLeft .= $item;
}
}
@@ -143,11 +137,9 @@ if (!$exportToXLS) {
Display::return_icon('export_excel.png', get_lang('ExportAsXLS'), array(), 32),
api_get_self().'?'.api_get_cidreq().'&export=1&score='.$filter_score.'&exercise_id='.$exerciseId
);
-
}
-
-
- $toolbar = Display::toolbarAction('toolbar-exams', $content = array( 0 => $actionsLeft, 1 => $actionsRight ));
+
+ $toolbar = Display::toolbarAction('toolbar-exams', [$actionsLeft, $actionsRight]);
echo $toolbar;
$form->display();
diff --git a/main/user/class.php b/main/user/class.php
index 8eb551ba04..d9a2214dab 100755
--- a/main/user/class.php
+++ b/main/user/class.php
@@ -41,8 +41,7 @@ $actionsLeft = '';
$actionsRight = '';
$usergroup = new UserGroup();
if (api_is_allowed_to_edit()) {
-
- if ($type == 'registered') {
+ if ($type === 'registered') {
$actionsLeft .= '
'.
Display::return_icon('add-class.png', get_lang("AddClassesToACourse"), array(), ICON_SIZE_MEDIUM).'';
} else {
@@ -53,15 +52,13 @@ if (api_is_allowed_to_edit()) {
$options = [
-1 => get_lang('All'),
1 => get_lang('SocialGroups'),
- 0 => get_lang('Classes'),
+ 0 => get_lang('Classes')
];
$form->addSelect('group_filter', get_lang('Groups'), $options, ['id' => 'group_filter']);
$form->setDefaults(['group_filter' => $groupFilter]);
$actionsRight = $form->returnForm();
}
-
-
- $actions = Display::toolbarAction('actions-class', array(0=>$actionsLeft, 1=> $actionsRight));
+ $actions = Display::toolbarAction('actions-class', [$actionsLeft, $actionsRight]);
}
if (api_is_allowed_to_edit()) {
diff --git a/main/user/subscribe_user.php b/main/user/subscribe_user.php
index b1d1236276..9def3d1c4b 100755
--- a/main/user/subscribe_user.php
+++ b/main/user/subscribe_user.php
@@ -255,14 +255,13 @@ $form = new FormValidator('search_user', 'get', '', '', null, FormValidator::LAY
$form->addText('keyword', '', false);
$form->addElement('hidden', 'type', $type);
$form->addButtonSearch(get_lang('Search'));
-echo Display::toolbarAction('toolbar-subscriber', array(0 => $actionsLeft, 1 => $form->returnForm()));
+echo Display::toolbarAction('toolbar-subscriber', [$actionsLeft, $form->returnForm()]);
$option = $type == COURSEMANAGER ? 2 : 1;
echo UserManager::getUserSubscriptionTab($option);
// Display table
$table->display();
-
Display::display_footer();
/* SHOW LIST OF USERS */
@@ -281,10 +280,8 @@ function get_number_of_users()
$courseCode = api_get_course_id();
$sessionId = api_get_session_id();
- if (isset($_REQUEST['type']) && $_REQUEST['type']=='teacher') {
-
+ if (isset($_REQUEST['type']) && $_REQUEST['type'] === 'teacher') {
if (api_get_session_id() != 0) {
-
$sql = "SELECT COUNT(u.user_id)
FROM $user_table u
LEFT JOIN $tbl_session_rel_course_user cu
diff --git a/main/wiki/wiki.inc.php b/main/wiki/wiki.inc.php
index f1a4b90ffb..c77dd86d11 100755
--- a/main/wiki/wiki.inc.php
+++ b/main/wiki/wiki.inc.php
@@ -1093,9 +1093,7 @@ class Wiki
);
}
- echo Display::toolbarAction('toolbar-wikistudent', array(0 => $actionsLeft, 1 => $actionsRight));
-
-
+ echo Display::toolbarAction('toolbar-wikistudent', [$actionsLeft, $actionsRight]);
if (empty($title)) {
$pageTitle = get_lang('DefaultTitle');
@@ -1107,7 +1105,6 @@ class Wiki
$pageTitle = api_htmlentities($title);
}
-
$pageWiki = self::make_wiki_link_clickable(
self::detect_external_link(
self::detect_anchor_link(
@@ -4747,9 +4744,7 @@ class Wiki
// menu recent changes
$actionsLeft .= '
'.
get_lang('RecentChanges').'';
-
-
- echo Display::toolbarAction('toolbar-wiki', array( 0 => $actionsLeft));
+ echo Display::toolbarAction('toolbar-wiki', [$actionsLeft]);
}
/**