add user view, better bootstrap

5 files changed, 7 insertions, 85 deletions

diff --git a/includes/pages/admin_questions.php b/includes/pages/admin_questions.php
index 5d4fbd61..8bdde714 100644
--- a/includes/pages/admin_questions.php
+++ b/includes/pages/admin_questions.php
@@ -10,7 +10,7 @@ function admin_new_questions() {
     $new_messages = sql_num_query("SELECT * FROM `Questions` WHERE `AID` IS NULL");
     
     if ($new_messages > 0)
-      return info('<a href="' . page_link_to("admin_questions") . '">Es gibt unbeantwortete Fragen!</a>', true);
+      info('<a href="' . page_link_to("admin_questions") . '">Es gibt unbeantwortete Fragen!</a>');
   }
   
   return "";
diff --git a/includes/pages/user_messages.php b/includes/pages/user_messages.php
index a1b565ec..b0ac66b1 100644
--- a/includes/pages/user_messages.php
+++ b/includes/pages/user_messages.php
@@ -53,7 +53,7 @@ function user_messages() {
     return template_render('../templates/user_messages.html', array(
         'title' => messages_title(),
         'link' => page_link_to("user_messages"),
-        'greeting' => sprintf(_("Hello %s, here can you leave messages for other angels"), User_Nick_render($user)) . '<br /><br />',
+        'greeting' => msg() . sprintf(_("Hello %s, here can you leave messages for other angels"), User_Nick_render($user)) . '<br /><br />',
         'messages' => $messages_html,
         'new_label' => _("New"),
         'date_label' => _("Date"),
diff --git a/includes/pages/user_myshifts.php b/includes/pages/user_myshifts.php
index 12ba5562..333f9517 100644
--- a/includes/pages/user_myshifts.php
+++ b/includes/pages/user_myshifts.php
@@ -80,86 +80,8 @@ function user_myshifts() {
     } else
       redirect(page_link_to('user_myshifts'));
   }
-  $shifts = sql_select("SELECT * FROM `ShiftEntry` JOIN `Shifts` ON (`ShiftEntry`.`SID` = `Shifts`.`SID`) JOIN `Room` ON (`Shifts`.`RID` = `Room`.`RID`) WHERE `UID`=" . sql_escape($shifts_user['UID']) . " ORDER BY `start`");
   
-  $myshifts_table = array();
-  $html = "";
-  $timesum = 0;
-  foreach ($shifts as $shift) {
-    $shift_info = $shift['name'];
-    $needed_angel_types_source = sql_select("SELECT DISTINCT `AngelTypes`.* FROM `ShiftEntry` JOIN `AngelTypes` ON `ShiftEntry`.`TID`=`AngelTypes`.`id` WHERE `ShiftEntry`.`SID`=" . sql_escape($shift['SID']) . "  ORDER BY `AngelTypes`.`name`");
-    foreach ($needed_angel_types_source as $needed_angel_type) {
-      $shift_info .= '<br><b>' . $needed_angel_type['name'] . ':</b> ';
-      
-      $users_source = sql_select("SELECT `ShiftEntry`.`freeloaded`, `User`.* FROM `ShiftEntry` JOIN `User` ON `ShiftEntry`.`UID`=`User`.`UID` WHERE `ShiftEntry`.`SID`=" . sql_escape($shift['SID']) . " AND `ShiftEntry`.`TID`=" . sql_escape($needed_angel_type['id']));
-      $shift_entries = array();
-      foreach ($users_source as $user_source) {
-        if ($user['UID'] == $user_source['UID'])
-          $member = '<b>' . $user_source['Nick'] . '</b>';
-        else
-          $member = User_Nick_render($user_source);
-        if ($user_source['freeloaded'])
-          $member = '<strike>' . $member . '</strike>';
-        
-        $shift_entries[] = $member;
-      }
-      $shift_info .= join(", ", $shift_entries);
-    }
-    
-    $myshift = array(
-        'date' => date("Y-m-d", $shift['start']),
-        'time' => date("H:i", $shift['start']) . ' - ' . date("H:i", $shift['end']),
-        'room' => $shift['Name'],
-        'shift_info' => $shift_info,
-        'comment' => $shift['Comment'] 
-    );
-    
-    if ($shift['freeloaded']) {
-      if (in_array("user_shifts_admin", $privileges))
-        $myshift['comment'] .= '<br /><p class="error">' . _("Freeloaded") . ': ' . $shift['freeload_comment'] . '</p>';
-      else
-        $myshift['comment'] .= '<br /><p class="error">' . _("Freeloaded") . '</p>';
-    }
-    
-    $myshift['actions'] = "";
-    if ($id == $user['UID'] || in_array('user_shifts_admin', $privileges))
-      $myshift['actions'] .= img_button(page_link_to('user_myshifts') . '&edit=' . $shift['id'] . '&id=' . $id, 'pencil', _("edit"));
-    if (($shift['start'] > time() + $LETZTES_AUSTRAGEN * 3600) || in_array('user_shifts_admin', $privileges))
-      $myshift['actions'] .= img_button(page_link_to('user_myshifts') . (($id != $user['UID']) ? '&id=' . $id : '') . '&cancel=' . $shift['id'], 'cross', _("sign off"));
-    
-    if ($shift['freeloaded'])
-      $timesum += - 2 * ($shift['end'] - $shift['start']);
-    else
-      $timesum += $shift['end'] - $shift['start'];
-    $myshifts_table[] = $myshift;
-  }
-  if (count($myshifts_table) > 0)
-    $myshifts_table[] = array(
-        'date' => '<b>' . _("Sum:") . '</b>',
-        'time' => "<b>" . round($timesum / (60 * 60), 1) . " h</b>",
-        'room' => "",
-        'shift_info' => "",
-        'comment' => "",
-        'actions' => "" 
-    );
-  
-  return page_with_title(myshifts_title(), array(
-      msg(),
-      $id == $user['UID'] ? sprintf(_('These are your shifts.<br/>Please try to appear <b>15 minutes</b> before your shift begins!<br/>You can remove yourself from a shift up to %d hours before it starts.'), $LETZTES_AUSTRAGEN) : '',
-      $id != $user['UID'] ? info(sprintf("You are viewing %s's shifts.", $shifts_user['Nick']), true) : '',
-      $id != $user['UID'] ? buttons(array(
-          button(page_link_to('admin_user') . '&amp;id=' . $shifts_user['UID'], "Edit " . $shifts_user['Nick'], 'edit') 
-      )) : '',
-      table(array(
-          'date' => _("Day"),
-          'time' => _("Time"),
-          'room' => _("Location"),
-          'shift_info' => _("Name &amp; workmates"),
-          'comment' => _("Comment"),
-          'actions' => _("Action") 
-      ), $myshifts_table),
-      $id == $user['UID'] && count($shifts) == 0 ? error(sprintf(_("Go to the <a href=\"%s\">shifts table</a> to sign yourself up for some shifts."), page_link_to('user_shifts')), true) : '',
-      '<h2>' . _("Exports") . '</h2>' . sprintf(_("Export of shown shifts. <a href=\"%s\">iCal format</a> or <a href=\"%s\">JSON format</a> available (please keep secret, otherwise <a href=\"%s\">reset the api key</a>)."), page_link_to_absolute('ical') . '&key=' . $shifts_user['api_key'], page_link_to_absolute('shifts_json_export') . '&key=' . $shifts_user['api_key'], page_link_to('user_myshifts') . '&reset') 
-  ));
+  msg();
+  redirect(page_link_to('users') . '&action=view');
 }
 ?>
diff --git a/includes/pages/user_news.php b/includes/pages/user_news.php
index b8879e62..c4d243f4 100644
--- a/includes/pages/user_news.php
+++ b/includes/pages/user_news.php
@@ -14,7 +14,7 @@ function meetings_title() {
 function user_meetings() {
   global $DISPLAY_NEWS, $privileges, $user;
   
-  $html = '<div class="col-md-10"><h1>' . meetings_title() . '</h1>';
+  $html = '<div class="col-md-10"><h1>' . meetings_title() . '</h1>' . msg();
   
   if (isset($_REQUEST['page']) && preg_match("/^[0-9]{1,}$/", $_REQUEST['page']))
     $page = $_REQUEST['page'];
diff --git a/includes/pages/user_shifts.php b/includes/pages/user_shifts.php
index 2adce0d5..faf6f162 100644
--- a/includes/pages/user_shifts.php
+++ b/includes/pages/user_shifts.php
@@ -6,7 +6,7 @@ function shifts_title() {
 function user_shifts() {
   global $user, $privileges, $max_freeloadable_shifts;
   
-  if (count(ShiftEntries_freeloaded_by_user($user)) >= $max_freeloadable_shifts)
+  if (User_is_freeloader($user))
     redirect(page_link_to('user_myshifts'));
     
     // Löschen einzelner Schicht-Einträge (Also Belegung einer Schicht von Engeln) durch Admins
@@ -743,7 +743,7 @@ function view_user_shifts() {
           'filled_select' => make_select($filled, $_SESSION['user_shifts']['filled'], "filled", _("Occupancy")),
           'task_notice' => '<sup>1</sup>' . _("The tasks shown here are influenced by the preferences you defined in your settings!") . " <a href=\"" . page_link_to('angeltypes') . '&action=about' . "\">" . _("Description of the jobs.") . "</a>",
           'new_style_checkbox' => '<label><input type="checkbox" name="new_style" value="1" ' . ($_SESSION['user_shifts']['new_style'] ? ' checked' : '') . '> ' . _("Use new style if possible") . '</label>',
-          'shifts_table' => $shifts_table,
+          'shifts_table' =>msg(). $shifts_table,
           'ical_text' => '<h2>' . _("iCal export") . '</h2><p>' . sprintf(_("Export of shown shifts. <a href=\"%s\">iCal format</a> or <a href=\"%s\">JSON format</a> available (please keep secret, otherwise <a href=\"%s\">reset the api key</a>)."), page_link_to_absolute('ical') . '&key=' . $user['api_key'], page_link_to_absolute('shifts_json_export') . '&key=' . $user['api_key'], page_link_to('user_myshifts') . '&reset') . '</p>',
           'filter' => _("Filter") 
       )),