From 2ca2400b779484ff025b0705ff4fb84ead7c4b20 Mon Sep 17 00:00:00 2001
From: Angelo Cuccato <cuccato@web.de>
Date: Tue, 31 Aug 2010 21:16:16 +0200
Subject: clean url handling

---
 www-ssl/logout.php                       | 2 +-
 www-ssl/nonpublic/einstellungen.php      | 8 ++++----
 www-ssl/nonpublic/index.php              | 2 +-
 www-ssl/nonpublic/myschichtplan_ical.php | 2 +-
 www-ssl/nonpublic/news_output.php        | 2 +-
 www-ssl/nonpublic/schichtplan_beamer.php | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'www-ssl')

diff --git a/www-ssl/logout.php b/www-ssl/logout.php
index 38b3b575..e038be69 100755
--- a/www-ssl/logout.php
+++ b/www-ssl/logout.php
@@ -8,6 +8,6 @@ session_destroy ();
 session_start();
 
 header("HTTP/1.1 302 Moved Temporarily");
-header("Location: ". substr($url, 0, strlen($url)-1). $ENGEL_ROOT);
+header("Location: ". $url. $ENGEL_ROOT);
 
 ?>
diff --git a/www-ssl/nonpublic/einstellungen.php b/www-ssl/nonpublic/einstellungen.php
index 191db729..aabcb830 100755
--- a/www-ssl/nonpublic/einstellungen.php
+++ b/www-ssl/nonpublic/einstellungen.php
@@ -175,12 +175,12 @@ if( $_SESSION['CVS'][ "Change T_Shirt Size" ] == "Y" )
 			echo "\t\t<tr>\n\t\t\t<td>". Get_Text(23). "<br></td>\n\t\t</tr>\n";
 			echo "\t\t<tr>\n";
 			echo "\t\t\t<td>\n";
-		    	echo "\t\t\t\t<select name=\"eAvatar\" onChange=\"document.avatar.src = '../pic/avatar/avatar' + this.value  + '.gif'\"".
-		    		"onKeyup=\"document.avatar.src = '../pic/avatar/avatar' + this.value  + '.gif'\">\n"; 
-			for ($i=1; file_exists("../pic/avatar/avatar$i.gif"); $i++ )
+		    	echo "\t\t\t\t<select name=\"eAvatar\" onChange=\"document.avatar.src = '". $url. $ENGEL_ROOT. "pic/avatar/avatar' + this.value  + '.gif'\"".
+		    		"onKeyup=\"document.avatar.src = '". $url. $ENGEL_ROOT. "pic/avatar/avatar' + this.value  + '.gif'\">\n"; 
+			for ($i=1; file_exists("". "../pic/avatar/avatar$i.gif"); $i++ )
 		    		echo "\t\t\t\t\t<option value=\"$i\"". ($_SESSION['Avatar'] == $i ? " selected":""). ">avatar$i</option>\n";
 		    	echo "\t\t\t\t</select>&nbsp;&nbsp;\n";
-			echo "\t\t\t\t<img src=\"../pic/avatar/avatar". $_SESSION['Avatar']. ".gif\" name=\"avatar\" border=\"0\" align=\"top\">\n";
+			echo "\t\t\t\t<img src=\"". $url. $ENGEL_ROOT. "pic/avatar/avatar". $_SESSION['Avatar']. ".gif\" name=\"avatar\" border=\"0\" align=\"top\">\n";
 			echo "\t\t\t</td>\n\t\t</tr>\n";
 			echo "\t</table>\n";
 			echo "\t<input type=\"submit\" value=\"". Get_Text("save"),"\">\n";
diff --git a/www-ssl/nonpublic/index.php b/www-ssl/nonpublic/index.php
index de833eb4..affb571e 100755
--- a/www-ssl/nonpublic/index.php
+++ b/www-ssl/nonpublic/index.php
@@ -11,7 +11,7 @@ function LoginOK()
 {
 	include ("../../includes/config.php");
 	header("HTTP/1.1 302 Moved Temporarily");
-	header("Location: ". substr($url, 0, strlen($url)-1). $ENGEL_ROOT. "nonpublic/news.php");
+	header("Location: ". $url. $ENGEL_ROOT. "nonpublic/news.php");
 }
 
 if ( !IsSet($_POST["user"]))
diff --git a/www-ssl/nonpublic/myschichtplan_ical.php b/www-ssl/nonpublic/myschichtplan_ical.php
index dfe06f07..9cbef3b2 100755
--- a/www-ssl/nonpublic/myschichtplan_ical.php
+++ b/www-ssl/nonpublic/myschichtplan_ical.php
@@ -35,7 +35,7 @@ for( $i=0; $i<mysql_num_rows( $erg ); $i++ )
 	echo "SUMMARY:". str_replace( ',', '\\,',mysql_result( $erg, $i, "Man" ) ). "\n";
 	echo "CLASS:PUBLIC\n";
 	echo "STATUS:CONFIRMED\n";
-	echo "URL:". $url. substr($ENGEL_ROOT,1). "nonpublic/myschichtplan.php\n";
+	echo "URL:". $url. $ENGEL_ROOT. "nonpublic/myschichtplan.php\n";
 	echo "LOCATION:". $RoomID[mysql_result( $erg, $i, "RID" )]. "\n";
 	echo "BEGIN:VALARM\n";
 	echo "TRIGGER;VALUE=DURATION:-PT5M\n";
diff --git a/www-ssl/nonpublic/news_output.php b/www-ssl/nonpublic/news_output.php
index a85c23ee..e1afc067 100755
--- a/www-ssl/nonpublic/news_output.php
+++ b/www-ssl/nonpublic/news_output.php
@@ -32,7 +32,7 @@ for ($n = 0 ; $n < $news_rows ; $n++)
   else 
 	echo "<p class='engeltreffen'>";
   
-  echo "<u>".mysql_result($Erg, $n, "Betreff")."</u>\n";
+  echo "<u>". ReplaceSmilies(mysql_result($Erg, $n, "Betreff")) ."</u>\n";
 
   // Schow Admin Page
   if( $_SESSION['CVS'][ "admin/news.php" ] == "Y" )
diff --git a/www-ssl/nonpublic/schichtplan_beamer.php b/www-ssl/nonpublic/schichtplan_beamer.php
index 25979db2..cd410fc2 100755
--- a/www-ssl/nonpublic/schichtplan_beamer.php
+++ b/www-ssl/nonpublic/schichtplan_beamer.php
@@ -12,7 +12,7 @@ $Time = time()+3600+3600;
 <HEAD>
 <TITLE>Schichtpl&auml;ne f&uuml;r Beamer</TITLE>
 <!--<link rel=stylesheet type="text/css" href="/css/style1.css">-->
-<meta http-equiv="refresh" content="30; URL=<?PHP echo substr($url, 0, strlen($url)-1). $_SERVER['PHP_SELF']?>">
+<meta http-equiv="refresh" content="30; URL=<?PHP echo $url. $_SERVER['PHP_SELF']?>">
 </HEAD>
 <BODY>
 <?PHP
-- 
cgit v1.2.3-54-g00ecf