Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 1510)
+++ branches/2.8.x/CHANGELOG	(revision 1511)
@@ -12,6 +12,10 @@
 
 =============================== FEATURES FREEZE ================================
 ----------------------------------- Fixes 2.8.2 --------------------------------
+14 Sep-2011 Build 1511 Dietmar Woellbrink (Luisehahne)
+# fixed strict notice warning in class.wb
+! change editor for intropage to editarea
+! add missing slash in themes
 14 Sep-2011 Build 1510 Werner v.d.Decken(DarkViper)
 + new constant 'DO_NOT_TRACK' set to true if a client sends the DNT-Header
 07 Sep-2011 Build 1509 Dietmar Woellbrink (Luisehahne)
Index: branches/2.8.x/wb/admin/pages/intro.php
===================================================================
--- branches/2.8.x/wb/admin/pages/intro.php	(revision 1510)
+++ branches/2.8.x/wb/admin/pages/intro.php	(revision 1511)
@@ -18,45 +18,45 @@
 
 // Create new admin object
 require('../../config.php');
+
 require_once(WB_PATH.'/framework/class.admin.php');
 $admin = new admin('Pages', 'pages_intro');
 $content = '';
+
 $filename = WB_PATH.PAGES_DIRECTORY.'/intro'.PAGE_EXTENSION;
+
 if(file_exists($filename) && filesize($filename) > 0) {
-$content = file_get_contents( $filename ) ;
+	$content = file_get_contents( $filename ) ;
+} else {
+	$content = file_get_contents( ADMIN_PATH.'/pages/html.php' ) ;
 }
 
-
-if(!isset($_GET['wysiwyg']) OR $_GET['wysiwyg'] != 'no') {
-	if (!defined('WYSIWYG_EDITOR') OR WYSIWYG_EDITOR=="none" OR !file_exists(WB_PATH.'/modules/'.WYSIWYG_EDITOR.'/include.php')) {
-		function show_wysiwyg_editor($name,$id,$content,$width,$height) {
-			echo '<textarea name="'.$name.'" id="'.$id.'" style="width: '.$width.'; height: '.$height.';">'.$content.'</textarea>';
-		}
-	} else {
-		$id_list=array('content');
-		require(WB_PATH.'/modules/'.WYSIWYG_EDITOR.'/include.php');
-	}
+require_once(WB_PATH . '/include/editarea/wb_wrapper_edit_area.php');
+$toolbar = 'search, fullscreen, |, undo, redo, |, select_font, syntax_selection,|,word_wrap, highlight, reset_highlight, |,charmap, |, help';
+echo registerEditArea ('content','php',true,'both',true,true,600,450,$toolbar);
+function show_wysiwyg_editor($name,$id,$content,$width,$height) {
+	echo '<textarea name="'.$name.'" id="'.$id.'" style="width: '.$width.'; height: '.$height.';">'.$content.'</textarea>';
 }
 ?>
-
-
 <form action="intro2.php" method="post">
 <?php print $admin->getFTAN(); ?>
 <input type="hidden" name="page_id" value="{PAGE_ID}" />
-
-<?php
-show_wysiwyg_editor('content','content',$content,'100%','500px');
-?>
-
 <table cellpadding="0" cellspacing="0" border="0" class="form_submit">
-<tr>
-	<td class="left">
-		<input type="submit" value="<?php echo $TEXT['SAVE'];?>" class="submit" />
-	</td>
-	<td class="right">
-		<input type="button" value="<?php echo $TEXT['CANCEL'];?>" onclick="javascript: window.location = 'index.php';" class="submit" />
-	</td>
-</tr>
+	<tr>
+		<td colspan="2">
+		<?php
+			show_wysiwyg_editor('content','content',$content,'100%','500px');
+		?>
+		</td>
+	</tr>
+	<tr>
+		<td class="left">
+			<input type="submit" value="<?php echo $TEXT['SAVE'];?>" class="submit" />
+		</td>
+		<td class="right">
+			<input type="button" value="<?php echo $TEXT['CANCEL'];?>" onclick="javascript: window.location = 'index.php';" class="submit" />
+		</td>
+	</tr>
 </table>
 
 </form>
@@ -63,5 +63,3 @@
 <?php
 // Print admin footer
 $admin->print_footer();
-
-?>
\ No newline at end of file
Index: branches/2.8.x/wb/admin/pages/html.php
===================================================================
--- branches/2.8.x/wb/admin/pages/html.php	(nonexistent)
+++ branches/2.8.x/wb/admin/pages/html.php	(revision 1511)
@@ -0,0 +1,40 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?php
+/**
+ *
+ * @author     WebsiteBaker Project
+ * @copyright  GNU General Public License
+ * @license    http://www.gnu.org/licenses/gpl.html
+ * @version    1.1.0
+ * @platform   Website Baker 2.8.2+
+ *
+ *
+ * This html default only loaded if intro.php is not created
+ *
+ */
+
+// TEMPLATE CODE STARTS BELOW
+?><html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<meta name="language" content="en" />
+<!-- meta information for search engines -->
+	<title></title>
+	<meta http-equiv="imagetoolbar" content="no" />
+	<meta name="description" content="" />
+	<meta name="keywords" content="" />
+	<meta name="author" content="WebsiteBaker Org e.V." />
+	<meta name="robots" content="index,follow" />
+	<meta http-equiv="Content-Encoding" content="gzip" />
+	<meta http-equiv="Accept-Encoding" content="gzip, deflate" />
+<!-- site stylesheet (site colors and layout definitions) -->
+	<link rel="stylesheet" type="text/css" href="" media="screen,projection" />
+	<script src="" type="text/javascript"></script>
+</head>
+<body>
+	<div class="content">
+		<h3>Put your content here</h3>
+	</div>
+</body>
+</html>
\ No newline at end of file

Property changes on: branches/2.8.x/wb/admin/pages/html.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Date Revision Id HeadURL
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2.8.x/wb/admin/pages/intro2.php
===================================================================
--- branches/2.8.x/wb/admin/pages/intro2.php	(revision 1510)
+++ branches/2.8.x/wb/admin/pages/intro2.php	(revision 1511)
@@ -31,10 +31,10 @@
 	header("Location: intro".PAGE_EXTENSION."");
 	exit(0);
 } else {
-	$content = $_POST['content'];
+	$content = $admin->strip_slashes($_POST['content']);
 }
 
