Skip to content
Snippets Groups Projects
Commit 1ff1c2c5 authored by Elmar Ludwig's avatar Elmar Ludwig Committed by David Siegfried
Browse files

fix PHP warnings (see also !450), fixes #1346

Closes #1346

Merge request studip/studip!870
parent 7a3b481c
No related branches found
No related tags found
No related merge requests found
...@@ -470,7 +470,7 @@ class ExternSemBrowseTemplate extends SemBrowse { ...@@ -470,7 +470,7 @@ class ExternSemBrowseTemplate extends SemBrowse {
$doz_titlerear = array_keys($sem_data[$seminar_id]['title_rear']); $doz_titlerear = array_keys($sem_data[$seminar_id]['title_rear']);
$doz_uname = array_keys($sem_data[$seminar_id]['username']); $doz_uname = array_keys($sem_data[$seminar_id]['username']);
$doz_position = array_keys($sem_data[$seminar_id]['position']); $doz_position = array_keys($sem_data[$seminar_id]['position']);
if (sizeof($doz_position) < $doz_name) { if (sizeof($doz_position) < sizeof($doz_name)) {
$doz_position = array_fill(0, sizeof($doz_name), 0); $doz_position = array_fill(0, sizeof($doz_name), 0);
} }
if (is_array($doz_name)){ if (is_array($doz_name)){
......
...@@ -78,8 +78,14 @@ class ExternSemBrowse extends SemBrowse { ...@@ -78,8 +78,14 @@ class ExternSemBrowse extends SemBrowse {
} }
} }
$switch_time = mktime(0, 0, 0, date("m"), // Is a semester switch defined?
date("d") + 7 * $this->config->getValue("Main", "semswitch"), date("Y")); $week_offset = $this->config->getValue('Main', 'semswitch');
if (ctype_digit($week_offset)) {
$switch_time = strtotime("+{$week_offset} weeks 0:00:00");
} else {
$switch_time = strtotime('0:00:00');
}
// get current semester // get current semester
$current_sem = get_sem_num($switch_time) + 1; $current_sem = get_sem_num($switch_time) + 1;
......
...@@ -138,8 +138,7 @@ class ExternSemBrowseTable extends SemBrowse { ...@@ -138,8 +138,7 @@ class ExternSemBrowseTable extends SemBrowse {
$the_tree->buildIndex(); $the_tree->buildIndex();
$selected_ranges = array_merge([$stid], $the_tree->getKidsKids($stid)); $selected_ranges = array_merge([$stid], $the_tree->getKidsKids($stid));
} }
if (!$this->module->config->getValue('SelectSubjectAreas', 'selectallsubjectareas') if (!$this->module->config->getValue('SelectSubjectAreas', 'selectallsubjectareas') && $selected_ranges) {
&& count($selected_ranges)) {
if ($this->module->config->getValue('SelectSubjectAreas', 'reverseselection')) { if ($this->module->config->getValue('SelectSubjectAreas', 'reverseselection')) {
$sem_range_query = "AND seminar_sem_tree.sem_tree_id NOT IN ('".implode("','", $selected_ranges)."')"; $sem_range_query = "AND seminar_sem_tree.sem_tree_id NOT IN ('".implode("','", $selected_ranges)."')";
} else { } else {
...@@ -155,7 +154,7 @@ class ExternSemBrowseTable extends SemBrowse { ...@@ -155,7 +154,7 @@ class ExternSemBrowseTable extends SemBrowse {
$selected_semtypes = [Request::get('semstatus')]; $selected_semtypes = [Request::get('semstatus')];
} }
$sem_types_array = []; $sem_types_array = [];
if (count($selected_semtypes)) { if ($selected_semtypes) {
foreach ($selected_semtypes as $i => $active) { foreach ($selected_semtypes as $i => $active) {
if ($active == '1') { if ($active == '1') {
$sem_types_array[] = $i + 1; $sem_types_array[] = $i + 1;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment