summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--includes/pages/admin_import.php19
-rw-r--r--includes/pages/user_settings.php3
-rw-r--r--public/css/style10.css4
-rw-r--r--public/css/style11.css11
-rw-r--r--public/pic/engelsystem_logo_28c3.pngbin0 -> 5659 bytes
-rw-r--r--public/pic/engelsystem_logo_cccamp2011.pngbin0 -> 8736 bytes
6 files changed, 28 insertions, 9 deletions
diff --git a/includes/pages/admin_import.php b/includes/pages/admin_import.php
index 6e6cc9e8..5ac62d2d 100644
--- a/includes/pages/admin_import.php
+++ b/includes/pages/admin_import.php
@@ -40,18 +40,25 @@ function admin_import() {
} else {
$fileOut = fopen($import_file, "w");
$head = 'GET /' . $PentabarfXMLpath . $_REQUEST["url"] . ' HTTP/1.1' . "\r\n" .
- 'Host: ' . $PentabarfXMLhost . "\r\n" .
- 'User-Agent: Engelsystem' . "\r\n" .
- 'Authorization: Basic ' .
- base64_encode($_REQUEST["user"] . ':' . $_REQUEST["password"]) . "\r\n" .
- "\r\n";
+ 'Host: ' . $PentabarfXMLhost . "\r\n" .
+ 'User-Agent: Engelsystem' . "\r\n" .
+ 'Authorization: Basic ' .
+ base64_encode($_REQUEST["user"] . ':' . $_REQUEST["password"]) . "\r\n" .
+ "\r\n";
fputs($fp, $head);
$Zeilen = -1;
+ echo "<pre>";
while (!feof($fp)) {
$Temp = fgets($fp, 1024);
+ // show header
+ if ($Zeilen == -1) {
+ echo $Temp;
+ }
+
// ende des headers
- if ($Temp == "f20\r\n") {
+ if ($Temp == "\r\n") {
+ echo "</pre>\n";
$Zeilen = 0;
$Temp = "";
}
diff --git a/includes/pages/user_settings.php b/includes/pages/user_settings.php
index 09afcd46..ce632b93 100644
--- a/includes/pages/user_settings.php
+++ b/includes/pages/user_settings.php
@@ -67,7 +67,8 @@ function user_settings() {
"8" => "Pastel Style",
"4" => "Test Style",
"9" => "Test Style 21c3",
- "10" => "msquare (28C3)"
+ "10" => "msquare (cccamp2011)",
+ "11" => "msquare (28c3)"
), $user['color']),
'text_language' => Get_Text(20),
'language_label' => Get_Text(21),
diff --git a/public/css/style10.css b/public/css/style10.css
index c223fddc..38de4a13 100644
--- a/public/css/style10.css
+++ b/public/css/style10.css
@@ -1,9 +1,9 @@
#logo {
- background: url('../pic/engelsystem_logo.png') top left no-repeat;
+ background: url('../pic/engelsystem_logo_cccamp2011.png') top left no-repeat;
display: block;
height: 69px;
margin: 10px auto;
- width: 378px;
+ width: 523px;
}
tr:hover > td {
diff --git a/public/css/style11.css b/public/css/style11.css
new file mode 100644
index 00000000..b983d632
--- /dev/null
+++ b/public/css/style11.css
@@ -0,0 +1,11 @@
+#logo {
+ background: url('../pic/engelsystem_logo_28c3.png') top left no-repeat;
+ display: block;
+ height: 69px;
+ margin: 10px auto;
+ width: 378px;
+}
+
+tr:hover > td {
+ background: #f0f0f0;
+} \ No newline at end of file
diff --git a/public/pic/engelsystem_logo_28c3.png b/public/pic/engelsystem_logo_28c3.png
new file mode 100644
index 00000000..56602083
--- /dev/null
+++ b/public/pic/engelsystem_logo_28c3.png
Binary files differ
diff --git a/public/pic/engelsystem_logo_cccamp2011.png b/public/pic/engelsystem_logo_cccamp2011.png
new file mode 100644
index 00000000..b017302e
--- /dev/null
+++ b/public/pic/engelsystem_logo_cccamp2011.png
Binary files differ