-$content = $admin->strip_slashes($content);
+// $content = $admin->strip_slashes($content);
 
 // Include the WB functions file
 require_once(WB_PATH.'/framework/functions.php');
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php	(revision 1510)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 1511)
@@ -52,4 +52,4 @@
 
 // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
 if(!defined('VERSION')) define('VERSION', '2.8.2');
-if(!defined('REVISION')) define('REVISION', '1510');
+if(!defined('REVISION')) define('REVISION', '1511');
Index: branches/2.8.x/wb/framework/class.wb.php
===================================================================
--- branches/2.8.x/wb/framework/class.wb.php	(revision 1510)
+++ branches/2.8.x/wb/framework/class.wb.php	(revision 1511)
@@ -235,47 +235,47 @@
 
 	// Get the current users id
 	function get_user_id() {
-		return $_SESSION['USER_ID'];
+		return $this->get_session('USER_ID');
 	}
 
 	// Get the current users group id
 	function get_group_id() {
-		return $_SESSION['GROUP_ID'];
+		return $this->get_session('GROUP_ID');
 	}
 
 	// Get the current users group ids
 	function get_groups_id() {
-		return explode(",", $_SESSION['GROUPS_ID']);
+		return explode(",", $this->get_session('GROUPS_ID'));
 	}
 
 	// Get the current users group name
 	function get_group_name() {
-		return implode(",", $_SESSION['GROUP_NAME']);
+		return implode(",", $this->get_session('GROUP_NAME'));
 	}
 
 	// Get the current users group name
 	function get_groups_name() {
-		return $_SESSION['GROUP_NAME'];
+		return $this->get_session('GROUP_NAME');
 	}
 
 	// Get the current users username
 	function get_username() {
-		return $_SESSION['USERNAME'];
+		return $this->get_session('USERNAME');
 	}
 
 	// Get the current users display name
 	function get_display_name() {
-		return ($_SESSION['DISPLAY_NAME']);
+		return $this->get_session('DISPLAY_NAME');
 	}
 
 	// Get the current users email address
 	function get_email() {
-		return $_SESSION['EMAIL'];
+		return $this->get_session('EMAIL');
 	}
 
 	// Get the current users home folder
 	function get_home_folder() {
-		return $_SESSION['HOME_FOLDER'];
+		return $this->get_session('HOME_FOLDER');
 	}
 
 	// Get the current users timezone
