From 07bc29128c05dc5ef24917fd953341658dbc6f87 Mon Sep 17 00:00:00 2001
From: Angelo Cuccato <cookie@cuccato.net>
Date: Fri, 23 Dec 2011 22:34:54 +0100
Subject: fix import with fsockopen

---
 includes/pages/admin_import.php | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/includes/pages/admin_import.php b/includes/pages/admin_import.php
index f8afb409..82cfbe1a 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 = "";
 							}
-- 
cgit v1.3.1


From 60a94627a72fa5b8261283cb22bfc99bb909044a Mon Sep 17 00:00:00 2001
From: root <root@dev.engelsystem.de>
Date: Sun, 25 Dec 2011 15:49:05 +0100
Subject: logo/style change

---
 includes/pages/user_settings.php | 3 ++-
 public/css/style10.css           | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/includes/pages/user_settings.php b/includes/pages/user_settings.php
index aa22b419..aed0ccb0 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 (cccamp2011)"
+				"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 {
-- 
cgit v1.3.1


From bc471460fc8cce0bb9d8b5631e8d57fdec6a3b39 Mon Sep 17 00:00:00 2001
From: root <root@dev.engelsystem.de>
Date: Sun, 25 Dec 2011 19:04:58 +0100
Subject: logo/style change

---
 public/css/style11.css                     |  11 +++++++++++
 public/pic/engelsystem_logo_28c3.png       | Bin 0 -> 5659 bytes
 public/pic/engelsystem_logo_cccamp2011.png | Bin 0 -> 8736 bytes
 3 files changed, 11 insertions(+)
 create mode 100644 public/css/style11.css
 create mode 100644 public/pic/engelsystem_logo_28c3.png
 create mode 100644 public/pic/engelsystem_logo_cccamp2011.png

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
Binary files /dev/null and b/public/pic/engelsystem_logo_28c3.png differ
diff --git a/public/pic/engelsystem_logo_cccamp2011.png b/public/pic/engelsystem_logo_cccamp2011.png
new file mode 100644
index 00000000..b017302e
Binary files /dev/null and b/public/pic/engelsystem_logo_cccamp2011.png differ
-- 
cgit v1.3.1