From 75448045cfe70054c8f4bae1bcfaf9bb0f70d330 Mon Sep 17 00:00:00 2001
From: Moritz helios Rudert
Date: Wed, 1 Jun 2011 12:13:39 +0200
Subject: fixes
---
includes/login_eingabefeld.php | 33 ++++++++++++++++-----------------
1 file changed, 16 insertions(+), 17 deletions(-)
mode change 100755 => 100644 includes/login_eingabefeld.php
(limited to 'includes/login_eingabefeld.php')
diff --git a/includes/login_eingabefeld.php b/includes/login_eingabefeld.php
old mode 100755
new mode 100644
index bed1a2fd..e68639cf
--- a/includes/login_eingabefeld.php
+++ b/includes/login_eingabefeld.php
@@ -1,18 +1,17 @@
-";
-echo "".
- "
";
-echo "";
-
+
+
--
cgit v1.2.3-70-g09d2
From 6ebee2c46ba11ce42e85b830189346b13514d497 Mon Sep 17 00:00:00 2001
From: Philip Häusler
Date: Wed, 1 Jun 2011 14:30:29 +0200
Subject: bootstrapping
---
config/.gitignore | 4 +
config/config_MessegeServer.php | 7 ++
default-conf/var_www_includes/config.php | 9 +-
default-conf/var_www_includes/config_db.php | 2 +-
includes/UserCVS.php | 5 +-
includes/config_MessegeServer.php | 7 --
includes/config_modem.php | 10 ---
includes/crypt.php | 2 +-
includes/error_handler.php | 2 +-
includes/header.php | 4 +-
includes/header_start.php | 4 +-
includes/login_eingabefeld.php | 2 +-
www-ssl/bootstrap.php | 12 +++
www-ssl/css/base.css | 3 +
www-ssl/faq.php | 34 ++++----
www-ssl/index.php | 20 +++--
www-ssl/logout.php | 19 ++--
www-ssl/makeuser.php | 10 +--
www-ssl/nonpublic/index.php | 131 +++++++++++++---------------
www-ssl/nonpublic/news.php | 14 +--
20 files changed, 159 insertions(+), 142 deletions(-)
create mode 100644 config/.gitignore
create mode 100644 config/config_MessegeServer.php
delete mode 100644 includes/config_MessegeServer.php
delete mode 100644 includes/config_modem.php
create mode 100644 www-ssl/bootstrap.php
(limited to 'includes/login_eingabefeld.php')
diff --git a/config/.gitignore b/config/.gitignore
new file mode 100644
index 00000000..9b65d8f4
--- /dev/null
+++ b/config/.gitignore
@@ -0,0 +1,4 @@
+config_db.php
+config_jabber.php
+config_modem.php
+config.php
diff --git a/config/config_MessegeServer.php b/config/config_MessegeServer.php
new file mode 100644
index 00000000..ce7c7c3a
--- /dev/null
+++ b/config/config_MessegeServer.php
@@ -0,0 +1,7 @@
+
diff --git a/default-conf/var_www_includes/config.php b/default-conf/var_www_includes/config.php
index 4c8237f1..ca0c39c9 100644
--- a/default-conf/var_www_includes/config.php
+++ b/default-conf/var_www_includes/config.php
@@ -5,6 +5,9 @@ $url = "https://SEDENGELURL";
// Startverzeichnis des Engelhome
$ENGEL_ROOT = "/";
+// Default-Theme auf der Startseite, 1=style1.css usw.
+$default_theme = 10;
+
// System disable message, ist ist set is: bages schow only this text
//$SystemDisableMessage="This system ist moved to a server in the BCC, you can in the moment only youse it in the in Engel Room
";
@@ -16,7 +19,7 @@ $LETZTES_AUSTRAGEN=3;
//Setzt den zu verwendenden Crypto algorismis
// mp5 oder crypt
-// achtung crypt schaltet password ändern ab
+// achtung crypt schaltet password �ndern ab
$crypt_system="md5";
//$crypt_system="crypt";
@@ -26,7 +29,7 @@ $arch_angels="fnord";
// timezonen offsett
$gmdateOffset=3600;
-// für Developen 1, sonst = 0
+// f�r Developen 1, sonst = 0
$debug = 0;
// SSL Cert-KEY
@@ -42,7 +45,7 @@ $Tempdir="./tmp";
// local timezone
date_default_timezone_set("Europe/Berlin");
-//Pentabarf ConferenzDI für UpdateDB
+//Pentabarf ConferenzDI f�r UpdateDB
$PentabarfXMLhost = "cccv.pentabarf.org";
$PentabarfXMLpath = "Xcal/conference/";
$PentabarfXMLEventID = "31";
diff --git a/default-conf/var_www_includes/config_db.php b/default-conf/var_www_includes/config_db.php
index d959be90..b49e5e0c 100644
--- a/default-conf/var_www_includes/config_db.php
+++ b/default-conf/var_www_includes/config_db.php
@@ -1,5 +1,5 @@
diff --git a/includes/config_modem.php b/includes/config_modem.php
deleted file mode 100644
index 2de37cb7..00000000
--- a/includes/config_modem.php
+++ /dev/null
@@ -1,10 +0,0 @@
-
diff --git a/includes/crypt.php b/includes/crypt.php
index d511e4f4..8de22030 100644
--- a/includes/crypt.php
+++ b/includes/crypt.php
@@ -1,6 +1,6 @@
\n";
-.css" />
+
+
+
\n";
- echo "" . Get_Text("index_text2") . "
\n";
- echo "" . Get_Text("index_text3") . "
\n";
+$title = "Start";
+$header = "Start";
+include "includes/header.php";
- include "../includes/login_eingabefeld.php";
+echo "" . Get_Text("index_text1") . "
\n";
+echo "" . Get_Text("index_text2") . "
\n";
+echo "" . Get_Text("index_text3") . "
\n";
- echo "" . Get_Text("index_text4") . "
";
+include "includes/login_eingabefeld.php";
- include "../includes/footer.php";
+echo "" . Get_Text("index_text4") . "
";
+
+include "includes/footer.php";
?>
diff --git a/www-ssl/logout.php b/www-ssl/logout.php
index c137f48c..12b284f9 100644
--- a/www-ssl/logout.php
+++ b/www-ssl/logout.php
@@ -1,12 +1,15 @@
diff --git a/www-ssl/makeuser.php b/www-ssl/makeuser.php
index ae205a62..785de1e8 100644
--- a/www-ssl/makeuser.php
+++ b/www-ssl/makeuser.php
@@ -3,10 +3,10 @@
$header = "";
$success = "none";
- include "../../camp2011/includes/config.php";
- include "../../camp2011/includes/header.php";
- include "../../camp2011/includes/config_db.php";
- include "../../camp2011/includes/crypt.php";
+ include "../config/config.php";
+ include "../includes/header.php";
+ include "../config/config_db.php";
+ include "../includes/crypt.php";
if(isset($_POST["send"])) {
$eNick = trim($_POST["Nick"]);
@@ -177,5 +177,5 @@
Print_Text("makeuser_text3");
}
- include "../../camp2011/includes/footer.php";
+ include "../includes/footer.php";
?>
diff --git a/www-ssl/nonpublic/index.php b/www-ssl/nonpublic/index.php
index a4b2e975..add0fdd3 100644
--- a/www-ssl/nonpublic/index.php
+++ b/www-ssl/nonpublic/index.php
@@ -1,84 +1,77 @@
1 --> keine Anmeldung
- if ($user_anz == 0)
- $ErrorText = "pub_index_User_unset";
- else
- $ErrorText = "pub_index_User_more_as_one";
- } // Ende Check, ob User angemeldet wurde
-}
-include ("../../../camp2011/includes/header.php");
-if( isset($ErrorText))
- echo "". Get_Text($ErrorText). "
\n";
-include ("../../../camp2011/includes/login_eingabefeld.php");
-include ("../../../camp2011/includes/footer.php");
+ // CVS import Data
+ $SQL = "SELECT * FROM `UserCVS` WHERE `UID`='" . $_SESSION['UID'] . "'";
+ $Erg_CVS = mysql_query($SQL, $con);
+ $_SESSION['CVS'] = mysql_fetch_array($Erg_CVS);
+ LoginOK();
+ } else { // Passwort nicht ok...
+ $ErrorText = "pub_index_pass_no_ok";
+ } // Ende Passwort-Check
+ } else { // Anzahl der User in User-Tabelle <> 1 --> keine Anmeldung
+ if ($user_anz == 0)
+ $ErrorText = "pub_index_User_unset";
+ else
+ $ErrorText = "pub_index_User_more_as_one";
+ } // Ende Check, ob User angemeldet wurde
+}
+include ("includes/header.php");
+if (isset ($ErrorText))
+ echo "" . Get_Text($ErrorText) . "
\n";
+include ("includes/login_eingabefeld.php");
+include ("includes/footer.php");
?>
diff --git a/www-ssl/nonpublic/news.php b/www-ssl/nonpublic/news.php
index 7cc9a193..16006c52 100644
--- a/www-ssl/nonpublic/news.php
+++ b/www-ssl/nonpublic/news.php
@@ -1,10 +1,12 @@
" . Get_Text(3) . "";
- include "news_output.php";
+$title = "News";
+$header = "News";
+include "includes/header.php";
- include "../../../camp2011/includes/footer.php";
+echo "" . Get_Text(3) . "";
+include "news_output.php";
+
+include "includes/footer.php";
?>
--
cgit v1.2.3-70-g09d2
From 06497b3a5387f30ea140562cc71e371b2ec1e131 Mon Sep 17 00:00:00 2001
From: Philip Häusler
Date: Thu, 2 Jun 2011 01:18:08 +0200
Subject: cleanup
---
includes/footer.php | 18 ----
includes/funktion_activeUser.php | 34 -------
includes/funktion_faq.php | 10 --
includes/funktion_flag.php | 9 --
includes/header_start.php | 40 --------
includes/login_eingabefeld.php | 17 ----
includes/pages/guest_faq.php | 9 ++
includes/secure.php | 25 -----
includes/sys_auth.php | 8 ++
www-ssl/css/style.css.old | 53 ----------
www-ssl/css/style.css.old2 | 69 -------------
www-ssl/css/style1.css.old | 79 ---------------
www-ssl/faq.php | 31 ------
www-ssl/logout.php | 15 ---
www-ssl/makeuser.php | 214 ---------------------------------------
15 files changed, 17 insertions(+), 614 deletions(-)
delete mode 100644 includes/footer.php
delete mode 100644 includes/funktion_activeUser.php
delete mode 100644 includes/funktion_faq.php
delete mode 100644 includes/funktion_flag.php
delete mode 100644 includes/header_start.php
delete mode 100644 includes/login_eingabefeld.php
delete mode 100644 includes/secure.php
delete mode 100644 www-ssl/css/style.css.old
delete mode 100644 www-ssl/css/style.css.old2
delete mode 100644 www-ssl/css/style1.css.old
delete mode 100644 www-ssl/faq.php
delete mode 100644 www-ssl/logout.php
delete mode 100644 www-ssl/makeuser.php
(limited to 'includes/login_eingabefeld.php')
diff --git a/includes/footer.php b/includes/footer.php
deleted file mode 100644
index fdf00581..00000000
--- a/includes/footer.php
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-
-
-
-