Index: branches/2.8.x/wb/templates/wb_theme/templates/login_forgot.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/login_forgot.htt	(revision 1510)
+++ branches/2.8.x/wb/templates/wb_theme/templates/login_forgot.htt	(revision 1511)
@@ -54,7 +54,7 @@
 		<a href="{LOGIN_URL}">{TEXT_NEED_TO_LOGIN}</a>
 		<br />
 		<br />
-		<a href="{WB_URL}">{TEXT_HOME}</a>
+		<a href="{WB_URL}/">{TEXT_HOME}</a>
 	</center>
 
 	</td>
Index: branches/2.8.x/wb/templates/wb_theme/templates/login.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/login.htt	(revision 1510)
+++ branches/2.8.x/wb/templates/wb_theme/templates/login.htt	(revision 1511)
@@ -70,7 +70,7 @@
 		<br />
 		<br />
 		<br />
-		<a href="{WB_URL}">{TEXT_HOME}</a>
+		<a href="{WB_URL}/">{TEXT_HOME}</a>
 	</center>
 
 	</td>
Index: branches/2.8.x/wb/templates/argos_theme/templates/login_forgot.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/login_forgot.htt	(revision 1510)
+++ branches/2.8.x/wb/templates/argos_theme/templates/login_forgot.htt	(revision 1511)
@@ -47,7 +47,7 @@
 		<a href="{LOGIN_URL}">{TEXT_NEED_TO_LOGIN}</a>
 		<br />
 		<br />
-		<a href="{WB_URL}">{TEXT_HOME}</a>
+		<a href="{WB_URL}/">{TEXT_HOME}</a>
 	</center>
 
 	</td>
Index: branches/2.8.x/wb/templates/argos_theme/templates/login.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/login.htt	(revision 1510)
+++ branches/2.8.x/wb/templates/argos_theme/templates/login.htt	(revision 1511)
@@ -63,7 +63,7 @@
 		<br />
         <br />
         <br />
-        <a href="{WB_URL}">{TEXT_HOME}</a>
+        <a href="{WB_URL}/">{TEXT_HOME}</a>
       </center>
     </td>
   </tr>
Index: branches/2.8.x/wb/templates
===================================================================
--- branches/2.8.x/wb/templates	(revision 1510)
+++ branches/2.8.x/wb/templates	(revision 1511)

Property changes on: branches/2.8.x/wb/templates
___________________________________________________________________
Modified: svn:ignore
## -1 +1,2 ##
 classic_theme
+rounded
Index: branches/2.8.x/wb/pages
===================================================================
--- branches/2.8.x/wb/pages	(revision 1510)
+++ branches/2.8.x/wb/pages	(revision 1511)

Property changes on: branches/2.8.x/wb/pages
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,14 ##
+de
+de.php
+en
+en.php
+fr.php
+intro.php
+links
+links.php
+login.php
+nl
+nl.php
+page.php
+posts
+songlist.php
Index: branches/2.8.x/wb
===================================================================
--- branches/2.8.x/wb	(revision 1510)
+++ branches/2.8.x/wb	(revision 1511)

Property changes on: branches/2.8.x/wb
___________________________________________________________________
Modified: svn:ignore
## -1,3 +1,4 ##
 config.php
 media
 pages
+robots.txt
