summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
Diffstat (limited to 'includes')
-rw-r--r--includes/pages/admin_import.php19
-rw-r--r--includes/pages/user_settings.php3
2 files changed, 15 insertions, 7 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),