From 3f4be08865296431d070e4386a252dac84d528ec Mon Sep 17 00:00:00 2001
From: msquare <msquare@notrademark.de>
Date: Mon, 22 Aug 2016 19:32:54 +0200
Subject: remove old update script

---
 includes/controller/user_angeltypes_controller.php | 2 +-
 includes/pages/user_atom.php                       | 2 +-
 includes/sys_page.php                              | 2 +-
 includes/sys_template.php                          | 8 +++-----
 4 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'includes')

diff --git a/includes/controller/user_angeltypes_controller.php b/includes/controller/user_angeltypes_controller.php
index be835e1f..2f382bb4 100644
--- a/includes/controller/user_angeltypes_controller.php
+++ b/includes/controller/user_angeltypes_controller.php
@@ -167,7 +167,7 @@ function user_angeltype_confirm_controller() {
  * Remove a user from an Angeltype.
  */
 function user_angeltype_delete_controller() {
-  global $user, $privileges;
+  global $user;
   
   if (! isset($_REQUEST['user_angeltype_id'])) {
     error(_("User angeltype doesn't exist."));
diff --git a/includes/pages/user_atom.php b/includes/pages/user_atom.php
index 81eb1670..1313d92c 100644
--- a/includes/pages/user_atom.php
+++ b/includes/pages/user_atom.php
@@ -34,7 +34,7 @@ function make_atom_entries_from_news($news_entries) {
   <feed xmlns="http://www.w3.org/2005/Atom">
   <title>Engelsystem</title>
   <id>' . $_SERVER['HTTP_HOST'] . htmlspecialchars(preg_replace('#[&?]key=[a-f0-9]{32}#', '', $_SERVER['REQUEST_URI'])) . '</id>
-  <updated>' . date('Y-m-d\TH:i:sP', $news[0]['Datum']) . "</updated>\n";
+  <updated>' . date('Y-m-d\TH:i:sP', $news_entries[0]['Datum']) . "</updated>\n";
   foreach ($news_entries as $news_entry) {
     $html .= make_atom_entry_from_news($news_entry);
   }
diff --git a/includes/sys_page.php b/includes/sys_page.php
index 52cffb26..5a582c39 100644
--- a/includes/sys_page.php
+++ b/includes/sys_page.php
@@ -5,7 +5,7 @@
  */
 function redirect($to) {
   header("Location: " . $to, true, 302);
-  die();
+  raw_output("");
 }
 
 /**
diff --git a/includes/sys_template.php b/includes/sys_template.php
index e9ed35ef..112bb483 100644
--- a/includes/sys_template.php
+++ b/includes/sys_template.php
@@ -7,7 +7,7 @@ $themes = array(
     '3' => "Engelsystem 32c3",
     "2" => "Engelsystem cccamp15",
     "0" => "Engelsystem light",
-    "1" => "Engelsystem dark"
+    "1" => "Engelsystem dark" 
 );
 
 /**
@@ -86,8 +86,7 @@ function toolbar_dropdown($glyphicon, $label, $submenu, $class = '') {
 function toolbar_popover($glyphicon, $label, $content, $class = '') {
   $id = md5(microtime() . $glyphicon . $label);
   return '<li class="dropdown messages ' . $class . '">
-          <a id="' . $id . '" href="#" tabindex="0">' . ($glyphicon != '' ? '<span class="glyphicon glyphicon-' . $glyphicon . '"></span> ' : '') 
-          . $label . ' <span class="caret"></span></a>
+          <a id="' . $id . '" href="#" tabindex="0">' . ($glyphicon != '' ? '<span class="glyphicon glyphicon-' . $glyphicon . '"></span> ' : '') . $label . ' <span class="caret"></span></a>
           <script type="text/javascript">
           $(function(){
               $("#' . $id . '").popover({
@@ -416,9 +415,8 @@ function template_render($file, $data) {
         $template = str_replace("%" . $name . "%", $content, $template);
       }
     return $template;
-  } else {
-    die('Cannot find template file &laquo;' . $file . '&raquo;.');
   }
+  engelsystem_error("Cannot find template file &laquo;" . $file . "&raquo;.");
 }
 
 function shorten($str) {
-- 
cgit v1.2.3-54-g00ecf