summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--includes/pages/user_news.php4
-rw-r--r--includes/pages/user_shifts.php2
-rw-r--r--includes/sys_template.php2
3 files changed, 5 insertions, 3 deletions
diff --git a/includes/pages/user_news.php b/includes/pages/user_news.php
index 69f4022c..fce935e6 100644
--- a/includes/pages/user_news.php
+++ b/includes/pages/user_news.php
@@ -31,7 +31,7 @@ function user_meetings() {
function display_news($news) {
global $privileges, $p;
- $html .= "";
+ $html = "";
$html .= '<article class="news' . ($news['Treffen'] == 1 ? ' meeting' : '') . '">';
$html .= '<details>';
$html .= date("Y-m-d H:i", $news['Datum']) . ', ';
@@ -132,7 +132,7 @@ function user_news() {
$html .= Get_Text(5);
for ($i = 0; $i < $dis_rows; $i++) {
- if ($i == $_REQUEST['page'])
+ if (isset($_REQUEST['page']) && $i == $_REQUEST['page'])
$html .= ($i +1) . "&nbsp; ";
else
$html .= '<a href="' . page_link_to("news") . '&page=' . $i . '">' . ($i +1) . '</a>&nbsp; ';
diff --git a/includes/pages/user_shifts.php b/includes/pages/user_shifts.php
index b7b504af..f52702e1 100644
--- a/includes/pages/user_shifts.php
+++ b/includes/pages/user_shifts.php
@@ -282,6 +282,8 @@ function view_user_shifts() {
$_SESSION['user_shifts']['days'] = array (
date('Y-m-d')
);
+ if (!isset ($_SESSION['user_shifts']['rooms']) || count($_SESSION['user_shifts']['rooms']) == 0)
+ $_SESSION['user_shifts']['rooms'] = array(0);
$shifts = sql_select("SELECT `Shifts`.*, `Room`.`Name` as `room_name` FROM `Shifts` JOIN `Room` USING (`RID`)
WHERE `Shifts`.`RID` IN (" . implode(',', $_SESSION['user_shifts']['rooms']) . ")
diff --git a/includes/sys_template.php b/includes/sys_template.php
index 79e9fe77..08e47ee9 100644
--- a/includes/sys_template.php
+++ b/includes/sys_template.php
@@ -14,7 +14,7 @@ $themes = array (
"8" => "Pastel Style",
"4" => "Test Style",
"9" => "Test Style 21c3",
- "10" => "msquare (cccamp2011)",
+ "10" => "Engelsystem 2.0",
"11" => "msquare (28c3)"
);