summaryrefslogtreecommitdiff
path: root/www-ssl
diff options
context:
space:
mode:
Diffstat (limited to 'www-ssl')
-rwxr-xr-xwww-ssl/admin/EngelType.php1
-rwxr-xr-xwww-ssl/admin/Recentchanges.php1
-rwxr-xr-xwww-ssl/admin/UserPicture.php1
-rwxr-xr-xwww-ssl/admin/aktiv.php1
-rwxr-xr-xwww-ssl/admin/dbUpdateFromXLS.php1
-rwxr-xr-xwww-ssl/admin/faq.php1
-rwxr-xr-xwww-ssl/admin/free.php1
-rwxr-xr-xwww-ssl/admin/news.php1
-rwxr-xr-xwww-ssl/admin/room.php1
-rwxr-xr-xwww-ssl/admin/schichtplan.php1
-rwxr-xr-xwww-ssl/admin/schichtplan_druck.php1
-rwxr-xr-xwww-ssl/admin/shiftadd.php1
-rwxr-xr-xwww-ssl/admin/tshirt.php1
-rwxr-xr-xwww-ssl/admin/user.php1
-rwxr-xr-xwww-ssl/admin/user2.php2
-rwxr-xr-xwww-ssl/inc/funktion_activeUser.php2
-rwxr-xr-xwww-ssl/inc/header.php1
-rwxr-xr-xwww-ssl/nonpublic/einstellungen.php1
-rwxr-xr-xwww-ssl/nonpublic/engelbesprechung.php1
-rwxr-xr-xwww-ssl/nonpublic/faq.php1
-rwxr-xr-xwww-ssl/nonpublic/messages.php1
-rwxr-xr-xwww-ssl/nonpublic/myschichtplan.php1
-rwxr-xr-xwww-ssl/nonpublic/news_comments.php2
-rwxr-xr-xwww-ssl/nonpublic/news_output.php3
-rwxr-xr-xwww-ssl/nonpublic/schichtplan.php1
-rwxr-xr-xwww-ssl/nonpublic/schichtplan_add.php1
-rwxr-xr-xwww-ssl/nonpublic/waeckliste.php2
-rwxr-xr-xwww-ssl/nonpublic/wecken.php1
28 files changed, 4 insertions, 30 deletions
diff --git a/www-ssl/admin/EngelType.php b/www-ssl/admin/EngelType.php
index 192a0d91..cc442483 100755
--- a/www-ssl/admin/EngelType.php
+++ b/www-ssl/admin/EngelType.php
@@ -2,7 +2,6 @@
$title = "Räume";
$header = "Verwaltung der Räume";
include ("./inc/header.php");
-include ("./inc/funktion_user.php");
include("./inc/funktion_db.php");
function runSQL( $SQL)
diff --git a/www-ssl/admin/Recentchanges.php b/www-ssl/admin/Recentchanges.php
index b6cb5a9f..265dd18d 100755
--- a/www-ssl/admin/Recentchanges.php
+++ b/www-ssl/admin/Recentchanges.php
@@ -3,7 +3,6 @@
$title = "ChangeLog";
$header = "Datenbank-Auszug";
include ("./inc/header.php");
-include ("./inc/funktion_user.php");
$SQL = "SELECT * FROM `ChangeLog` ORDER BY `Time` DESC LIMIT 0,10000";
$Erg = mysql_query($SQL, $con);
diff --git a/www-ssl/admin/UserPicture.php b/www-ssl/admin/UserPicture.php
index 7346fe0b..1aa74360 100755
--- a/www-ssl/admin/UserPicture.php
+++ b/www-ssl/admin/UserPicture.php
@@ -2,7 +2,6 @@
$title = "UserPicture";
$header = "Verwaltung der User Picture";
include ("./inc/header.php");
-include ("./inc/funktion_user.php");
include ("./inc/funktion_schichtplan_aray.php");
diff --git a/www-ssl/admin/aktiv.php b/www-ssl/admin/aktiv.php
index 1bf7fbe1..51ef8aaa 100755
--- a/www-ssl/admin/aktiv.php
+++ b/www-ssl/admin/aktiv.php
@@ -4,7 +4,6 @@ $title = "akive Engel";
$header = "Liste der aktiven Engel";
include ("./inc/header.php");
include ("./inc/funktion_db_list.php");
-include ("./inc/funktion_user.php");
echo "<form action=\"./aktiv.php\" method=\"post\">";
echo Get_Text("pub_aktive_Text1")."<br>\n";
diff --git a/www-ssl/admin/dbUpdateFromXLS.php b/www-ssl/admin/dbUpdateFromXLS.php
index f86c496c..2aa71fa0 100755
--- a/www-ssl/admin/dbUpdateFromXLS.php
+++ b/www-ssl/admin/dbUpdateFromXLS.php
@@ -2,7 +2,6 @@
$title = "DB Update from XML";
$header = "DB Update from XML";
include ("./inc/header.php");
-include ("./inc/funktion_user.php");
include ("./inc/funktion_xml.php");
///////////
diff --git a/www-ssl/admin/faq.php b/www-ssl/admin/faq.php
index 71195cd2..c239e71c 100755
--- a/www-ssl/admin/faq.php
+++ b/www-ssl/admin/faq.php
@@ -3,7 +3,6 @@ $title = "Himmel";
$header = "FAQ / Fragen an die Erzengel";
$submenus = 1;
include ("./inc/header.php");
-include ("./inc/funktion_user.php");
include ("./inc/funktion_db.php");
//var init
diff --git a/www-ssl/admin/free.php b/www-ssl/admin/free.php
index 604660a1..b492784b 100755
--- a/www-ssl/admin/free.php
+++ b/www-ssl/admin/free.php
@@ -4,7 +4,6 @@ $title = "Erzengel";
$header = "Freie Engel";
include ("./inc/header.php");
include ("./inc/funktion_db_list.php");
-include ("./inc/funktion_user.php");
echo "Hallo ".$_SESSION['Nick'].",<br>\n";
diff --git a/www-ssl/admin/news.php b/www-ssl/admin/news.php
index 373c622b..3850c5cf 100755
--- a/www-ssl/admin/news.php
+++ b/www-ssl/admin/news.php
@@ -4,7 +4,6 @@ $title = "Newsverwaltung";
$header = "Verwaltung der News";
include ("./inc/header.php");
include ("./inc/funktion_db_list.php");
-include ("./inc/funktion_user.php");
if (!IsSet($_GET["action"]))
diff --git a/www-ssl/admin/room.php b/www-ssl/admin/room.php
index afcf2c2e..61acd4c7 100755
--- a/www-ssl/admin/room.php
+++ b/www-ssl/admin/room.php
@@ -2,7 +2,6 @@
$title = "R&auml;ume";
$header = "Verwaltung der R&auml;ume";
include ("./inc/header.php");
-include ("./inc/funktion_user.php");
include ("./inc/funktion_schichtplan_aray.php");
$Sql = "SELECT * FROM `Room` ORDER BY `Number`, `Name`";
diff --git a/www-ssl/admin/schichtplan.php b/www-ssl/admin/schichtplan.php
index 3bf2bb4f..4327e111 100755
--- a/www-ssl/admin/schichtplan.php
+++ b/www-ssl/admin/schichtplan.php
@@ -3,7 +3,6 @@ $title = "Schichtplan";
$header = "Neue Schichten erfassen";
$submenus = 1;
include ("./inc/header.php");
-include ("./inc/funktion_user.php");
function executeSQL( $SQL)
{
diff --git a/www-ssl/admin/schichtplan_druck.php b/www-ssl/admin/schichtplan_druck.php
index bef2dc06..0c9c5215 100755
--- a/www-ssl/admin/schichtplan_druck.php
+++ b/www-ssl/admin/schichtplan_druck.php
@@ -10,7 +10,6 @@ if (!IsSet($_POST["action"]))
include ("./inc/funktionen.php");
include ("./inc/funktion_schichtplan_aray.php");
include ("./inc/funktion_schichtplan.php");
- include ("./inc/funktion_user.php");
?>
Hallo <?PHP echo $_SESSION['Nick']?>,<br>
diff --git a/www-ssl/admin/shiftadd.php b/www-ssl/admin/shiftadd.php
index cefefd89..350223ed 100755
--- a/www-ssl/admin/shiftadd.php
+++ b/www-ssl/admin/shiftadd.php
@@ -3,7 +3,6 @@ $title = "Schicht Hinzufügen";
$header = "Neue Schichten erfassen";
include ("./inc/header.php");
-include ("./inc/funktion_user.php");
$Time = time()+3600+3600;
diff --git a/www-ssl/admin/tshirt.php b/www-ssl/admin/tshirt.php
index 87dc1c73..e2c95e72 100755
--- a/www-ssl/admin/tshirt.php
+++ b/www-ssl/admin/tshirt.php
@@ -4,7 +4,6 @@ $title = "T-Shirt-Ausgabe";
$header = "T-Shirt-Ausgabe f&uuml;r aktiven Engel";
include ("./inc/header.php");
include ("./inc/funktion_db_list.php");
-include ("./inc/funktion_user.php");
If (IsSet($_GET["aktiv"])) {
diff --git a/www-ssl/admin/user.php b/www-ssl/admin/user.php
index 4a58a8b5..410f0fc9 100755
--- a/www-ssl/admin/user.php
+++ b/www-ssl/admin/user.php
@@ -4,7 +4,6 @@ $title = "User-Liste";
$header = "Editieren der Engelliste";
include ("./inc/header.php");
include ("./inc/funktion_db_list.php");
-include ("./inc/funktion_user.php");
if (!IsSet($_GET["enterUID"]))
{
diff --git a/www-ssl/admin/user2.php b/www-ssl/admin/user2.php
index ce349f40..2674a7bf 100755
--- a/www-ssl/admin/user2.php
+++ b/www-ssl/admin/user2.php
@@ -5,7 +5,7 @@ $header = "Index";
include ("./inc/header.php");
include ("./inc/funktion_db_list.php");
include ("./inc/crypt.php");
-include("./inc/funktion_db.php");
+include ("./inc/funktion_db.php");
if (IsSet($_GET["action"]))
{
diff --git a/www-ssl/inc/funktion_activeUser.php b/www-ssl/inc/funktion_activeUser.php
index 5d1ae0f8..2e704079 100755
--- a/www-ssl/inc/funktion_activeUser.php
+++ b/www-ssl/inc/funktion_activeUser.php
@@ -36,12 +36,14 @@ $Tist = (gmdate("d", time()) * 60 * 60 * 24) + // Tag
for( $i=0; $i<mysql_num_rows($Erg); $i++)
{
echo "\t\t\t<li>";
+ echo DisplayAvatar( mysql_result( $Erg, $i, "UID"));
// Schow Admin Page
if( $_SESSION['CVS'][ "admin/user.php" ] == "Y" )
echo " <a href=\"./../admin/user.php?enterUID=". mysql_result( $Erg, $i, "UID"). "&Type=Normal\">".
mysql_result( $Erg, $i, "Nick"). "</a>";
else
echo mysql_result( $Erg, $i, "Nick");
+
$Tlog = (substr( mysql_result( $Erg, $i, "lastLogIn"), 8, 2) * 60 * 60 * 24) + // Tag
(substr( mysql_result( $Erg, $i, "lastLogIn"), 11, 2) * 60 * 60) + // Stunde
(substr( mysql_result( $Erg, $i, "lastLogIn"), 14, 2) * 60) + // Minute
diff --git a/www-ssl/inc/header.php b/www-ssl/inc/header.php
index 08e532b7..c6be4957 100755
--- a/www-ssl/inc/header.php
+++ b/www-ssl/inc/header.php
@@ -5,6 +5,7 @@ include ("./inc/config_db.php");
include ("./inc/funktion_lang.php");
include ("./inc/funktion_faq.php"); //für noAnswer() im menu
include ("./inc/funktion_menu.php");
+include ("./inc/funktion_user.php");
if( !isset($_SESSION))
session_start();
diff --git a/www-ssl/nonpublic/einstellungen.php b/www-ssl/nonpublic/einstellungen.php
index 5e94dbb4..fde730cc 100755
--- a/www-ssl/nonpublic/einstellungen.php
+++ b/www-ssl/nonpublic/einstellungen.php
@@ -3,7 +3,6 @@ $title = "Himmel";
$header = "Deine pers&ouml;nlichen Einstellungen";
include ("./inc/header.php");
include ("./inc/crypt.php");
-include ("./inc/funktion_user.php");
if (!IsSet($_POST["action"]))
{
diff --git a/www-ssl/nonpublic/engelbesprechung.php b/www-ssl/nonpublic/engelbesprechung.php
index 84bd92b5..45194451 100755
--- a/www-ssl/nonpublic/engelbesprechung.php
+++ b/www-ssl/nonpublic/engelbesprechung.php
@@ -2,7 +2,6 @@
$title = "Himmel";
$header = "Engelbesprechung";
include ("./inc/header.php");
-include ("./inc/funktion_user.php");
?>
<br>
diff --git a/www-ssl/nonpublic/faq.php b/www-ssl/nonpublic/faq.php
index b7d01835..9d061d5b 100755
--- a/www-ssl/nonpublic/faq.php
+++ b/www-ssl/nonpublic/faq.php
@@ -2,7 +2,6 @@
$title = "Himmel";
$header = "FAQ / Fragen an die Erzengel";
include ("./inc/header.php");
-include ("./inc/funktion_user.php");
// Erstaufruf, oder Frage bereits abgeschickt?
diff --git a/www-ssl/nonpublic/messages.php b/www-ssl/nonpublic/messages.php
index ab6e5402..2e5a6e14 100755
--- a/www-ssl/nonpublic/messages.php
+++ b/www-ssl/nonpublic/messages.php
@@ -3,7 +3,6 @@ $title = "Himmel";
$header = "";
include ("./inc/header.php");
-include ("./inc/funktion_user.php");
If( !isset($_GET["action"]) )
$_GET["action"] = "start";
diff --git a/www-ssl/nonpublic/myschichtplan.php b/www-ssl/nonpublic/myschichtplan.php
index be10951b..7e4808c4 100755
--- a/www-ssl/nonpublic/myschichtplan.php
+++ b/www-ssl/nonpublic/myschichtplan.php
@@ -3,7 +3,6 @@ $title = "Himmel";
$header = "Mein Schichtplan";
include ("./inc/header.php");
-include ("./inc/funktion_user.php");
include ("./inc/funktionen.php");
include ("./inc/funktion_schichtplan.php");
include ("./inc/funktion_schichtplan_aray.php");
diff --git a/www-ssl/nonpublic/news_comments.php b/www-ssl/nonpublic/news_comments.php
index a1019765..4c7dc24c 100755
--- a/www-ssl/nonpublic/news_comments.php
+++ b/www-ssl/nonpublic/news_comments.php
@@ -2,8 +2,6 @@
$title = "Kommentare zu den News";
$header = "Kommentar";
include ("./inc/header.php");
-include ("./inc/config_db.php");
-include ("./inc/funktion_user.php");
if( IsSet( $_GET["nid"]))
diff --git a/www-ssl/nonpublic/news_output.php b/www-ssl/nonpublic/news_output.php
index b37c9591..03ad2f27 100755
--- a/www-ssl/nonpublic/news_output.php
+++ b/www-ssl/nonpublic/news_output.php
@@ -1,7 +1,4 @@
<?php
-include ("./inc/config_db.php");
-include ("./inc/funktion_user.php");
-
if( isset( $_POST["text"]) && isset( $_POST["betreff"]) && IsSet( $_POST["date"]) )
{
diff --git a/www-ssl/nonpublic/schichtplan.php b/www-ssl/nonpublic/schichtplan.php
index e44989de..94dcb3a8 100755
--- a/www-ssl/nonpublic/schichtplan.php
+++ b/www-ssl/nonpublic/schichtplan.php
@@ -9,7 +9,6 @@ if( isset($_GET["raum"]))
$raum = $_GET["raum"];
include ("./inc/header.php");
-include ("./inc/funktion_user.php");
include ("./inc/funktionen.php");
include ("./inc/funktion_schichtplan.php");
include ("./inc/funktion_schichtplan_aray.php");
diff --git a/www-ssl/nonpublic/schichtplan_add.php b/www-ssl/nonpublic/schichtplan_add.php
index 69170763..6e226e35 100755
--- a/www-ssl/nonpublic/schichtplan_add.php
+++ b/www-ssl/nonpublic/schichtplan_add.php
@@ -2,7 +2,6 @@
$title = "Himmel";
$header = "Schichtpl&auml;ne";
include ("./inc/header.php");
-include ("./inc/funktion_user.php");
include ("./inc/funktion_schichtplan.php");
include ("./inc/funktion_schichtplan_aray.php");
include ("./inc/funktionen.php");
diff --git a/www-ssl/nonpublic/waeckliste.php b/www-ssl/nonpublic/waeckliste.php
index 15e1a4de..9071e3c0 100755
--- a/www-ssl/nonpublic/waeckliste.php
+++ b/www-ssl/nonpublic/waeckliste.php
@@ -1,6 +1,4 @@
<?php
-include ("./inc/funktion_user.php");
-
$title = "Himmel";
$header = "Weckdienst - Liste der zu weckenden Engel";
diff --git a/www-ssl/nonpublic/wecken.php b/www-ssl/nonpublic/wecken.php
index 6758da2b..3fa497b6 100755
--- a/www-ssl/nonpublic/wecken.php
+++ b/www-ssl/nonpublic/wecken.php
@@ -3,7 +3,6 @@ $title = "Himmel";
$header = "Weckdienst";
include ("./inc/header.php");
-include ("./inc/funktion_user.php");
if( isset($_POST["eintragen"]))
if( $_POST["eintragen"] == Get_Text("pub_wake_bouton") )