Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 1456)
+++ branches/2.8.x/CHANGELOG	(revision 1457)
@@ -11,6 +11,8 @@
 ! = Update/Change
 
 ------------------------------------- 2.8.2 ------------------------------------
+25 Jun-2011 Build 1457 Dietmar Woellbrink (Luisehahne)
+! Preparing 2.8.2 stable, last tests
 10 Jun-2011 Build 1456 Dietmar Woellbrink (Luisehahne)
 + add PL languages to news and captcha_control (tks to vixrealitum)
 ! update PL language for WebsiteBaker (tks to vixrealitum)
Index: branches/2.8.x/wb/media/index.php
===================================================================
--- branches/2.8.x/wb/media/index.php	(revision 1456)
+++ branches/2.8.x/wb/media/index.php	(revision 1457)
@@ -23,6 +23,4 @@
 
 */
 
-header('Location: ../');
-
-?>
\ No newline at end of file
+header('Location: ../index.php');

Property changes on: branches/2.8.x/wb/media/index.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1 +1 ##
-Id
\ No newline at end of property
+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/upgrade-script.php
===================================================================
--- branches/2.8.x/wb/upgrade-script.php	(revision 1456)
+++ branches/2.8.x/wb/upgrade-script.php	(revision 1457)
@@ -1,596 +1,609 @@
-<?php
-/**
- *
- * @category        backend
- * @package         installation
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
- * @copyright       2009-2011, Website Baker Org. e.V.
- * @link			http://www.websitebaker2.org/
- * @license         http://www.gnu.org/licenses/gpl.html
- * @platform        WebsiteBaker 2.8.x
- * @requirements    PHP 5.2.2 and higher
- * @version         $Id$
- * @filesource		$HeadURL$
- * @lastmodified    $Date$
- *
- */
-
-@require_once('config.php');
-
-// this function checks the basic configurations of an existing WB intallation
-function status_msg($message, $class='check', $element='span') {
-	// returns a status message
-	echo '<'.$element .' class="' .$class .'">' .$message .'</' .$element.'>';
-}
-
-// database tables including in WB package
-$table_list = array (
-    'settings','groups','addons','pages','sections','search','users',
-    'mod_captcha_control','mod_code','mod_droplets','mod_form_fields',
-    'mod_form_settings','mod_form_submissions','mod_jsadmin','mod_menu_link',
-    'mod_news_comments','mod_news_groups','mod_news_posts','mod_news_settings',
-    'mod_output_filter','mod_wrapper','mod_wysiwyg'
-);
-
-// analyze/check database tables
-function mysqlCheckTables( $dbName )
-{
-    global $table_list;
-    $table_prefix = TABLE_PREFIX;
-    $sql = "SHOW TABLES FROM " . $dbName;
-    $result = @mysql_query( $sql );
-    $data = array();
-    $x = 0;
-
-    while( ( $row = @mysql_fetch_array( $result, MYSQL_NUM ) ) == true )
-    {
-        $tmp = str_replace($table_prefix, '', $row[0]);
-
-        if( stristr( $row[0], $table_prefix )&& in_array($tmp,$table_list) )
-        {
-            $sql = "CHECK TABLE " . $dbName . '.' . $row[0];
-            $analyze = @mysql_query( $sql );
-            $rowFetch = @mysql_fetch_array( $analyze, MYSQL_ASSOC );
-            $data[$x]['Op'] = $rowFetch["Op"];
-            $data[$x]['Msg_type'] = $rowFetch["Msg_type"];
-            $msgColor = '<span class="error">';
-            $data[$x]['Table'] = $row[0];
-           // print  " ";
-            $msgColor = ($rowFetch["Msg_text"] == 'OK') ? '<span class="ok">' : '<span class="error">';
-            $data[$x]['Msg_text'] = $msgColor.$rowFetch["Msg_text"].'</span>';
-           // print  "<br />";
-            $x++;
-        }
-    }
-
-
-
-
-    return $data;
-}
-
-
-// check existings tables for upgrade or install
-function check_wb_tables()
-{
-    global $database,$table_list;
-
- // if prefix inludes '_' or '%'
- $search_for = addcslashes ( TABLE_PREFIX, '%_' );
- $get_result = $database->query( 'SHOW TABLES LIKE "'.$search_for.'%"');
-
-        // $get_result = $database->query( "SHOW TABLES FROM ".DB_NAME);
-        $all_tables = array();
-        if($get_result->numRows() > 0)
-        {
-            while ($data = $get_result->fetchRow())
-            {
-                $tmp = str_replace(TABLE_PREFIX, '', $data[0]);
-                if(in_array($tmp,$table_list))
-                {
-                    $all_tables[] = $tmp;
-                }
-            }
-        }
-     return $all_tables;
-}
-
-// check existing tables
-$all_tables = check_wb_tables();
-
-// only for array tests
-function show_array($array=array())
-{
-    print '<pre>';
-    print_r ($array);
-    print '</pre>';
-}
-
-require_once(WB_PATH.'/framework/functions.php');
-require_once(WB_PATH.'/framework/class.admin.php');
-$admin = new admin('Addons', 'modules', false, false);
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<title>Upgrade script</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<style type="text/css">
-html { overflow: -moz-scrollbars-vertical; /* Force firefox to always show room for a vertical scrollbar */ }
-
-body {
-	margin:0;
-	padding:0;
-	border:0;
-	background: #EBF7FC;
-	color:#000;
-	font-family: 'Trebuchet MS', Verdana, Arial, Helvetica, Sans-Serif;
-	font-size: small;
-	height:101%;
-}
-
-#container {
-	width:85%;
-	background: #A8BCCB url(templates/wb_theme/images/background.png) repeat-x;
-	border:1px solid #000;
-	color:#000;
-	margin:2em auto;
-	padding:0 15px;
-	min-height: 500px;
-	text-align:left;
-}
-
-p { line-height:1.5em; }
-
-h1,h2,h3,h4,h5,h6 {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	color: #369;
-	margin-top: 1.0em;
-	margin-bottom: 0.1em;
-}
-
-h1 { font-size:150%; }
-h2 { font-size: 130%; border-bottom: 1px #CCC solid; }
-h3 { font-size: 120%; }
-
-.ok, .error { font-weight:bold; }
-.ok { color:green; }
-.error { color:red; }
-.check { color:#555; }
-
-.warning {
-	width: 98%;
-	background:#FFDBDB;
-	padding:0.2em;
-	margin-top:0.5em;
-	border: 1px solid black;
-}
-.info {
-	width: 98%;
-	background:#99CC99;
-	padding:0.2em;
-	margin-top:0.5em;
-	border: 1px solid black;
-}
-
-</style>
-</head>
-<body>
-<div id="container">
-<img src="templates/wb_theme/images/logo.png" alt="WebsiteBaker Project" />
-<h1>WebsiteBaker Upgrade</h1>
-<?php
-	if( version_compare( WB_VERSION, '2.7.0', '<' )) {
-		status_msg('<strong>Warning:</strong><br />It is not possible to upgrade from WebsiteBaker Versions bevor 2.7.0.<br />For upgrading to version '.VERSION.' you must upgrade first to v.2.7.0 at least!!!', 'warning', 'div');
-		echo '<br /><br />';
-		echo "</div>
-		</body>
-		</html>
-		";
-		exit();
-	}
-?>
-<p>This script upgrades an existing WebsiteBaker <strong>Version <?php echo WB_VERSION; ?></strong> installation to the <strong>Version <?php echo VERSION ?></strong>. The upgrade script alters the existing WB database to reflect the changes introduced with WB 2.8.x</p>
-
-<?php
-/**
- * Check if disclaimer was accepted
- */
-if (!(isset($_POST['backup_confirmed']) && $_POST['backup_confirmed'] == 'confirmed')) { ?>
-<h2>Step 1: Backup your files</h2>
-<p>It is highly recommended to <strong>create a manual backup</strong> of the entire <strong>/pages folder</strong> and the <strong>MySQL database</strong> before proceeding.<br /><strong class="error">Note: </strong>The upgrade script alters some settings of your existing database!!! You need to confirm the disclaimer before proceeding.</p>
-
-<form name="send" action="<?php echo $_SERVER['PHP_SELF'];?>" method="post">
-<textarea cols="80" rows="5">DISCLAIMER: The WebsiteBaker upgrade script is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. One needs to confirm that a manual backup of the /pages folder (including all files and subfolders contained in it) and backup of the entire WebsiteBaker MySQL database was created before you can proceed.</textarea>
-<br /><br /><input name="backup_confirmed" type="checkbox" value="confirmed" />&nbsp;I confirm that a manual backup of the /pages folder and the MySQL database was created.
-<br /><br /><input name="send" type="submit" value="Start upgrade script" />
-</form>
-<br />
-
-<?php
-	status_msg('<strong>Notice:</strong><br />You need to confirm that you have created a manual backup of the /pages directory and the MySQL database before you can proceed.', 'warning', 'div');
-	echo '<br /><br />';
-    echo "</div>
-    </body>
-    </html>
-    ";
-	exit();
-}
-echo '<h2>Step 2: Updating database entries</h2>';
-$OK   = '<span class="ok">OK</span>';
-$FAIL = '<span class="error">FAILED</span>';
-
-// function to add a var/value-pair into settings-table
-function db_add_key_value($key, $value) {
-	global $database; global $OK; global $FAIL;
-	$table = TABLE_PREFIX.'settings';
-	$query = $database->query("SELECT value FROM $table WHERE name = '$key' LIMIT 1");
-	if($query->numRows() > 0) {
-		echo "$key: already exists. $OK.<br />";
-		return true;
-	} else {
-		$database->query("INSERT INTO $table (name,value) VALUES ('$key', '$value')");
-		echo (mysql_error()?mysql_error().'<br />':'');
-		$query = $database->query("SELECT value FROM $table WHERE name = '$key' LIMIT 1");
-		if($query->numRows() > 0) {
-			echo "$key: $OK.<br />";
-			return true;
-		} else {
-			echo "$key: $FAIL!<br />";
-			return false;
-		}
-	}
-}
-
-// function to add a new field into a table
-function db_add_field($field, $table, $desc) {
-	global $database; global $OK; global $FAIL;
-	$table = TABLE_PREFIX.$table;
-	$query = $database->query("DESCRIBE $table '$field'");
-	if($query->numRows() == 0) { // add field
-		$query = $database->query("ALTER TABLE $table ADD $field $desc");
-		echo (mysql_error()?mysql_error().'<br />':'');
-		$query = $database->query("DESCRIBE $table '$field'");
-		echo (mysql_error()?mysql_error().'<br />':'');
-		if($query->numRows() > 0) {
-			echo "'$field' added. $OK.<br />";
-		} else {
-			echo "adding '$field' $FAIL!<br />";
-		}
-	} else {
-		echo "'$field' already exists. $OK.<br />";
-	}
-}
-
-/**********************************************************
- *  - Adding field default_theme to settings table
- */
-echo "<br />Adding default_theme to settings table<br />";
-$cfg = array(
-	'default_theme' => 'wb_theme'
-);
-
-foreach($cfg as $key=>$value) {
-	db_add_key_value($key, $value);
-}
-
-/**********************************************************
- *  - install droplets
- */
-    $drops = (!in_array ( "mod_droplets", $all_tables)) ? "<br />Install droplets<br />" : "<br />Upgrade droplets<br />";
-    echo $drops;
-
-     $file_name = (!in_array ( "mod_droplets", $all_tables)) ? "install.php" : "upgrade.php";
-     require_once (WB_PATH."/modules/droplets/".$file_name);
-
-// check again all tables, to get a new array
- if(sizeof($all_tables) < 22) { $all_tables = check_wb_tables(); }
-/**********************************************************
- *  - check tables comin with WebsiteBaker
- */
-    $check_text = 'total ';
-    // $check_tables = mysqlCheckTables( DB_NAME ) ;
-
-    if(sizeof($all_tables) == 22)
-    {
-        echo '<h4>NOTICE: Your database '.DB_NAME.' has '.sizeof($all_tables).' '.$check_text.' tables from '.sizeof($table_list).' included in package '.$OK.'</h4>';
-    }
-    else
-    {
-        status_msg('<strong>WARNING:</strong><br />can\'t run Upgrade, missing tables', 'warning', 'div');
-    	echo '<h4>Missing required tables. You can install them in backend->addons->modules->advanced. Then again run upgrade-script.php</h4>';
-        $result = array_diff ( $table_list, $all_tables );
-        echo '<h4 class="warning"><br />';
-        while ( list ( $key, $val ) = each ( $result ) )
-        {
-            echo TABLE_PREFIX.$val.' '.$FAIL.'<br>';
-        }
-        echo '<br /></h4>';
-    	echo '<br /><form action="'. $_SERVER['PHP_SELF'] .'">';
-    	echo '<input type="submit" value="kick me back" style="float:left;" />';
-    	echo '</form>';
-        if(defined('ADMIN_URL'))
-        {
-        	echo '<form action="'.ADMIN_URL.'" target="_self">';
-        	echo '&nbsp;<input type="submit" value="kick me to the Backend" />';
-        	echo '</form>';
-        }
-        echo "<br /><br /></div>
-        </body>
-        </html>
-        ";
-        exit();
-    }
-
-/**********************************************************
- *  - Adding field sec_anchor to settings table
- */
-
-echo "<br />Adding sec_anchor to settings table<br />";
-$cfg = array(
-	'sec_anchor' => 'wb_'
-);
-foreach($cfg as $key=>$value) {
-	db_add_key_value($key, $value);
-}
-
-/**********************************************************
- *  - Adding redirect timer to settings table
- */
-echo "<br />Adding redirect timer to settings table<br />";
-$cfg = array(
-	'redirect_timer' => '1500'
-);
-foreach($cfg as $key=>$value) {
-	db_add_key_value($key, $value);
-}
-
-/**********************************************************
- *  - Adding mediasettings to settings table
- */
-echo "<br />Adding mediasettings to settings table<br />";
-$cfg = array(
-	'mediasettings' => ''
-);
-foreach($cfg as $key=>$value) {
-	db_add_key_value($key, $value);
-}
-
-/**********************************************************
- *  - Adding fingerprint_with_ip_octets to settings table
- */
-echo "<br />Adding fingerprint_with_ip_octets to settings table<br />";
-$cfg = array(
-	'fingerprint_with_ip_octets' => '3'
-);
-foreach($cfg as $key=>$value) {
-	db_add_key_value($key, $value);
-}
-
-/**********************************************************
- *  - Add field "redirect_type" to table "mod_menu_link"
- */
-echo "<br />Adding field redirect_type to mod_menu_link table<br />";
-db_add_field('redirect_type', 'mod_menu_link', "INT NOT NULL DEFAULT '302' AFTER `target_page_id`");
-
-
-
-if (version_compare(WB_VERSION, '2.8.0') < 0)
-{
-    /**********************************************************
-     *  - Update search no results database filed to create
-     *  valid XHTML if search is empty
-     */
-    echo "<br />Updating database field `no_results` of search table: ";
-    $search_no_results = addslashes('<tr><td><p>[TEXT_NO_RESULTS]</p></td></tr>');
-    $sql = "UPDATE `" . TABLE_PREFIX . "search` SET `value` = '$search_no_results' WHERE `name`= 'no_results'";
-    $database->query($sql);
-    echo ($database->query($sql)) ? " $OK<br />" : " $FAIL<br />";
-    /**********************************************************
-     *  - Update settings of News Modul
-     */
-
-    // These are the default setting
-    $header = '<table cellpadding=\"0\" cellspacing=\"0\" class=\"loop-header\">'."\n";
-    $post_loop = '<tr class=\"post_top\">
-<td class=\"post_title\"><a href=\"[LINK]\">[TITLE]</a></td>
-<td class=\"post_date\">[PUBLISHED_TIME], [PUBLISHED_DATE]</td>
-</tr>
-<tr>
-<td class=\"post_short\" colspan=\"2\">
-[SHORT]
-<span style=\"visibility:[SHOW_READ_MORE];\"><a href=\"[LINK]\">[TEXT_READ_MORE]</a></span>
-</td>
-</tr>';
-    $footer = '</table>
-<table cellpadding="0" cellspacing="0" class="page-header" style="display: [DISPLAY_PREVIOUS_NEXT_LINKS]">
-<tr>
-<td class="page-left">[PREVIOUS_PAGE_LINK]</td>
-<td class="page-center">[OF]</td>
-<td class="page-right">[NEXT_PAGE_LINK]</td>
-</tr>
-</table>';
-    $post_header = addslashes('<table cellpadding="0" cellspacing="0" class="post-header">
-<tr>
-<td><h1>[TITLE]</h1></td>
-<td rowspan="3" style="display: [DISPLAY_IMAGE]">[GROUP_IMAGE]</td>
-</tr>
-<tr>
-<td class="public-info"><b>[TEXT_POSTED_BY] [DISPLAY_NAME] ([USERNAME]) [TEXT_ON] [PUBLISHED_DATE]</b></td>
-</tr>
-<tr style="display: [DISPLAY_GROUP]">
-<td class="group-page"><a href="[BACK]">[PAGE_TITLE]</a> &gt;&gt; <a href="[BACK]?g=[GROUP_ID]">[GROUP_TITLE]</a></td>
-</tr>
-</table>');
-    $post_footer = '<p>[TEXT_LAST_CHANGED]: [MODI_DATE] [TEXT_AT] [MODI_TIME]</p>
-<a href=\"[BACK]\">[TEXT_BACK]</a>';
-    $comments_header = addslashes('<br /><br />
-<h2>[TEXT_COMMENTS]</h2>
-<table cellpadding="2" cellspacing="0" class="comment-header">');
-    $comments_loop = addslashes('<tr>
-<td class="comment_title">[TITLE]</td>
-<td class="comment_info">[TEXT_BY] [DISPLAY_NAME] [TEXT_ON] [DATE] [TEXT_AT] [TIME]</td>
-</tr>
-<tr>
-<td colspan="2" class="comment_text">[COMMENT]</td>
-</tr>');
-    $comments_footer = '</table>
-<br /><a href=\"[ADD_COMMENT_URL]\">[TEXT_ADD_COMMENT]</a>';
-    $comments_page = '<h1>[TEXT_COMMENT]</h1>
-<h2>[POST_TITLE]</h2>
-<br />';
-
-if(in_array('mod_news_settings', $all_tables))
-{
-   // Insert default settings into database
-   $query_dates = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_news_settings where section_id != 0 and page_id != 0");
-   if($query_dates->numRows() > 1)
-   {
-        while($result = $query_dates->fetchRow())
-        {
-
-        	echo "<br /><u>Add default settings to database for news section_id= ".$result['section_id']."</u><br />";
-        	$section_id = $result['section_id'];
-
-        	if($database->query("UPDATE `".TABLE_PREFIX."mod_news_settings` SET `header` = '$header' WHERE `section_id` = $section_id")) {
-        		echo 'Database data header added successfully';
-        	}
-        	echo mysql_error().'<br />';
-
-        	if($database->query("UPDATE `".TABLE_PREFIX."mod_news_settings` SET `post_loop` = '$post_loop' WHERE `section_id` = $section_id")) {
-        		echo 'Database data post_loop added successfully';
-        	}
-        	echo mysql_error().'<br />';
-
-        	if($database->query("UPDATE `".TABLE_PREFIX."mod_news_settings` SET `footer` = '$footer' WHERE `section_id` = $section_id")) {
-        		echo 'Database data footer added successfully';
-        	}
-        	echo mysql_error().'<br />';
-
-        	if($database->query("UPDATE `".TABLE_PREFIX."mod_news_settings` SET `post_header` = '$post_header' WHERE `section_id` = $section_id")) {
-        		echo 'Database data post_header added successfully';
-        	}
-        	echo mysql_error().'<br />';
-
-        	if($database->query("UPDATE `".TABLE_PREFIX."mod_news_settings` SET `post_footer` = '$post_footer' WHERE `section_id` = $section_id")) {
-        		echo 'Database data post_footer added successfully';
-        	}
-        	echo mysql_error().'<br />';
-
-        	if($database->query("UPDATE `".TABLE_PREFIX."mod_news_settings` SET `comments_header` = '$comments_header' WHERE `section_id` = $section_id")) {
-        		echo 'Database data comments_header added successfully';
-        	}
-        	echo mysql_error().'<br />';
-
-        	if($database->query("UPDATE `".TABLE_PREFIX."mod_news_settings` SET `comments_loop` = '$comments_loop' WHERE `section_id` = $section_id")) {
-        		echo 'Database data comments_loop added successfully';
-        	}
-        	echo mysql_error().'<br />';
-
-        	if($database->query("UPDATE `".TABLE_PREFIX."mod_news_settings` SET `comments_footer` = '$comments_footer' WHERE `section_id` = $section_id")) {
-        		echo 'Database data comments_footer added successfully';
-        	}
-        	echo mysql_error().'<br />';
-
-        	if($database->query("UPDATE `".TABLE_PREFIX."mod_news_settings` SET `comments_page` = '$comments_page' WHERE `section_id` = $section_id")) {
-        		echo 'Database data comments_page added successfully';
-        	}
-        	echo mysql_error().'<br />';
-
-        }
-     }
-   }
-}
-/**********************************************************
- * upgrade news if newer version is available
- */
-	if(file_exists(WB_PATH.'/modules/news/upgrade.php'))
-	{
-		$currNewsVersion = get_modul_version ('news', false);
-		$newNewsVersion =  get_modul_version ('news', true);
-		if((version_compare($currNewsVersion, $newNewsVersion) <= 0)) {
-			echo '<h4>Upgrade existings basically news module</h4><br />';
-			// change old postfiles to new postfiles
-			require_once(WB_PATH."/modules/news/upgrade.php");
-		}
-	}
-/**********************************************************
- *  - Set Version to new Version
- */
-echo '<br />Update database version number to '.VERSION.' : ';
-echo ($database->query("UPDATE `".TABLE_PREFIX."settings` SET `value`='".VERSION."' WHERE `name` = 'wb_version'")) ? " $OK<br />" : " $FAIL<br />";
-
-/**********************************************************
- *  - Reload all addons
- */
-
-////delete modules
-//$database->query("DELETE FROM ".TABLE_PREFIX."addons WHERE type = 'module'");
-// Load all modules
-if( ($handle = opendir(WB_PATH.'/modules/')) ) {
-	while(false !== ($file = readdir($handle))) {
-		if($file != '' AND substr($file, 0, 1) != '.' AND $file != 'admin.php' AND $file != 'index.php') {
-			load_module(WB_PATH.'/modules/'.$file);
-		}
-	}
-	closedir($handle);
-}
-echo '<br />Modules reloaded<br />';
-
-////delete templates
-//$database->query("DELETE FROM ".TABLE_PREFIX."addons WHERE type = 'template'");
-// Load all templates
-if( ($handle = opendir(WB_PATH.'/templates/')) ) {
-	while(false !== ($file = readdir($handle))) {
-		if($file != '' AND substr($file, 0, 1) != '.' AND $file != 'index.php') {
-			load_template(WB_PATH.'/templates/'.$file);
-		}
-	}
-	closedir($handle);
-}
-echo '<br />Templates reloaded<br />';
-
-////delete languages
-//$database->query("DELETE FROM ".TABLE_PREFIX."addons WHERE type = 'language'");
-// Load all languages
-if( ($handle = opendir(WB_PATH.'/languages/')) ) {
-	while(false !== ($file = readdir($handle))) {
-		if($file != '' AND substr($file, 0, 1) != '.' AND $file != 'index.php') {
-			load_language(WB_PATH.'/languages/'.$file);
-		}
-	}
-	closedir($handle);
-}
-echo '<br />Languages reloaded<br />';
-
-
-/**********************************************************
- *  - End of upgrade script
- */
-
-// require(WB_PATH.'/framework/initialize.php');
-
-if(!defined('DEFAULT_THEME')) { define('DEFAULT_THEME', 'wb_theme'); }
-if(!defined('THEME_PATH')) { define('THEME_PATH', WB_PATH.'/templates/'.DEFAULT_THEME);}
-
-echo '<p style="font-size:120%;"><strong>Congratulations: The upgrade script is finished ...</strong></p>';
-status_msg('<strong>Warning:</strong><br />Please delete the file <strong>upgrade-script.php</strong> via FTP before proceeding.', 'warning', 'div');
-// show buttons to go to the backend or frontend
-echo '<br />';
-if(defined('WB_URL')) {
-	echo '<form action="'.WB_URL.'">';
-	echo '<input type="submit" value="kick me to the Frontend" style="float:left;" />';
-	echo '</form>';
-}
-if(defined('ADMIN_URL')) {
-	echo '<form action="'.ADMIN_URL.'">';
-	echo '&nbsp;<input type="submit" value="kick me to the Backend" />';
-	echo '</form>';
-}
-echo '<p>&nbsp;</p>';
-
-?>
-</div>
-</body>
+<?php
+/**
+ *
+ * @category        backend
+ * @package         installation
+ * @author          WebsiteBaker Project
+ * @copyright       2004-2009, Ryan Djurovich
+ * @copyright       2009-2011, Website Baker Org. e.V.
+ * @link			http://www.websitebaker2.org/
+ * @license         http://www.gnu.org/licenses/gpl.html
+ * @platform        WebsiteBaker 2.8.x
+ * @requirements    PHP 5.2.2 and higher
+ * @version         $Id$
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
+ *
+ */
+
+@require_once('config.php');
+
+// this function checks the basic configurations of an existing WB intallation
+function status_msg($message, $class='check', $element='span') {
+	// returns a status message
+	echo '<'.$element .' class="' .$class .'">' .$message .'</' .$element.'>';
+}
+
+// database tables including in WB package
+$table_list = array (
+    'settings','groups','addons','pages','sections','search','users',
+    'mod_captcha_control','mod_code','mod_droplets','mod_form_fields',
+    'mod_form_settings','mod_form_submissions','mod_jsadmin','mod_menu_link',
+    'mod_news_comments','mod_news_groups','mod_news_posts','mod_news_settings',
+    'mod_output_filter','mod_wrapper','mod_wysiwyg'
+);
+
+// analyze/check database tables
+function mysqlCheckTables( $dbName )
+{
+    global $table_list;
+    $table_prefix = TABLE_PREFIX;
+    $sql = "SHOW TABLES FROM " . $dbName;
+    $result = @mysql_query( $sql );
+    $data = array();
+    $x = 0;
+
+    while( ( $row = @mysql_fetch_array( $result, MYSQL_NUM ) ) == true )
+    {
+        $tmp = str_replace($table_prefix, '', $row[0]);
+
+        if( stristr( $row[0], $table_prefix )&& in_array($tmp,$table_list) )
+        {
+            $sql = "CHECK TABLE " . $dbName . '.' . $row[0];
+            $analyze = @mysql_query( $sql );
+            $rowFetch = @mysql_fetch_array( $analyze, MYSQL_ASSOC );
+            $data[$x]['Op'] = $rowFetch["Op"];
+            $data[$x]['Msg_type'] = $rowFetch["Msg_type"];
+            $msgColor = '<span class="error">';
+            $data[$x]['Table'] = $row[0];
+           // print  " ";
+            $msgColor = ($rowFetch["Msg_text"] == 'OK') ? '<span class="ok">' : '<span class="error">';
+            $data[$x]['Msg_text'] = $msgColor.$rowFetch["Msg_text"].'</span>';
+           // print  "<br />";
+            $x++;
+        }
+    }
+
+
+
+
+    return $data;
+}
+
+
+// check existings tables for upgrade or install
+function check_wb_tables()
+{
+    global $database,$table_list;
+
+ // if prefix inludes '_' or '%'
+ $search_for = addcslashes ( TABLE_PREFIX, '%_' );
+ $get_result = $database->query( 'SHOW TABLES LIKE "'.$search_for.'%"');
+
+        // $get_result = $database->query( "SHOW TABLES FROM ".DB_NAME);
+        $all_tables = array();
+        if($get_result->numRows() > 0)
+        {
+            while ($data = $get_result->fetchRow())
+            {
+                $tmp = str_replace(TABLE_PREFIX, '', $data[0]);
+                if(in_array($tmp,$table_list))
+                {
+                    $all_tables[] = $tmp;
+                }
+            }
+        }
+     return $all_tables;
+}
+
+// check existing tables
+$all_tables = check_wb_tables();
+
+// only for array tests
+function show_array($array=array())
+{
+    print '<pre>';
+    print_r ($array);
+    print '</pre>';
+}
+
+require_once(WB_PATH.'/framework/functions.php');
+require_once(WB_PATH.'/framework/class.admin.php');
+$admin = new admin('Addons', 'modules', false, false);
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<title>Upgrade script</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<style type="text/css">
+html { overflow: -moz-scrollbars-vertical; /* Force firefox to always show room for a vertical scrollbar */ }
+
+body {
+	margin:0;
+	padding:0;
+	border:0;
+	background: #EBF7FC;
+	color:#000;
+	font-family: 'Trebuchet MS', Verdana, Arial, Helvetica, Sans-Serif;
+	font-size: small;
+	height:101%;
+}
+
+#container {
+	width:85%;
+	background: #A8BCCB url(templates/wb_theme/images/background.png) repeat-x;
+	border:1px solid #000;
+	color:#000;
+	margin:2em auto;
+	padding:0 15px;
+	min-height: 500px;
+	text-align:left;
+}
+
+p { line-height:1.5em; }
+
+h1,h2,h3,h4,h5,h6 {
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	color: #369;
+	margin-top: 1.0em;
+	margin-bottom: 0.1em;
+}
+
+h1 { font-size:150%; }
+h2 { font-size: 130%; border-bottom: 1px #CCC solid; }
+h3 { font-size: 120%; }
+
+.ok, .error { font-weight:bold; }
+.ok { color:green; }
+.error { color:red; }
+.check { color:#555; }
+
+.warning {
+	width: 98%;
+	background:#FFDBDB;
+	padding:0.2em;
+	margin-top:0.5em;
+	border: 1px solid black;
+}
+.info {
+	width: 98%;
+	background:#99CC99;
+	padding:0.2em;
+	margin-top:0.5em;
+	border: 1px solid black;
+}
+
+</style>
+</head>
+<body>
+<div id="container">
+<img src="templates/wb_theme/images/logo.png" alt="WebsiteBaker Project" />
+<h1>WebsiteBaker Upgrade</h1>
+<?php
+	if( version_compare( WB_VERSION, '2.7.0', '<' )) {
+		status_msg('<strong>Warning:</strong><br />It is not possible to upgrade from WebsiteBaker Versions bevor 2.7.0.<br />For upgrading to version '.VERSION.' you must upgrade first to v.2.7.0 at least!!!', 'warning', 'div');
+		echo '<br /><br />';
+		echo "</div>
+		</body>
+		</html>
+		";
+		exit();
+	}
+?>
+<p>This script upgrades an existing WebsiteBaker <strong>Version <?php echo WB_VERSION; ?></strong> installation to the <strong>Version <?php echo VERSION ?></strong>. The upgrade script alters the existing WB database to reflect the changes introduced with WB 2.8.x</p>
+
+<?php
+/**
+ * Check if disclaimer was accepted
+ */
+if (!(isset($_POST['backup_confirmed']) && $_POST['backup_confirmed'] == 'confirmed')) { ?>
+<h2>Step 1: Backup your files</h2>
+<p>It is highly recommended to <strong>create a manual backup</strong> of the entire <strong>/pages folder</strong> and the <strong>MySQL database</strong> before proceeding.<br /><strong class="error">Note: </strong>The upgrade script alters some settings of your existing database!!! You need to confirm the disclaimer before proceeding.</p>
+
+<form name="send" action="<?php echo $_SERVER['PHP_SELF'];?>" method="post">
+<textarea cols="80" rows="5">DISCLAIMER: The WebsiteBaker upgrade script is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. One needs to confirm that a manual backup of the /pages folder (including all files and subfolders contained in it) and backup of the entire WebsiteBaker MySQL database was created before you can proceed.</textarea>
+<br /><br /><input name="backup_confirmed" type="checkbox" value="confirmed" />&nbsp;I confirm that a manual backup of the /pages folder and the MySQL database was created.
+<br /><br /><input name="send" type="submit" value="Start upgrade script" />
+</form>
+<br />
+
+<?php
+	status_msg('<strong>Notice:</strong><br />You need to confirm that you have created a manual backup of the /pages directory and the MySQL database before you can proceed.', 'warning', 'div');
+	echo '<br /><br />';
+    echo "</div>
+    </body>
+    </html>
+    ";
+	exit();
+}
+echo '<h2>Step 2: Updating database entries</h2>';
+$OK   = '<span class="ok">OK</span>';
+$FAIL = '<span class="error">FAILED</span>';
+
+// function to add a var/value-pair into settings-table
+function db_add_key_value($key, $value) {
+	global $database; global $OK; global $FAIL;
+	$table = TABLE_PREFIX.'settings';
+	$query = $database->query("SELECT value FROM $table WHERE name = '$key' LIMIT 1");
+	if($query->numRows() > 0) {
+		echo "$key: already exists. $OK.<br />";
+		return true;
+	} else {
+		$database->query("INSERT INTO $table (name,value) VALUES ('$key', '$value')");
+		echo (mysql_error()?mysql_error().'<br />':'');
+		$query = $database->query("SELECT value FROM $table WHERE name = '$key' LIMIT 1");
+		if($query->numRows() > 0) {
+			echo "$key: $OK.<br />";
+			return true;
+		} else {
+			echo "$key: $FAIL!<br />";
+			return false;
+		}
+	}
+}
+
+// function to add a new field into a table
+function db_add_field($field, $table, $desc) {
+	global $database; global $OK; global $FAIL;
+	$table = TABLE_PREFIX.$table;
+	$query = $database->query("DESCRIBE $table '$field'");
+	if($query->numRows() == 0) { // add field
+		$query = $database->query("ALTER TABLE $table ADD $field $desc");
+		echo (mysql_error()?mysql_error().'<br />':'');
+		$query = $database->query("DESCRIBE $table '$field'");
+		echo (mysql_error()?mysql_error().'<br />':'');
+		if($query->numRows() > 0) {
+			echo "'$field' added. $OK.<br />";
+		} else {
+			echo "adding '$field' $FAIL!<br />";
+		}
+	} else {
+		echo "'$field' already exists. $OK.<br />";
+	}
+}
+
+/**********************************************************
+ *  - Adding field default_theme to settings table
+ */
+echo "<br />Adding default_theme to settings table<br />";
+$cfg = array(
+	'default_theme' => 'wb_theme'
+);
+
+foreach($cfg as $key=>$value) {
+	db_add_key_value($key, $value);
+}
+
+/**********************************************************
+ *  - install droplets
+ */
+    $drops = (!in_array ( "mod_droplets", $all_tables)) ? "<br />Install droplets<br />" : "<br />Upgrade droplets<br />";
+    echo $drops;
+
+     $file_name = (!in_array ( "mod_droplets", $all_tables)) ? "install.php" : "upgrade.php";
+     require_once (WB_PATH."/modules/droplets/".$file_name);
+
+// check again all tables, to get a new array
+ if(sizeof($all_tables) < 22) { $all_tables = check_wb_tables(); }
+/**********************************************************
+ *  - check tables comin with WebsiteBaker
+ */
+    $check_text = 'total ';
+    // $check_tables = mysqlCheckTables( DB_NAME ) ;
+
+    if(sizeof($all_tables) == 22)
+    {
+        echo '<h4>NOTICE: Your database '.DB_NAME.' has '.sizeof($all_tables).' '.$check_text.' tables from '.sizeof($table_list).' included in package '.$OK.'</h4>';
+    }
+    else
+    {
+        status_msg('<strong>WARNING:</strong><br />can\'t run Upgrade, missing tables', 'warning', 'div');
+    	echo '<h4>Missing required tables. You can install them in backend->addons->modules->advanced. Then again run upgrade-script.php</h4>';
+        $result = array_diff ( $table_list, $all_tables );
+        echo '<h4 class="warning"><br />';
+        while ( list ( $key, $val ) = each ( $result ) )
+        {
+            echo TABLE_PREFIX.$val.' '.$FAIL.'<br>';
+        }
+        echo '<br /></h4>';
+    	echo '<br /><form action="'. $_SERVER['PHP_SELF'] .'">';
+    	echo '<input type="submit" value="kick me back" style="float:left;" />';
+    	echo '</form>';
+        if(defined('ADMIN_URL'))
+        {
+        	echo '<form action="'.ADMIN_URL.'" target="_self">';
+        	echo '&nbsp;<input type="submit" value="kick me to the Backend" />';
+        	echo '</form>';
+        }
+        echo "<br /><br /></div>
+        </body>
+        </html>
+        ";
+        exit();
+    }
+
+/**********************************************************
+ *  - Adding field sec_anchor to settings table
+ */
+
+echo "<br />Adding sec_anchor to settings table<br />";
+$cfg = array(
+	'sec_anchor' => 'wb_'
+);
+foreach($cfg as $key=>$value) {
+	db_add_key_value($key, $value);
+}
+
+/**********************************************************
+ *  - Adding redirect timer to settings table
+ */
+echo "<br />Adding redirect timer to settings table<br />";
+$cfg = array(
+	'redirect_timer' => '1500'
+);
+foreach($cfg as $key=>$value) {
+	db_add_key_value($key, $value);
+}
+
+/**********************************************************
+ *  - Adding mediasettings to settings table
+ */
+echo "<br />Adding mediasettings to settings table<br />";
+$cfg = array(
+	'mediasettings' => ''
+);
+foreach($cfg as $key=>$value) {
+	db_add_key_value($key, $value);
+}
+
+/**********************************************************
+ *  - Adding fingerprint_with_ip_octets to settings table
+ */
+echo "<br />Adding fingerprint_with_ip_octets to settings table<br />";
+$cfg = array(
+	'fingerprint_with_ip_octets' => '3'
+);
+foreach($cfg as $key=>$value) {
+	db_add_key_value($key, $value);
+}
+
+/**********************************************************
+ *  - Add field "redirect_type" to table "mod_menu_link"
+ */
+echo "<br />Adding field redirect_type to mod_menu_link table<br />";
+db_add_field('redirect_type', 'mod_menu_link', "INT NOT NULL DEFAULT '302' AFTER `target_page_id`");
+
+
+
+if (version_compare(WB_VERSION, '2.8.0') < 0)
+{
+    /**********************************************************
+     *  - Update search no results database filed to create
+     *  valid XHTML if search is empty
+     */
+    echo "<br />Updating database field `no_results` of search table: ";
+    $search_no_results = addslashes('<tr><td><p>[TEXT_NO_RESULTS]</p></td></tr>');
+    $sql = "UPDATE `" . TABLE_PREFIX . "search` SET `value` = '$search_no_results' WHERE `name`= 'no_results'";
+    $database->query($sql);
+    echo ($database->query($sql)) ? " $OK<br />" : " $FAIL<br />";
+    /**********************************************************
+     *  - Update settings of News Modul
+     */
+
+    // These are the default setting
+    $header = '<table cellpadding=\"0\" cellspacing=\"0\" class=\"loop-header\">'."\n";
+    $post_loop = '<tr class=\"post_top\">
+<td class=\"post_title\"><a href=\"[LINK]\">[TITLE]</a></td>
+<td class=\"post_date\">[PUBLISHED_TIME], [PUBLISHED_DATE]</td>
+</tr>
+<tr>
+<td class=\"post_short\" colspan=\"2\">
+[SHORT]
+<span style=\"visibility:[SHOW_READ_MORE];\"><a href=\"[LINK]\">[TEXT_READ_MORE]</a></span>
+</td>
+</tr>';
+    $footer = '</table>
+<table cellpadding="0" cellspacing="0" class="page-header" style="display: [DISPLAY_PREVIOUS_NEXT_LINKS]">
+<tr>
+<td class="page-left">[PREVIOUS_PAGE_LINK]</td>
+<td class="page-center">[OF]</td>
+<td class="page-right">[NEXT_PAGE_LINK]</td>
+</tr>
+</table>';
+    $post_header = addslashes('<table cellpadding="0" cellspacing="0" class="post-header">
+<tr>
+<td><h1>[TITLE]</h1></td>
+<td rowspan="3" style="display: [DISPLAY_IMAGE]">[GROUP_IMAGE]</td>
+</tr>
+<tr>
+<td class="public-info"><b>[TEXT_POSTED_BY] [DISPLAY_NAME] ([USERNAME]) [TEXT_ON] [PUBLISHED_DATE]</b></td>
+</tr>
+<tr style="display: [DISPLAY_GROUP]">
+<td class="group-page"><a href="[BACK]">[PAGE_TITLE]</a> &gt;&gt; <a href="[BACK]?g=[GROUP_ID]">[GROUP_TITLE]</a></td>
+</tr>
+</table>');
+    $post_footer = '<p>[TEXT_LAST_CHANGED]: [MODI_DATE] [TEXT_AT] [MODI_TIME]</p>
+<a href=\"[BACK]\">[TEXT_BACK]</a>';
+    $comments_header = addslashes('<br /><br />
+<h2>[TEXT_COMMENTS]</h2>
+<table cellpadding="2" cellspacing="0" class="comment-header">');
+    $comments_loop = addslashes('<tr>
+<td class="comment_title">[TITLE]</td>
+<td class="comment_info">[TEXT_BY] [DISPLAY_NAME] [TEXT_ON] [DATE] [TEXT_AT] [TIME]</td>
+</tr>
+<tr>
+<td colspan="2" class="comment_text">[COMMENT]</td>
+</tr>');
+    $comments_footer = '</table>
+<br /><a href=\"[ADD_COMMENT_URL]\">[TEXT_ADD_COMMENT]</a>';
+    $comments_page = '<h1>[TEXT_COMMENT]</h1>
+<h2>[POST_TITLE]</h2>
+<br />';
+
+if(in_array('mod_news_settings', $all_tables))
+{
+   // Insert default settings into database
+   $query_dates = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_news_settings where section_id != 0 and page_id != 0");
+   if($query_dates->numRows() > 1)
+   {
+        while($result = $query_dates->fetchRow())
+        {
+
+        	echo "<br /><u>Add default settings to database for news section_id= ".$result['section_id']."</u><br />";
+        	$section_id = $result['section_id'];
+
+        	if($database->query("UPDATE `".TABLE_PREFIX."mod_news_settings` SET `header` = '$header' WHERE `section_id` = $section_id")) {
+        		echo 'Database data header added successfully';
+        	}
+        	echo mysql_error().'<br />';
+
+        	if($database->query("UPDATE `".TABLE_PREFIX."mod_news_settings` SET `post_loop` = '$post_loop' WHERE `section_id` = $section_id")) {
+        		echo 'Database data post_loop added successfully';
+        	}
+        	echo mysql_error().'<br />';
+
+        	if($database->query("UPDATE `".TABLE_PREFIX."mod_news_settings` SET `footer` = '$footer' WHERE `section_id` = $section_id")) {
+        		echo 'Database data footer added successfully';
+        	}
+        	echo mysql_error().'<br />';
+
+        	if($database->query("UPDATE `".TABLE_PREFIX."mod_news_settings` SET `post_header` = '$post_header' WHERE `section_id` = $section_id")) {
+        		echo 'Database data post_header added successfully';
+        	}
+        	echo mysql_error().'<br />';
+
+        	if($database->query("UPDATE `".TABLE_PREFIX."mod_news_settings` SET `post_footer` = '$post_footer' WHERE `section_id` = $section_id")) {
+        		echo 'Database data post_footer added successfully';
+        	}
+        	echo mysql_error().'<br />';
+
+        	if($database->query("UPDATE `".TABLE_PREFIX."mod_news_settings` SET `comments_header` = '$comments_header' WHERE `section_id` = $section_id")) {
+        		echo 'Database data comments_header added successfully';
+        	}
+        	echo mysql_error().'<br />';
+
+        	if($database->query("UPDATE `".TABLE_PREFIX."mod_news_settings` SET `comments_loop` = '$comments_loop' WHERE `section_id` = $section_id")) {
+        		echo 'Database data comments_loop added successfully';
+        	}
+        	echo mysql_error().'<br />';
+
+        	if($database->query("UPDATE `".TABLE_PREFIX."mod_news_settings` SET `comments_footer` = '$comments_footer' WHERE `section_id` = $section_id")) {
+        		echo 'Database data comments_footer added successfully';
+        	}
+        	echo mysql_error().'<br />';
+
+        	if($database->query("UPDATE `".TABLE_PREFIX."mod_news_settings` SET `comments_page` = '$comments_page' WHERE `section_id` = $section_id")) {
+        		echo 'Database data comments_page added successfully';
+        	}
+        	echo mysql_error().'<br />';
+
+        }
+     }
+   }
+}
+/**********************************************************
+ * upgrade media folder index protect files
+ */
+$dir = (WB_PATH.MEDIA_DIRECTORY);
+echo '<h4>Upgrade '.MEDIA_DIRECTORY.'/ index.php protect files</h4>';
+$array = rebuildFolderProtectFile($dir);
+if( sizeof( $array ) ){
+	print 'Upgrade '.MEDIA_DIRECTORY.'/ index.php protect files'." $OK<br />";
+} else {
+	print 'Upgrade '.MEDIA_DIRECTORY.'/ index.php protect files'." $FAIL!<br />";
+	print implode ('<br />',$array);
+}
+
+/**********************************************************
+ * upgrade news if newer version is available
+ */
+	if(file_exists(WB_PATH.'/modules/news/upgrade.php'))
+	{
+		$currNewsVersion = get_modul_version ('news', false);
+		$newNewsVersion =  get_modul_version ('news', true);
+		if((version_compare($currNewsVersion, $newNewsVersion) <= 0)) {
+			echo '<h4>Upgrade existings basically news module</h4><br />';
+			// change old postfiles to new postfiles
+			require_once(WB_PATH."/modules/news/upgrade.php");
+		}
+	}
+/**********************************************************
+ *  - Set Version to new Version
+ */
+echo '<br />Update database version number to '.VERSION.' : ';
+echo ($database->query("UPDATE `".TABLE_PREFIX."settings` SET `value`='".VERSION."' WHERE `name` = 'wb_version'")) ? " $OK<br />" : " $FAIL<br />";
+
+/**********************************************************
+ *  - Reload all addons
+ */
+
+////delete modules
+//$database->query("DELETE FROM ".TABLE_PREFIX."addons WHERE type = 'module'");
+// Load all modules
+if( ($handle = opendir(WB_PATH.'/modules/')) ) {
+	while(false !== ($file = readdir($handle))) {
+		if($file != '' AND substr($file, 0, 1) != '.' AND $file != 'admin.php' AND $file != 'index.php') {
+			load_module(WB_PATH.'/modules/'.$file);
+		}
+	}
+	closedir($handle);
+}
+echo '<br />Modules reloaded<br />';
+
+////delete templates
+//$database->query("DELETE FROM ".TABLE_PREFIX."addons WHERE type = 'template'");
+// Load all templates
+if( ($handle = opendir(WB_PATH.'/templates/')) ) {
+	while(false !== ($file = readdir($handle))) {
+		if($file != '' AND substr($file, 0, 1) != '.' AND $file != 'index.php') {
+			load_template(WB_PATH.'/templates/'.$file);
+		}
+	}
+	closedir($handle);
+}
+echo '<br />Templates reloaded<br />';
+
+////delete languages
+//$database->query("DELETE FROM ".TABLE_PREFIX."addons WHERE type = 'language'");
+// Load all languages
+if( ($handle = opendir(WB_PATH.'/languages/')) ) {
+	while(false !== ($file = readdir($handle))) {
+		if($file != '' AND substr($file, 0, 1) != '.' AND $file != 'index.php') {
+			load_language(WB_PATH.'/languages/'.$file);
+		}
+	}
+	closedir($handle);
+}
+echo '<br />Languages reloaded<br />';
+
+
+/**********************************************************
+ *  - End of upgrade script
+ */
+
+// require(WB_PATH.'/framework/initialize.php');
+
+if(!defined('DEFAULT_THEME')) { define('DEFAULT_THEME', 'wb_theme'); }
+if(!defined('THEME_PATH')) { define('THEME_PATH', WB_PATH.'/templates/'.DEFAULT_THEME);}
+
+echo '<p style="font-size:120%;"><strong>Congratulations: The upgrade script is finished ...</strong></p>';
+status_msg('<strong>Warning:</strong><br />Please delete the file <strong>upgrade-script.php</strong> via FTP before proceeding.', 'warning', 'div');
+// show buttons to go to the backend or frontend
+echo '<br />';
+if(defined('WB_URL')) {
+	echo '<form action="'.WB_URL.'">';
+	echo '<input type="submit" value="kick me to the Frontend" style="float:left;" />';
+	echo '</form>';
+}
+if(defined('ADMIN_URL')) {
+	echo '<form action="'.ADMIN_URL.'">';
+	echo '&nbsp;<input type="submit" value="kick me to the Backend" />';
+	echo '</form>';
+}
+echo '<p>&nbsp;</p>';
+
+?>
+</div>
+</body>
 </html>
\ No newline at end of file
Index: branches/2.8.x/wb/admin/groups/get_permissions.php
===================================================================
--- branches/2.8.x/wb/admin/groups/get_permissions.php	(revision 1456)
+++ branches/2.8.x/wb/admin/groups/get_permissions.php	(revision 1457)
@@ -11,8 +11,8 @@
  * @platform        WebsiteBaker 2.8.x
  * @requirements    PHP 5.2.2 and higher
  * @version         $Id$
- * @filesource		$HeadURL:  $
- * @lastmodified    $Date:  $
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
  *
  */
 

Property changes on: branches/2.8.x/wb/admin/groups/get_permissions.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1 +1 ##
-Id
\ No newline at end of property
+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/groups/save.php
===================================================================
--- branches/2.8.x/wb/admin/groups/save.php	(revision 1456)
+++ branches/2.8.x/wb/admin/groups/save.php	(revision 1457)
@@ -11,8 +11,8 @@
  * @platform        WebsiteBaker 2.8.x
  * @requirements    PHP 5.2.2 and higher
  * @version         $Id$
- * @filesource		$HeadURL:  $
- * @lastmodified    $Date:  $
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
  *
  */
 
@@ -19,8 +19,8 @@
 // Print admin header
 require('../../config.php');
 require_once(WB_PATH.'/framework/class.admin.php');
-$admin = new admin('Access', 'groups_modify');
-
+// suppress to print the header, so no new FTAN will be set
+$admin = new admin('Access', 'groups_modify', false);
 // Create a javascript back link
 $js_back = ADMIN_URL.'/groups/index.php';
 
@@ -27,8 +27,9 @@
 if (!$admin->checkFTAN())
 {
 	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'],$js_back);
-	exit();
 }
+// After check print the header
+$admin->print_header();
 
 // Check if group group_id is a valid number and doesnt equal 1
 if(!isset($_POST['group_id']) OR !is_numeric($_POST['group_id']) OR $_POST['group_id'] == 1) {

Property changes on: branches/2.8.x/wb/admin/groups/save.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1 +1 ##
-Id
\ No newline at end of property
+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/groups/groups.php
===================================================================
--- branches/2.8.x/wb/admin/groups/groups.php	(revision 1456)
+++ branches/2.8.x/wb/admin/groups/groups.php	(revision 1457)
@@ -47,7 +47,6 @@
 	if (!$admin->checkFTAN())
 	{
 		$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL);
-		exit();
 	}
 
 	// Print header
@@ -175,9 +174,7 @@
 	if (!$admin->checkFTAN())
 	{
 		$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL);
-		exit();
 	}
-
 	// Print header
 	$admin->print_header();
 	// Delete the group

Property changes on: branches/2.8.x/wb/admin/groups/groups.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1,4 +1 ##
-Id
-Revision
-HeadURL
-Date
\ No newline at end of property
+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/groups/index.php
===================================================================
--- branches/2.8.x/wb/admin/groups/index.php	(revision 1456)
+++ branches/2.8.x/wb/admin/groups/index.php	(revision 1457)

Property changes on: branches/2.8.x/wb/admin/groups/index.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1,4 +1 ##
-Id
-Revision
-HeadURL
-Date
\ No newline at end of property
+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/groups/add.php
===================================================================
--- branches/2.8.x/wb/admin/groups/add.php	(revision 1456)
+++ branches/2.8.x/wb/admin/groups/add.php	(revision 1457)
@@ -11,8 +11,8 @@
  * @platform        WebsiteBaker 2.8.x
  * @requirements    PHP 5.2.2 and higher
  * @version         $Id$
- * @filesource		$HeadURL:  $
- * @lastmodified    $Date:  $
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
  *
  */
 
@@ -19,16 +19,19 @@
 // Print admin header
 require('../../config.php');
 require_once(WB_PATH.'/framework/class.admin.php');
-$admin = new admin('Access', 'groups_add');
 
+// suppress to print the header, so no new FTAN will be set
+$admin = new admin('Access', 'groups_add', false);
 // Create a javascript back link
 $js_back = ADMIN_URL.'/groups/index.php';
 
 if (!$admin->checkFTAN())
 {
+	$admin->print_header();
 	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'],$js_back);
-	exit();
 }
+// After check print the header
+$admin->print_header();
 
 // Gather details entered
 $group_name = mysql_real_escape_string(strip_tags(trim($admin->get_post('group_name'))));

Property changes on: branches/2.8.x/wb/admin/groups/add.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1 +1 ##
-Id
\ No newline at end of property
+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/media/rename2.php
===================================================================
--- branches/2.8.x/wb/admin/media/rename2.php	(revision 1456)
+++ branches/2.8.x/wb/admin/media/rename2.php	(revision 1457)
@@ -21,12 +21,6 @@
 require_once(WB_PATH.'/framework/class.admin.php');
 $admin = new admin('Media', 'media_rename', false);
 
-if (!$admin->checkFTAN())
-{
-	$admin->print_error('RN5::'.$MESSAGE['GENERIC_SECURITY_ACCESS']);
-	exit();
-}
-
 // Include the WB functions file
 require_once(WB_PATH.'/framework/functions.php');
 
@@ -40,7 +34,11 @@
 $file_extensions=explode(",",$file_extension_string);
 
 // Get the current dir
-$directory = $admin->get_post('dir');
+// $directory = $admin->get_post('dir');
+
+// Target location
+$requestMethod = '_'.strtoupper($_SERVER['REQUEST_METHOD']);
+$directory = (isset(${$requestMethod}['dir'])) ? ${$requestMethod}['dir'] : '';
 if($directory == '/') {
 	$directory = '';
 }
@@ -96,7 +94,7 @@
 		}
 	}
 }
-
+$file_id = $admin->getIDKEY($file_id);
 if(!isset($rename_file)) {
 	$admin->print_error($MESSAGE['MEDIA']['FILE_NOT_FOUND'], "browse.php?dir=$directory", false);
 }
@@ -158,8 +156,11 @@
 
 // Try and rename the file/folder
 if(rename(WB_PATH.MEDIA_DIRECTORY.$directory.'/'.$rename_file, WB_PATH.MEDIA_DIRECTORY.$directory.'/'.$name)) {
+	$usedFiles = array();
+    // feature freeze
+	// require_once(ADMIN_PATH.'/media/dse.php');
+
 	$admin->print_success($MESSAGE['MEDIA']['RENAMED'], "browse.php?dir=$directory");
 } else {
 	$admin->print_error($MESSAGE['MEDIA']['CANNOT_RENAME'], "rename.php?dir=$directory&id=$file_id", false);
 }
-?>
\ No newline at end of file
Index: branches/2.8.x/wb/admin/media/dse.php
===================================================================
--- branches/2.8.x/wb/admin/media/dse.php	(nonexistent)
+++ branches/2.8.x/wb/admin/media/dse.php	(revision 1457)
@@ -0,0 +1,31 @@
+<?php
+if (!defined('WB_PATH')) die(header('Location: index.php'));
+
+/*
+$DB_HOST = DB_HOST;
+$DB_NAME = DB_NAME ;
+$DB_USER = DB_USERNAME;
+$DB_PASS = DB_PASSWORD;
+$link = mysql_connect($DB_HOST, $DB_USER, $DB_PASS);
+mysql_select_db ( $DB_NAME, $link );
+*/
+require_once(WB_PATH.'/framework/DseTwo.php');
+
+$CachePath = WB_PATH.'/temp/mediacache';
+// $ListFile = ADMIN_PATH.'/media/MediaBlackList'; // WhiteList   BlackList
+$ListFile = ADMIN_PATH.'/media/MediaWhiteList'; // WhiteList   BlackList
+
+$link = $database->db_handle;
+$Dse = new DseTwo();
+$Dse->db_handle = $link;
+$Dse->db_name = DB_NAME;
+$Dse->base_dir = WB_PATH.MEDIA_DIRECTORY;
+$Dse->table_prefix = TABLE_PREFIX;
+$Dse->cache_dir = $CachePath;
+
+$Dse->addControllList($ListFile, DseTwo::USE_WHITELIST );  // $type const USE_ALL / USE_BLACKLIST / USE_WHITELIST
+
+if(!empty($directory)) {
+	$usedFiles = $Dse->getMatchesFromDir( $directory, DseTwo::RETURN_USED);
+}
+

Property changes on: branches/2.8.x/wb/admin/media/dse.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/media/setparameter.php
===================================================================
--- branches/2.8.x/wb/admin/media/setparameter.php	(revision 1456)
+++ branches/2.8.x/wb/admin/media/setparameter.php	(revision 1457)
@@ -33,12 +33,12 @@
 
 //Save post vars to the parameters file
 if ( !is_null($admin->get_post_escaped("save"))) {
+/*
 	if (!$admin->checkFTAN())
 	{
-		$admin->print_error('SP5::'.$MESSAGE['GENERIC_SECURITY_ACCESS']);
-		exit();
+		$admin->print_error('::'.$MESSAGE['GENERIC_SECURITY_ACCESS'],'browse.php',false);
 	}
-	
+*/
 	//Check for existing settings entry, if not existing, create a record first!
 	if (!$database->query ( "SELECT * FROM ".TABLE_PREFIX."settings where `name`='mediasettings'" )) {
 		$database->query ( "INSERT INTO ".TABLE_PREFIX."settings (`name`,`value`) VALUES ('mediasettings','')" );
@@ -76,13 +76,12 @@
 	$template->set_var('DISPLAY_ADMIN', 'hide');
 }
 $template->set_var(array( 
-					'TEXT_HEADER' => $TEXT['TEXT_HEADER'],
-					'SAVE_TEXT' => $TEXT['SAVE'],
-					'BACK' => $TEXT['BACK'],
-				)
-			);
+				'TEXT_HEADER' => $TEXT['TEXT_HEADER'],
+				'SAVE_TEXT' => $TEXT['SAVE'],
+				'BACK' => $TEXT['BACK'],
+			)
+		);
 
-
 $template->set_block('main_block', 'list_block', 'list');
 $row_bg_color = '';
 $dirs = directory_list(WB_PATH.MEDIA_DIRECTORY);
@@ -104,28 +103,25 @@
 	else $row_bg_color = 'DEDEDE';
 
 	$template->set_var(array( 
-								'ADMIN_URL' => ADMIN_URL,
-								'PATH_NAME' => $relative,
-								'WIDTH' => $TEXT['WIDTH'],
-								'HEIGHT' => $TEXT['HEIGHT'],
-								'FIELD_NAME_W' => $safepath.'-w',
-								'FIELD_NAME_H' => $safepath.'-h',
-								'CUR_WIDTH' => $cur_width,
-								'CUR_HEIGHT' => $cur_height,
-								'SETTINGS' => $TEXT['SETTINGS'],
-								'ADMIN_ONLY' => $TEXT['ADMIN_ONLY'],
-								'ADMIN_ONLY_SELECTED' => $pathsettings['global']['admin_only'],
-								'NO_SHOW_THUMBS' => $TEXT['NO_SHOW_THUMBS'],
-								'NO_SHOW_THUMBS_SELECTED' => $pathsettings['global']['show_thumbs'],
-								'ROW_BG_COLOR' => $row_bg_color,
-								'FTAN' => $admin->getFTAN()
-							)
-					);
+					'ADMIN_URL' => ADMIN_URL,
+					'PATH_NAME' => $relative,
+					'WIDTH' => $TEXT['WIDTH'],
+					'HEIGHT' => $TEXT['HEIGHT'],
+					'FIELD_NAME_W' => $safepath.'-w',
+					'FIELD_NAME_H' => $safepath.'-h',
+					'CUR_WIDTH' => $cur_width,
+					'CUR_HEIGHT' => $cur_height,
+					'SETTINGS' => $TEXT['SETTINGS'],
+					'ADMIN_ONLY' => $TEXT['ADMIN_ONLY'],
+					'ADMIN_ONLY_SELECTED' => $pathsettings['global']['admin_only'],
+					'NO_SHOW_THUMBS' => $TEXT['NO_SHOW_THUMBS'],
+					'NO_SHOW_THUMBS_SELECTED' => $pathsettings['global']['show_thumbs'],
+					'ROW_BG_COLOR' => $row_bg_color,
+					'FTAN' => $admin->getFTAN()
+				)
+		);
 	$template->parse('list', 'list_block', true);
 }
 
 $template->parse('main', 'main_block', false);
 $template->pparse('output', 'page');
-
-
-?>
\ No newline at end of file
Index: branches/2.8.x/wb/admin/media/browse.php
===================================================================
--- branches/2.8.x/wb/admin/media/browse.php	(revision 1456)
+++ branches/2.8.x/wb/admin/media/browse.php	(revision 1457)
@@ -21,6 +21,9 @@
 require_once(WB_PATH.'/framework/class.admin.php');
 $admin = new admin('Media', 'media', false);
 
+$starttime = explode(" ", microtime());
+$starttime = $starttime[0]+$starttime[1];
+
 // Include the WB functions file
 require_once(WB_PATH.'/framework/functions.php');
 include ('parameters.php');
@@ -60,10 +63,25 @@
 	if (file_exists(THEME_PATH.'/images/files/'.$extension.'.png')) {
 		return $extension;
 	} else {
-		return 'unknown';
+		return 'blank_16';
 	}
 }
 
+function ShowTip($name,$detail='') {
+$parts = explode(".", $name);
+$ext = strtolower(end($parts));
+if (strpos('.gif.jpg.jpeg.png.bmp.',$ext) )
+	return 'onmouseover="overlib(\'<img src=\\\''.$name.'\\\' maxwidth=\\\'200\\\' maxheight=\\\'200\\\'>\',VAUTO, WIDTH)" onmouseout="nd()" ' ;
+else
+	return '';
+}
+
+function fsize($size) {
+   if($size == 0) return("0 Bytes");
+   $filesizename = array(" bytes", " kB", " MB", " GB", " TB");
+   return round($size/pow(1024, ($i = floor(log($size, 1024)))), 1) . $filesizename[$i];
+}
+
 // Setup template object
 $template = new Template(THEME_PATH.'/templates');
 $template->set_file('page', 'media_browse.htt');
@@ -72,7 +90,7 @@
 // Get the current dir
 $currentHome = $admin->get_home_folder();
 $directory =	(($currentHome) AND (!array_key_exists('dir',$_GET)))
-				? 
+				?
 				$currentHome
 				:
 				$admin->strip_slashes($admin->get_get('dir')) ;
@@ -113,13 +131,14 @@
 
 // Insert values
 $template->set_var(array(
-								'THEME_URL' => THEME_URL,
-								'CURRENT_DIR' => $directory,
-								'PARENT_DIR_LINK' => $parent_dir_link,
-								'DISPLAY_UP_ARROW' => $display_up_arrow,
-								'INCLUDE_PATH' => WB_URL.'/include'
-								)
-						);
+					'THEME_URL' => THEME_URL,
+					// 'THEME_URL' => '',
+					'CURRENT_DIR' => $directory,
+					'PARENT_DIR_LINK' => $parent_dir_link,
+					'DISPLAY_UP_ARROW' => $display_up_arrow,
+					'INCLUDE_PATH' => WB_URL.'/include'
+				)
+			);
 
 // Get home folder not to show
 $home_folders = get_home_folders();
@@ -126,6 +145,18 @@
 
 // Generate list
 $template->set_block('main_block', 'list_block', 'list');
+
+$usedFiles = array();
+// require_once(ADMIN_PATH.'/media/dse.php');
+// $filename =  $currentdir;
+if(!empty($currentdir)) {
+	$usedFiles = $Dse->getMatchesFromDir( $currentdir, DseTwo::RETURN_USED);
+/* */
+print '<pre><strong>function '.__FUNCTION__.'();</strong>  basename: '.basename(__FILE__).'  line: '.__LINE__.' -> <br />';
+print_r( $usedFiles ); print '</pre>'; // flush ();sleep(10); die();
+
+}
+
 if($handle = opendir(WB_PATH.MEDIA_DIRECTORY.'/'.$directory)) {
 	// Loop through the files and dirs an add to list
 	while(false !== ($file = readdir($handle))) {
@@ -148,21 +179,23 @@
 			$link_name = str_replace(' ', '%20', $name);
 			$temp_id++;
 			$template->set_var(array(
-											'NAME' => $name,
-											'NAME_SLASHED' => addslashes($name),
-											'TEMP_ID' => $admin->getIDKEY($temp_id),
-											'LINK' => "browse.php?dir=$directory/$link_name",
-											'LINK_TARGET' => '_self',
-											'ROW_BG_COLOR' => $row_bg_color,
-											'FT_ICON' => THEME_URL.'/images/folder_16.png',
-											'FILETYPE_ICON' => THEME_URL.'/images/folder_16.png',
-											'MOUSEOVER' => '',
-											'IMAGEDETAIL' => '',
-											'SIZE' => '',
-											'DATE' => '',
-											'PREVIEW' => ''
-											)
-									);
+								'NAME' => $name,
+								'NAME_SLASHED' => addslashes($name),
+								'TEMP_ID' => $admin->getIDKEY($temp_id),
+								'LINK' => "browse.php?dir=$directory/$link_name",
+								'LINK_TARGET' => '_self',
+								'ROW_BG_COLOR' => $row_bg_color,
+								'FT_ICON' => THEME_URL.'/images/folder_16.png',
+								'FILETYPE_ICON' => THEME_URL.'/images/folder_16.png',
+								'MOUSEOVER' => '',
+								'IMAGEDETAIL' => '',
+								'SIZE' => '',
+								'DATE' => '',
+								'PREVIEW' => '',
+								'IMAGE_TITLE' => $name,
+								'IMAGE_EXIST' => 'blank_16.gif'
+							)
+						);
 			$template->parse('list', 'list_block', true);
 			// Code to alternate row colors
 			if($row_bg_color == 'FFF') {
@@ -174,7 +207,7 @@
 	}
 	if(isset($FILE)) {
 		sort($FILE);
-		$filepreview = array('jpg','gif','tif','tiff','png','txt','css','js','cfg','conf');
+		$filepreview = array('jpg','gif','tif','tiff','png','txt','css','js','cfg','conf','pdf','zip','gz','doc');
 		foreach($FILE AS $name) {
 			$size = filesize('../../'.MEDIA_DIRECTORY.$directory.'/'.$name);
 			$bytes = byte_convert($size);
@@ -190,10 +223,11 @@
 			}
 			$temp_id++;
 			$imgdetail = '';
-			$icon = THEME_URL.'/images/blank.gif';
+			// $icon = THEME_URL.'/images/blank_16.gif';
+			$icon = '';
 			$tooltip = '';
-			
-			
+
+
 			if (!$pathsettings['global']['show_thumbs']) {
 				$info = getimagesize(WB_PATH.MEDIA_DIRECTORY.$directory.'/'.$name);
 				if ($info[0]) {
@@ -202,22 +236,27 @@
 					$tooltip = ShowTip('thumb.php?t=2&amp;img='.$directory.'/'.$name);
 				}
 			}
+
+			$filetype_url = THEME_URL.'/images/files/'.$filetypeicon.'.png';
 			$template->set_var(array(
-											'NAME' => $name,
-											'NAME_SLASHED' => addslashes($name),
-											'TEMP_ID' => $admin->getIDKEY($temp_id),
-											'LINK' => WB_URL.MEDIA_DIRECTORY.$directory.'/'.$name,
-											'LINK_TARGET' => '_blank',
-											'ROW_BG_COLOR' => $row_bg_color,
-											'FT_ICON' => $icon,
-											'FILETYPE_ICON' => THEME_URL.'/images/files/'.$filetypeicon.'.png',
-											'MOUSEOVER' => $tooltip, 
-											'IMAGEDETAIL' => $imgdetail,
-											'SIZE' => $bytes,
-											'DATE' => $date,
-											'PREVIEW' => $preview
-											)
-									);
+								'NAME' => $name,
+								'NAME_SLASHED' => addslashes($name),
+								'TEMP_ID' => $admin->getIDKEY($temp_id),
+								'LINK' => WB_URL.MEDIA_DIRECTORY.$directory.'/'.$name,
+								'LINK_TARGET' => '_blank',
+								'ROW_BG_COLOR' => $row_bg_color,
+								'FT_ICON' => empty($icon) ? $filetype_url : $icon,
+								'FILETYPE_ICON' => $filetype_url,
+								'MOUSEOVER' => $tooltip,
+								'IMAGEDETAIL' => $imgdetail,
+								'SIZE' => $bytes,
+								'DATE' => $date,
+								'PREVIEW' => $preview,
+								'IMAGE_TITLE' => $name,
+								// 'IMAGE_EXIST' =>  search_image($directory.'/',$name)
+								'IMAGE_EXIST' =>  (in_array($name, $usedFiles) ? 'view_16.png' : 'pic_16.png')
+							)
+						);
 			$template->parse('list', 'list_block', true);
 			// Code to alternate row colors
 			if($row_bg_color == 'FFF') {
@@ -246,38 +285,34 @@
 
 // Insert language text and messages
 $template->set_var(array(
-								'MEDIA_DIRECTORY' => MEDIA_DIRECTORY,
-								'TEXT_CURRENT_FOLDER' => $TEXT['CURRENT_FOLDER'],
-								'TEXT_RELOAD' => $TEXT['RELOAD'],
-								'TEXT_RENAME' => $TEXT['RENAME'],
-								'TEXT_DELETE' => $TEXT['DELETE'],
-								'TEXT_SIZE' => $TEXT['SIZE'],
-								'TEXT_DATE' => $TEXT['DATE'],
-								'TEXT_NAME' => $TEXT['NAME'],
-								'TEXT_TYPE' => $TEXT['TYPE'],
-								'TEXT_UP' => $TEXT['UP'],
-								'NONE_FOUND' => $MESSAGE['MEDIA']['NONE_FOUND'],
-								'CHANGE_SETTINGS' => $TEXT['MODIFY_SETTINGS'],
-								'CONFIRM_DELETE' => $MESSAGE['MEDIA']['CONFIRM_DELETE']
-								)
-						);
+					'MEDIA_DIRECTORY' => MEDIA_DIRECTORY,
+					'TEXT_CURRENT_FOLDER' => $TEXT['CURRENT_FOLDER'],
+					'TEXT_RELOAD' => $TEXT['RELOAD'],
+					'TEXT_RENAME' => $TEXT['RENAME'],
+					'TEXT_DELETE' => $TEXT['DELETE'],
+					'TEXT_SIZE' => $TEXT['SIZE'],
+					'TEXT_DATE' => $TEXT['DATE'],
+					'TEXT_NAME' => $TEXT['NAME'],
+					'TEXT_TYPE' => $TEXT['TYPE'],
+					'TEXT_UP' => $TEXT['UP'],
+					'NONE_FOUND' => $MESSAGE['MEDIA']['NONE_FOUND'],
+					'CHANGE_SETTINGS' => $TEXT['MODIFY_SETTINGS'],
+					'CONFIRM_DELETE' => $MESSAGE['MEDIA']['CONFIRM_DELETE']
+				)
+			);
 
 // Parse template object
 $template->parse('main', 'main_block', false);
 $template->pparse('output', 'page');
-
-function ShowTip($name,$detail='') {
-$parts = explode(".", $name);
-$ext = strtolower(end($parts));
-if (strpos('.gif.jpg.jpeg.png.bmp.',$ext) )
-	return 'onmouseover="overlib(\'<img src=\\\''.$name.'\\\' maxwidth=\\\'200\\\' maxheight=\\\'200\\\'>\',VAUTO, WIDTH)" onmouseout="nd()" ' ;
-else
-	return '';
-}
-
-function fsize($size) {
-   if($size == 0) return("0 Bytes");
-   $filesizename = array(" bytes", " kB", " MB", " GB", " TB");
-   return round($size/pow(1024, ($i = floor(log($size, 1024)))), 1) . $filesizename[$i];
-}
-?>
\ No newline at end of file
+/*
+$endtime=explode(" ", microtime());
+$endtime=$endtime[0]+$endtime[1];
+$debugVMsg = '';
+if($admin->ami_group_member('1') ) {
+	$debugVMsg  = "<p>Mask loaded in ".round($endtime - $starttime,6)." Sec,&nbsp;&nbsp;";
+	$debugVMsg .= "Memory in use ".number_format(memory_get_usage(true), 0, ',', '.')."&nbsp;Byte,&nbsp;&nbsp;";
+	$debugVMsg .= sizeof(get_included_files())."&nbsp;included files</p>";
+	// $debugVMsg = print_message($debugVMsg,'#','debug',-1,false);
+	print $debugVMsg.'<br />';
+ }
+*/ 
\ No newline at end of file
Index: branches/2.8.x/wb/admin/media/delete.php
===================================================================
--- branches/2.8.x/wb/admin/media/delete.php	(revision 1456)
+++ branches/2.8.x/wb/admin/media/delete.php	(revision 1457)
@@ -44,7 +44,17 @@
 
 // Get home folder not to show
 $home_folders = get_home_folders();
+$usedFiles = array();
+// feature freeze
+// require_once(ADMIN_PATH.'/media/dse.php');
+/*
 
+if(!empty($currentdir)) {
+	$usedFiles = $Dse->getMatchesFromDir( $directory, DseTwo::RETURN_USED);
+}
+print '<pre><strong>function '.__FUNCTION__.'();</strong>  basename: '.basename(__FILE__).'  line: '.__LINE__.' -> <br />';
+print_r( $usedFiles ); print '</pre>'; // flush ();sleep(10); die();
+*/
 // Figure out what folder name the temp id is
 if($handle = opendir(WB_PATH.MEDIA_DIRECTORY.'/'.$directory)) {
 	// Loop through the files and dirs an add to list
Index: branches/2.8.x/wb/admin/media/MediaBlackList
===================================================================
--- branches/2.8.x/wb/admin/media/MediaBlackList	(nonexistent)
+++ branches/2.8.x/wb/admin/media/MediaBlackList	(revision 1457)
@@ -0,0 +1,29 @@
+addons
+groups
+mod_addon_file_editor
+mod_bookmarks_groups
+mod_bookmarks_links
+mod_bookmarks_settings
+mod_captcha_control
+mod_download_gallery_file_ext
+mod_download_gallery_settings
+mod_droplets
+mod_form_fields
+mod_form_settings
+mod_jsadmin
+mod_menu_link
+mod_mpform_fields
+od_mpform_settings
+mod_news_settings
+mod_output_filter
+mod_section_pick
+mod_topics_settings
+mod_addons
+mod_wbanner_groups
+mod_wbanner_stats
+mod_wrapper
+pages
+search
+sections
+settings
+users
Index: branches/2.8.x/wb/admin/media/create.php
===================================================================
--- branches/2.8.x/wb/admin/media/create.php	(revision 1456)
+++ branches/2.8.x/wb/admin/media/create.php	(revision 1457)
@@ -17,29 +17,33 @@
  */
 
 // Get dir name and target location
-if(!isset($_POST['name']) OR $_POST['name'] == '') {
+$requestMethod = '_'.strtoupper($_SERVER['REQUEST_METHOD']);
+$name = (isset(${$requestMethod}['name'])) ? ${$requestMethod}['name'] : '';
+if($name == '') {
 	header("Location: index.php");
 	exit(0);
-} else {
-	$name = $_POST['name'];
 }
-if(!isset($_POST['target']) OR $_POST['target'] == '') {
+
+// Target location
+$requestMethod = '_'.strtoupper($_SERVER['REQUEST_METHOD']);
+$target = (isset(${$requestMethod}['target'])) ? ${$requestMethod}['target'] : '';
+if($target == '') {
 	header("Location: index.php");
 	exit(0);
-} else {
-	$target = $_POST['target'];
 }
 
 // Print admin header
 require('../../config.php');
 require_once(WB_PATH.'/framework/class.admin.php');
-$admin = new admin('Media', 'media_create');
-
+// suppress to print the header, so no new FTAN will be set
+$admin = new admin('Media', 'media_create', false);
 if (!$admin->checkFTAN())
 {
-	$admin->print_error('CR5::'.$MESSAGE['GENERIC_SECURITY_ACCESS']);
-	exit();
+	$admin->print_header();
+	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']);
 }
+// After check print the header
+$admin->print_header();
 
 // Include the WB functions file
 require_once(WB_PATH.'/framework/functions.php');
@@ -57,32 +61,24 @@
 $name = media_filename($name);
   
 // Create relative path of the new dir name
-$relative = WB_PATH.$target.'/'.$name;
+$directory = WB_PATH.$target.'/'.$name;
 
+/*
 // Check to see if the folder already exists
 if(file_exists($relative)) {
 	$admin->print_error($MESSAGE['MEDIA']['DIR_EXISTS']);
 }
+*/
 
-// Try and make the dir
-if(make_dir($relative)) {
-	// Create index.php file
-	$content = ''.
-"<?php
-
-header('Location: ../');
-
-?>";
-	$handle = fopen($relative.'/index.php', 'w');
-	fwrite($handle, $content);
-	fclose($handle);
-	change_mode($relative.'/index.php', 'file');
+if ( sizeof(createFolderProtectFile( $directory )) )
+{
+	$admin->print_error($MESSAGE['MEDIA']['DIR_NOT_MADE']);
+} else {
+	$usedFiles = array();
+    // feature freeze
+	// require_once(ADMIN_PATH.'/media/dse.php');
 	$admin->print_success($MESSAGE['MEDIA']['DIR_MADE']);
-} else {
-	$admin->print_error($MESSAGE['MEDIA']['DIR_NOT_MADE']);
 }
 
-// Print admin 
+// Print admin
 $admin->print_footer();
-
-?>
\ No newline at end of file
Index: branches/2.8.x/wb/admin/media/parameters.php
===================================================================
--- branches/2.8.x/wb/admin/media/parameters.php	(revision 1456)
+++ branches/2.8.x/wb/admin/media/parameters.php	(revision 1457)
@@ -29,4 +29,3 @@
 	$database->query ( "INSERT INTO ".TABLE_PREFIX."settings (`name`,`value`) VALUES ('mediasettings','')" );
 }
 
-?>
\ No newline at end of file
Index: branches/2.8.x/wb/admin/media/upload.php
===================================================================
--- branches/2.8.x/wb/admin/media/upload.php	(revision 1456)
+++ branches/2.8.x/wb/admin/media/upload.php	(revision 1457)
@@ -16,14 +16,6 @@
  *
  */
 
-// Target location
-if(!isset($_POST['target']) OR $_POST['target'] == '') {
-	header("Location: index.php");
-	exit(0);
-} else {
-	$target = $_POST['target'];
-}
-
 // Print admin header
 require('../../config.php');
 include_once('resize_img.php');
@@ -31,14 +23,21 @@
 
 require_once(WB_PATH.'/framework/class.admin.php');
 require_once(WB_PATH.'/include/pclzip/pclzip.lib.php');	// Required to unzip file.
-$admin = new admin('Media', 'media_upload');
+// suppress to print the header, so no new FTAN will be set
+$admin = new admin('Media', 'media_upload', false);
 
-if (!$admin->checkFTAN())
+if( !$admin->checkFTAN() )
 {
-	$admin->print_error('UP5::'.$MESSAGE['GENERIC_SECURITY_ACCESS']);
-	exit();
+	$admin->print_header();
+	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'] );
 }
+// After check print the header
+$admin->print_header();
 
+// Target location
+$requestMethod = '_'.strtoupper($_SERVER['REQUEST_METHOD']);
+$target = (isset(${$requestMethod}['target'])) ? ${$requestMethod}['target'] : '';
+
 // Include the WB functions file
 require_once(WB_PATH.'/framework/functions.php');
 
@@ -45,7 +44,7 @@
 // Check to see if target contains ../
 if (!check_media_path($target, false))
 {
-	$admin->print_error('TD5::'.$MESSAGE['MEDIA']['TARGET_DOT_DOT_SLASH']);
+	$admin->print_error($MESSAGE['MEDIA']['TARGET_DOT_DOT_SLASH'] );
 }
 
 // Create relative path of the target location for the file
@@ -68,7 +67,6 @@
 }
 $file_extensions=explode(",",$file_extension_string);
 
-
 // Loop through the files
 $good_uploads = 0;
 for($count = 1; $count <= 10; $count++) {
@@ -139,15 +137,13 @@
 }
 
 if($good_uploads == 1) {
-	$admin->print_success($good_uploads.' '.$MESSAGE['MEDIA']['SINGLE_UPLOADED']);
+	$admin->print_success($good_uploads.' '.$MESSAGE['MEDIA']['SINGLE_UPLOADED'] );
 	if (isset($_POST['delzip'])) {
 		unlink($filename1);
 	}
 } else {
-	$admin->print_success($good_uploads.' '.$MESSAGE['MEDIA']['UPLOADED']);
+	$admin->print_success($good_uploads.' '.$MESSAGE['MEDIA']['UPLOADED'] );
 }
 
 // Print admin 
 $admin->print_footer();
-
-?>
\ No newline at end of file
Index: branches/2.8.x/wb/admin/media/MediaWhiteList
===================================================================
--- branches/2.8.x/wb/admin/media/MediaWhiteList	(nonexistent)
+++ branches/2.8.x/wb/admin/media/MediaWhiteList	(revision 1457)
@@ -0,0 +1,33 @@
+mod_addon_file_editor
+mod_bookmarks_groups
+mod_bookmarks_links
+mod_bookmarks_settings
+mod_brax_highslide_images
+mod_brax_highslide_settings
+mod_capslider_groups
+mod_capslider_slide
+mod_captcha_control
+mod_code
+mod_color4code
+mod_download_gallery_files
+mod_download_gallery_settings
+mod_droplets
+mod_form_fields
+mod_form_settings
+mod_form_submissions
+mod_mpform_settings
+mod_mpform_submissions
+mod_news_comments
+mod_news_groups
+mod_news_posts
+mod_news_settings
+mod_output_filter
+mod_section_pick
+mod_topics
+mod_topics_comments
+mod_topics_settings
+mod_addons
+mod_wbanner_banner
+mod_wrapper
+mod_wysiwyg
+mod_wysiwyg_hist
Index: branches/2.8.x/wb/admin/media/index.php
===================================================================
--- branches/2.8.x/wb/admin/media/index.php	(revision 1456)
+++ branches/2.8.x/wb/admin/media/index.php	(revision 1457)
@@ -20,6 +20,9 @@
 require('../../config.php');
 require_once(WB_PATH.'/framework/class.admin.php');
 $admin = new admin('Media', 'media');
+
+$starttime = explode(" ", microtime());
+$starttime = $starttime[0]+$starttime[1];
 include ('parameters.php');
 
 // Setup template object
@@ -73,44 +76,55 @@
 
 // Insert language headings
 $template->set_var(array(
-								'HEADING_BROWSE_MEDIA' => $HEADING['BROWSE_MEDIA'],
-								'HOME_DIRECTORY' => $currentHome,
-								'DISPLAY_UP_ARROW' => $display_up_arrow, // **!
-								'HEADING_CREATE_FOLDER' => $HEADING['CREATE_FOLDER'],
-								'HEADING_UPLOAD_FILES' => $HEADING['UPLOAD_FILES']
-								)
-						);
+					'HEADING_BROWSE_MEDIA' => $HEADING['BROWSE_MEDIA'],
+					'HOME_DIRECTORY' => $currentHome,
+					'DISPLAY_UP_ARROW' => $display_up_arrow, // **!
+					'HEADING_CREATE_FOLDER' => $HEADING['CREATE_FOLDER'],
+					'HEADING_UPLOAD_FILES' => $HEADING['UPLOAD_FILES']
+				)
+			);
 // insert urls
 $template->set_var(array(
-								'ADMIN_URL' => ADMIN_URL,
-								'WB_URL' => WB_URL,
-								'WB_PATH' => WB_PATH,
-								'THEME_URL' => THEME_URL
-								)
-						);
+					'ADMIN_URL' => ADMIN_URL,
+					'WB_URL' => WB_URL,
+					'WB_PATH' => WB_PATH,
+					'THEME_URL' => THEME_URL
+				)
+			);
 // Insert language text and messages
 $template->set_var(array(
-								'MEDIA_DIRECTORY' => MEDIA_DIRECTORY,
-								'TEXT_NAME' => $TEXT['TITLE'],
-								'TEXT_RELOAD' => $TEXT['RELOAD'],
-								'TEXT_TARGET_FOLDER' => $TEXT['TARGET_FOLDER'],
-								'TEXT_OVERWRITE_EXISTING' => $TEXT['OVERWRITE_EXISTING'],
-								'TEXT_FILES' => $TEXT['FILES'],
-								'TEXT_CREATE_FOLDER' => $TEXT['CREATE_FOLDER'],
-								'TEXT_UPLOAD_FILES' => $TEXT['UPLOAD_FILES'],
-								'CHANGE_SETTINGS' => $TEXT['MODIFY_SETTINGS'],
-								'OPTIONS' => $TEXT['OPTION'],
-								'TEXT_UNZIP_FILE' => $TEXT['UNZIP_FILE'],
-								'TEXT_DELETE_ZIP' => $TEXT['DELETE_ZIP'],
-								'FTAN' => $admin->getFTAN()
-								)
-						);
+					'MEDIA_DIRECTORY' => MEDIA_DIRECTORY,
+					'TEXT_NAME' => $TEXT['TITLE'],
+					'TEXT_RELOAD' => $TEXT['RELOAD'],
+					'TEXT_TARGET_FOLDER' => $TEXT['TARGET_FOLDER'],
+					'TEXT_OVERWRITE_EXISTING' => $TEXT['OVERWRITE_EXISTING'],
+					'TEXT_FILES' => $TEXT['FILES'],
+					'TEXT_CREATE_FOLDER' => $TEXT['CREATE_FOLDER'],
+					'TEXT_UPLOAD_FILES' => $TEXT['UPLOAD_FILES'],
+					'CHANGE_SETTINGS' => $TEXT['MODIFY_SETTINGS'],
+					'OPTIONS' => $TEXT['OPTION'],
+					'TEXT_UNZIP_FILE' => $TEXT['UNZIP_FILE'],
+					'TEXT_DELETE_ZIP' => $TEXT['DELETE_ZIP'],
+					'FTAN' => $admin->getFTAN()
+				)
+			);
 
 // Parse template object
 $template->parse('main', 'main_block', false);
 $template->pparse('output', 'page');
 
-// Print admin 
+$endtime=explode(" ", microtime());
+$endtime=$endtime[0]+$endtime[1];
+$debugVMsg = '';
+if($admin->ami_group_member('1') ) {
+	$debugVMsg  = "<p>Mask loaded in ".round($endtime - $starttime,6)." Sec,&nbsp;&nbsp;";
+	$debugVMsg .= "Memory in use ".number_format(memory_get_usage(true), 0, ',', '.')."&nbsp;Byte,&nbsp;&nbsp;";
+	$debugVMsg .= sizeof(get_included_files())."&nbsp;included files</p>";
+	// $debugVMsg = print_message($debugVMsg,'#','debug',-1,false);
+	print $debugVMsg.'<br />';
+ }
+
+// Print admin
 $admin->print_footer();
 
 ?>
\ No newline at end of file
Index: branches/2.8.x/wb/admin/media/rename.php
===================================================================
--- branches/2.8.x/wb/admin/media/rename.php	(revision 1456)
+++ branches/2.8.x/wb/admin/media/rename.php	(revision 1457)
@@ -32,7 +32,7 @@
 
 // Check to see if it contains ..
 if (!check_media_path($directory)) {
-	$admin->print_error($MESSAGE['MEDIA']['DIR_DOT_DOT_SLASH'], WB_URL, false);
+	$admin->print_error($MESSAGE['MEDIA']['DIR_DOT_DOT_SLASH'], "browse.php?dir=$directory", false);
 }
 
 // Get the temp id
@@ -105,29 +105,27 @@
 }
 
 $template->set_var(array(
-								'THEME_URL' => THEME_URL,
-								'FILENAME' => $rename_file,
-								'DIR' => $directory,
-								'FILE_ID' => $admin->getIDKEY($file_id),
-								'TYPE' => $type,
-								'EXTENSION' => $extension,
-								'FTAN' => $admin->getFTAN()
-								)
-						);
+					'THEME_URL' => THEME_URL,
+					'FILENAME' => $rename_file,
+					'DIR' => $directory,
+					'FILE_ID' => $admin->getIDKEY($file_id),
+					'TYPE' => $type,
+					'EXTENSION' => $extension,
+					'FTAN' => $admin->getFTAN()
+				)
+			);
 
 
 // Insert language text and messages
 $template->set_var(array(
-								'TEXT_TO' => $TEXT['TO'],
-								'TEXT_RENAME' => $TEXT['RENAME'],
-								'TEXT_CANCEL' => $TEXT['CANCEL'],
-								'TEXT_UP' => $TEXT['UP'],
-								'TEXT_OVERWRITE_EXISTING' => $TEXT['OVERWRITE_EXISTING']
-								)
-						);
+					'TEXT_TO' => $TEXT['TO'],
+					'TEXT_RENAME' => $TEXT['RENAME'],
+					'TEXT_CANCEL' => $TEXT['CANCEL'],
+					'TEXT_UP' => $TEXT['UP'],
+					'TEXT_OVERWRITE_EXISTING' => $TEXT['OVERWRITE_EXISTING']
+				)
+			);
 
 // Parse template object
 $template->parse('main', 'main_block', false);
 $template->pparse('output', 'page');
-
-?>
\ No newline at end of file
Index: branches/2.8.x/wb/admin/start/index.php
===================================================================
--- branches/2.8.x/wb/admin/start/index.php	(revision 1456)
+++ branches/2.8.x/wb/admin/start/index.php	(revision 1457)
@@ -27,15 +27,15 @@
 
 // Insert values into the template object
 $template->set_var(array(
-								'WELCOME_MESSAGE' => $MESSAGE['START']['WELCOME_MESSAGE'],
-								'CURRENT_USER' => $MESSAGE['START']['CURRENT_USER'],
-								'DISPLAY_NAME' => $admin->get_display_name(),
-								'ADMIN_URL' => ADMIN_URL,
-								'WB_URL' => WB_URL,
-								'THEME_URL' => THEME_URL,
-								'WB_VERSION' => WB_VERSION
-								)
-						);
+					'WELCOME_MESSAGE' => $MESSAGE['START']['WELCOME_MESSAGE'],
+					'CURRENT_USER' => $MESSAGE['START']['CURRENT_USER'],
+					'DISPLAY_NAME' => $admin->get_display_name(),
+					'ADMIN_URL' => ADMIN_URL,
+					'WB_URL' => WB_URL,
+					'THEME_URL' => THEME_URL,
+					'WB_VERSION' => WB_VERSION
+				)
+			);
 
 // Insert permission values into the template object
 if($admin->get_permission('pages') != true)
@@ -64,7 +64,7 @@
 }
 
 $msg = (file_exists(WB_PATH.'/install/')) ?  $MESSAGE['START']['INSTALL_DIR_EXISTS'] : '';
-$msg .= (file_exists(WB_PATH.'/upgrade-script.php')) ? '<br />'.'upgrade-script.php '.$TEXT['DELETE'] : '';
+$msg .= (file_exists(WB_PATH.'/upgrade-script.php')) ? '<br />'.$TEXT['DELETE'].' upgrade-script.php ' : '';
 
 // Check if installation directory still exists
 if(file_exists(WB_PATH.'/install/') || file_exists(WB_PATH.'/upgrade-script.php') ) {
@@ -114,23 +114,23 @@
 
 // Insert section names and descriptions
 $template->set_var(array(
-								'PAGES' => $MENU['PAGES'],
-								'MEDIA' => $MENU['MEDIA'],
-								'ADDONS' => $MENU['ADDONS'],
-								'ACCESS' => $MENU['ACCESS'],
-								'PREFERENCES' => $MENU['PREFERENCES'],
-								'SETTINGS' => $MENU['SETTINGS'],
-								'ADMINTOOLS' => $MENU['ADMINTOOLS'],
-								'HOME_OVERVIEW' => $OVERVIEW['START'],
-								'PAGES_OVERVIEW' => $OVERVIEW['PAGES'],
-								'MEDIA_OVERVIEW' => $OVERVIEW['MEDIA'],
-								'ADDONS_OVERVIEW' => $addons_overview,
-								'ACCESS_OVERVIEW' => $access_overview,
-								'PREFERENCES_OVERVIEW' => $OVERVIEW['PREFERENCES'],
-								'SETTINGS_OVERVIEW' => $OVERVIEW['SETTINGS'],
-								'ADMINTOOLS_OVERVIEW' => $OVERVIEW['ADMINTOOLS']
-								)
-						);
+					'PAGES' => $MENU['PAGES'],
+					'MEDIA' => $MENU['MEDIA'],
+					'ADDONS' => $MENU['ADDONS'],
+					'ACCESS' => $MENU['ACCESS'],
+					'PREFERENCES' => $MENU['PREFERENCES'],
+					'SETTINGS' => $MENU['SETTINGS'],
+					'ADMINTOOLS' => $MENU['ADMINTOOLS'],
+					'HOME_OVERVIEW' => $OVERVIEW['START'],
+					'PAGES_OVERVIEW' => $OVERVIEW['PAGES'],
+					'MEDIA_OVERVIEW' => $OVERVIEW['MEDIA'],
+					'ADDONS_OVERVIEW' => $addons_overview,
+					'ACCESS_OVERVIEW' => $access_overview,
+					'PREFERENCES_OVERVIEW' => $OVERVIEW['PREFERENCES'],
+					'SETTINGS_OVERVIEW' => $OVERVIEW['SETTINGS'],
+					'ADMINTOOLS_OVERVIEW' => $OVERVIEW['ADMINTOOLS']
+				)
+			);
 
 // Parse template object
 $template->parse('main', 'main_block', false);
Index: branches/2.8.x/wb/admin/templates/uninstall.php
===================================================================
--- branches/2.8.x/wb/admin/templates/uninstall.php	(revision 1456)
+++ branches/2.8.x/wb/admin/templates/uninstall.php	(revision 1457)
@@ -11,11 +11,23 @@
  * @platform        WebsiteBaker 2.8.x
  * @requirements    PHP 5.2.2 and higher
  * @version         $Id$
- * @filesource		$HeadURL: http://svn.websitebaker2.org/branches/2.8.x/wb/admin/settings/save.php $
- * @lastmodified    $Date: 2011-01-10 13:21:47 +0100 (Mo, 10. Jan 2011) $
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
  *
  */
 
+// Setup admin object
+require('../../config.php');
+require_once(WB_PATH.'/framework/class.admin.php');
+// suppress to print the header, so no new FTAN will be set
+$admin = new admin('Addons', 'templates_uninstall', false);
+if( !$admin->checkFTAN() )
+{
+	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']);
+}
+// After check print the header
+$admin->print_header();
+
 // Check if user selected template
 if(!isset($_POST['file']) OR $_POST['file'] == "") {
 	header("Location: index.php");
@@ -30,17 +42,6 @@
 	exit(0);
 }
 
-// Setup admin object
-require('../../config.php');
-require_once(WB_PATH.'/framework/class.admin.php');
-$admin = new admin('Addons', 'templates_uninstall');
-
-if( !$admin->checkFTAN() )
-{
-	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']);
-	exit();
-}
-
 // Include the WB functions file
 require_once(WB_PATH.'/framework/functions.php');
 

Property changes on: branches/2.8.x/wb/admin/templates/uninstall.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1 +1 ##
-Id
\ No newline at end of property
+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/templates/details.php
===================================================================
--- branches/2.8.x/wb/admin/templates/details.php	(revision 1456)
+++ branches/2.8.x/wb/admin/templates/details.php	(revision 1457)
@@ -11,8 +11,8 @@
  * @platform        WebsiteBaker 2.8.x
  * @requirements    PHP 5.2.2 and higher
  * @version         $Id$
- * @filesource		$HeadURL: http://svn.websitebaker2.org/branches/2.8.x/wb/admin/settings/save.php $
- * @lastmodified    $Date: 2011-01-10 13:21:47 +0100 (Mo, 10. Jan 2011) $
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
  *
  */
 
@@ -20,12 +20,11 @@
 require('../../config.php');
 require_once(WB_PATH .'/framework/functions.php');
 require_once(WB_PATH.'/framework/class.admin.php');
-$admin = new admin('Addons', 'templates_view',false);
-
+// suppress to print the header, so no new FTAN will be set
+$admin = new admin('Addons', 'templates_view', false);
 if( !$admin->checkFTAN() )
 {
 	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']);
-	exit();
 }
 
 // Get template name

Property changes on: branches/2.8.x/wb/admin/templates/details.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1 +1 ##
-Id
\ No newline at end of property
+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/templates/install.php
===================================================================
--- branches/2.8.x/wb/admin/templates/install.php	(revision 1456)
+++ branches/2.8.x/wb/admin/templates/install.php	(revision 1457)
@@ -11,17 +11,11 @@
  * @platform        WebsiteBaker 2.8.x
  * @requirements    PHP 5.2.2 and higher
  * @version         $Id$
- * @filesource		$HeadURL: http://svn.websitebaker2.org/branches/2.8.x/wb/admin/settings/save.php $
- * @lastmodified    $Date: 2011-01-10 13:21:47 +0100 (Mo, 10. Jan 2011) $
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
  *
  */
 
-// Check if user uploaded a file
-if(!isset($_FILES['userfile'])) {
-	header("Location: index.php");
-	exit(0);
-}
-
 // do not display notices and warnings during installation
 error_reporting(E_ALL ^ E_NOTICE ^ E_WARNING);
 
@@ -28,14 +22,21 @@
 // Setup admin object
 require('../../config.php');
 require_once(WB_PATH.'/framework/class.admin.php');
-$admin = new admin('Addons', 'templates_install');
-
+// suppress to print the header, so no new FTAN will be set
+$admin = new admin('Addons', 'templates_install', false);
 if( !$admin->checkFTAN() )
 {
 	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']);
-	exit();
 }
+// After check print the header
+$admin->print_header();
 
+// Check if user uploaded a file
+if(!isset($_FILES['userfile'])) {
+	header("Location: index.php");
+	exit(0);
+}
+
 // Include the WB functions file
 require_once(WB_PATH.'/framework/functions.php');
 

Property changes on: branches/2.8.x/wb/admin/templates/install.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1 +1 ##
-Id
\ No newline at end of property
+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/templates/index.php
===================================================================
--- branches/2.8.x/wb/admin/templates/index.php	(revision 1456)
+++ branches/2.8.x/wb/admin/templates/index.php	(revision 1457)
@@ -58,16 +58,24 @@
 
 // Insert language headings
 $template->set_var(array(
-								'HEADING_INSTALL_TEMPLATE' => $HEADING['INSTALL_TEMPLATE'],
-								'HEADING_UNINSTALL_TEMPLATE' => $HEADING['UNINSTALL_TEMPLATE'],
-								'HEADING_TEMPLATE_DETAILS' => $HEADING['TEMPLATE_DETAILS']
-								)
-						);
+					'HEADING_INSTALL_TEMPLATE' => $HEADING['INSTALL_TEMPLATE'],
+					'HEADING_UNINSTALL_TEMPLATE' => $HEADING['UNINSTALL_TEMPLATE'],
+					'HEADING_TEMPLATE_DETAILS' => $HEADING['TEMPLATE_DETAILS']
+				)
+			);
+// insert urls
+$template->set_var(array(
+					'ADMIN_URL' => ADMIN_URL,
+					'WB_URL' => WB_URL,
+					'THEME_URL' => THEME_URL,
+					'FTAN' => $admin->getFTAN()
+				)
+			);
 // Insert language text and messages
 $template->set_var(array(
 	'URL_MODULES' => $admin->get_permission('modules') ? 
 		'<a href="' . ADMIN_URL . '/modules/index.php">' . $MENU['MODULES'] . '</a>' : '',
-	'URL_LANGUAGES' => $admin->get_permission('languages') ? 
+	'URL_LANGUAGES' => $admin->get_permission('languages') ?
 		'<a href="' . ADMIN_URL . '/languages/index.php">' . $MENU['LANGUAGES'] . '</a>' : '',
 	'URL_ADVANCED' => $admin->get_permission('admintools') ? 
 	'<a href="' . ADMIN_URL . '/modules/index.php?advanced">' . $TEXT['ADVANCED'] . '</a>' : '',
@@ -85,5 +93,3 @@
 
 // Print admin footer
 $admin->print_footer();
-
-?>
\ No newline at end of file

Property changes on: branches/2.8.x/wb/admin/templates/index.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1 +1 ##
-Id
\ No newline at end of property
+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/page_calendar.js
===================================================================
--- branches/2.8.x/wb/admin/pages/page_calendar.js	(revision 1456)
+++ branches/2.8.x/wb/admin/pages/page_calendar.js	(revision 1457)
@@ -1,26 +1,26 @@
-Calendar.setup(
-	{
-	inputField  : start_date,
-	ifFormat    : jscal_ifformat,
-	button      : trigger_start,
-	firstDay    : jscal_firstday,
-	showsTime   : showsTime,
-	timeFormat  : timeFormat,
-	date        : jscal_today,
-	range       : [1970, 2037],
-	step        : 1
-	}
-);
-Calendar.setup(
-	{
-	inputField  : end_date,
-	ifFormat    : jscal_ifformat,
-	button      : trigger_end,
-	firstDay    : jscal_firstday,
-	showsTime   : showsTime,
-	timeFormat  : timeFormat,
-	date        : jscal_today,
-	range       : [1970, 2037],
-	step        : 1
-	}
+Calendar.setup(
+	{
+	inputField  : start_date,
+	ifFormat    : jscal_ifformat,
+	button      : trigger_start,
+	firstDay    : jscal_firstday,
+	showsTime   : showsTime,
+	timeFormat  : timeFormat,
+	date        : jscal_today,
+	range       : [1970, 2037],
+	step        : 1
+	}
+);
+Calendar.setup(
+	{
+	inputField  : end_date,
+	ifFormat    : jscal_ifformat,
+	button      : trigger_end,
+	firstDay    : jscal_firstday,
+	showsTime   : showsTime,
+	timeFormat  : timeFormat,
+	date        : jscal_today,
+	range       : [1970, 2037],
+	step        : 1
+	}
 );
\ No newline at end of file

Property changes on: branches/2.8.x/wb/admin/pages/page_calendar.js
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1 +1 ##
-Id
\ No newline at end of property
+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/intro.php
===================================================================
--- branches/2.8.x/wb/admin/pages/intro.php	(revision 1456)
+++ branches/2.8.x/wb/admin/pages/intro.php	(revision 1457)
@@ -11,8 +11,8 @@
  * @platform        WebsiteBaker 2.8.x
  * @requirements    PHP 5.2.2 and higher
  * @version         $Id$
- * @filesource		$HeadURL: http://svn.websitebaker2.org/branches/2.8.x/wb/admin/users/save.php $
- * @lastmodified    $Date: 2011-01-10 13:21:47 +0100 (Mo, 10. Jan 2011) $
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
  *
  */
 

Property changes on: branches/2.8.x/wb/admin/pages/intro.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1 +1 ##
-Id
\ No newline at end of property
+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/move_down.php
===================================================================
--- branches/2.8.x/wb/admin/pages/move_down.php	(revision 1456)
+++ branches/2.8.x/wb/admin/pages/move_down.php	(revision 1457)
@@ -11,8 +11,8 @@
  * @platform        WebsiteBaker 2.8.x
  * @requirements    PHP 5.2.2 and higher
  * @version         $Id$
- * @filesource		$HeadURL: http://svn.websitebaker2.org/branches/2.8.x/wb/admin/users/save.php $
- * @lastmodified    $Date: 2011-01-10 13:21:47 +0100 (Mo, 10. Jan 2011) $
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
  *
  */
 

Property changes on: branches/2.8.x/wb/admin/pages/move_down.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1 +1 ##
-Id
\ No newline at end of property
+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/save.php
===================================================================
--- branches/2.8.x/wb/admin/pages/save.php	(revision 1456)
+++ branches/2.8.x/wb/admin/pages/save.php	(revision 1457)
@@ -20,8 +20,10 @@
 // Create new admin object
 require('../../config.php');
 require_once(WB_PATH.'/framework/class.admin.php');
-$admin = new admin('Pages', 'pages_modify');
 
+// suppress to print the header, so no new FTAN will be set
+$admin = new admin('Pages', 'pages_modify', false);
+
 // Get page & section id
 if(!isset($_POST['page_id']) || !is_numeric($_POST['page_id'])) {
 	header("Location: index.php");
@@ -38,25 +40,25 @@
 }
 
 // $js_back = "javascript: history.go(-1);";
-$js_back = ADMIN_URL.'/pages/modify.php?page_id='.$page_id
+$js_back = ADMIN_URL.'/pages/modify.php?page_id='.$page_id;
 
 if (!$admin->checkFTAN())
 {
+	$admin->print_header();
 	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'],$js_back );
-	exit();
 }
+// After check print the header
+$admin->print_header();
 
 /*
 if( (!($page_id = $admin->checkIDKEY('page_id', 0, $_SERVER['REQUEST_METHOD']))) )
 {
 	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']);
-	exit();
 }
 
 if( (!($section_id= $admin->checkIDKEY('section_id', 0, $_SERVER['REQUEST_METHOD']))) )
 {
 	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']);
-	exit();
 }
 */
 

Property changes on: branches/2.8.x/wb/admin/pages/save.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1,4 +1 ##
-Id
-Revision
-HeadURL
-Date
\ No newline at end of property
+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/empty_trash.php
===================================================================
--- branches/2.8.x/wb/admin/pages/empty_trash.php	(revision 1456)
+++ branches/2.8.x/wb/admin/pages/empty_trash.php	(revision 1457)
@@ -11,8 +11,8 @@
  * @platform        WebsiteBaker 2.8.x
  * @requirements    PHP 5.2.2 and higher
  * @version         $Id$
- * @filesource		$HeadURL: http://svn282.websitebaker-dev.de/branches/2.8.x/wb/admin/pages/empty_trash.php $
- * @lastmodified    $Date: 2010-05-29 10:36:20 +0200 (Sa, 29. Mai 2010) $
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
  *
  */
 

Property changes on: branches/2.8.x/wb/admin/pages/empty_trash.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1 +1 ##
-Id
\ No newline at end of property
+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/settings.php
===================================================================
--- branches/2.8.x/wb/admin/pages/settings.php	(revision 1456)
+++ branches/2.8.x/wb/admin/pages/settings.php	(revision 1457)
@@ -49,9 +49,7 @@
 $old_admin_users = explode(',', $results_array['admin_users']);
 
 // Work-out if we should check for existing page_code
-$sql = 'DESCRIBE `'.TABLE_PREFIX.'pages` `page_code`';
-$field_sql = $database->query($sql);
-$field_set = $field_sql->numRows();
+$field_set = $database->field_exists(TABLE_PREFIX.'pages', 'page_code');
 
 $in_old_group = FALSE;
 foreach($admin->get_groups_id() as $cur_gid)
@@ -411,7 +409,7 @@
 			}
 			// Title -'s prefix
 			$title_prefix = '';
-			for($i = 1; $i <= $page['level']; $i++) { $title_prefix .= ' - '; }
+			for($i = 1; $i <= $page['level']; $i++) { $title_prefix .= ' - - &nbsp;'; }
 			$template->set_var(array(
 								'ID' => $page['page_id'],
 								'TITLE' => ($title_prefix.$page['menu_title']),
@@ -540,13 +538,15 @@
 		$l_names[$rec_language['name']] = entities_to_7bit($rec_language['name']); // sorting-problem workaround
 	}
 	asort($l_names);
+
 	foreach($l_names as $l_name=>$v)
     {
+        $langIcons = (empty($l_codes[$l_name])) ? 'none' : strtolower($l_codes[$l_name]);
 		// Insert code and name
 		$template->set_var(array(
 								'VALUE' => $l_codes[$l_name],
 								'NAME' => $l_name,
-								'FLAG_LANG_ICONS' => 'url('.THEME_URL.'/images/flags/'.strtolower($l_codes[$l_name]).'.png)',
+								'FLAG_LANG_ICONS' => 'url('.THEME_URL.'/images/flags/'.$langIcons.'.png)',
 								));
 		// Check if it is selected
 		if($results_array['language'] == $l_codes[$l_name])

Property changes on: branches/2.8.x/wb/admin/pages/settings.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1,4 +1 ##
-Id
-Revision
-HeadURL
-Date
\ No newline at end of property
+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/delete.php
===================================================================
--- branches/2.8.x/wb/admin/pages/delete.php	(revision 1456)
+++ branches/2.8.x/wb/admin/pages/delete.php	(revision 1457)
@@ -11,8 +11,8 @@
  * @platform        WebsiteBaker 2.8.x
  * @requirements    PHP 5.2.2 and higher
  * @version         $Id$
- * @filesource		$HeadURL: http://svn.websitebaker2.org/branches/2.8.x/wb/admin/pages/add.php $
- * @lastmodified    $Date: 2011-01-10 13:14:10 +0100 (Mo, 10. Jan 2011) $
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
  *
  */
 

Property changes on: branches/2.8.x/wb/admin/pages/delete.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1 +1 ##
-Id
\ No newline at end of property
+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/page_trash.js
===================================================================
--- branches/2.8.x/wb/admin/pages/page_trash.js	(revision 1456)
+++ branches/2.8.x/wb/admin/pages/page_trash.js	(revision 1457)
@@ -1,32 +1,32 @@
-function toggle_viewers() {
-	if(document.add.visibility.value == 'private') {
-		document.getElementById('private_viewers').style.display = 'block';
-		document.getElementById('registered_viewers').style.display = 'none';
-	} else if(document.add.visibility.value == 'registered') {
-		document.getElementById('private_viewers').style.display = 'none';
-		document.getElementById('registered_viewers').style.display = 'block';
-	} else {
-		document.getElementById('private_viewers').style.display = 'none';
-		document.getElementById('registered_viewers').style.display = 'none';
-	}
-}
-
-function toggle_visibility(id){
-	if(document.getElementById(id).style.display == "block") {
-		document.getElementById(id).style.display = "none";
-	} else {
-		document.getElementById(id).style.display = "block";
-	}
-}
-var plus = new Image;
-plus.src = "<?php echo THEME_URL; ?>/images/plus_16.png";
-var minus = new Image;
-minus.src = "<?php echo THEME_URL; ?>/images/minus_16.png";
-function toggle_plus_minus(id) {
-	var img_src = document.images['plus_minus_' + id].src;
-	if(img_src == plus.src) {
-		document.images['plus_minus_' + id].src = minus.src;
-	} else {
-		document.images['plus_minus_' + id].src = plus.src;
-	}
+function toggle_viewers() {
+	if(document.add.visibility.value == 'private') {
+		document.getElementById('private_viewers').style.display = 'block';
+		document.getElementById('registered_viewers').style.display = 'none';
+	} else if(document.add.visibility.value == 'registered') {
+		document.getElementById('private_viewers').style.display = 'none';
+		document.getElementById('registered_viewers').style.display = 'block';
+	} else {
+		document.getElementById('private_viewers').style.display = 'none';
+		document.getElementById('registered_viewers').style.display = 'none';
+	}
+}
+
+function toggle_visibility(id){
+	if(document.getElementById(id).style.display == "block") {
+		document.getElementById(id).style.display = "none";
+	} else {
+		document.getElementById(id).style.display = "block";
+	}
+}
+var plus = new Image;
+plus.src = "<?php echo THEME_URL; ?>/images/plus_16.png";
+var minus = new Image;
+minus.src = "<?php echo THEME_URL; ?>/images/minus_16.png";
+function toggle_plus_minus(id) {
+	var img_src = document.images['plus_minus_' + id].src;
+	if(img_src == plus.src) {
+		document.images['plus_minus_' + id].src = minus.src;
+	} else {
+		document.images['plus_minus_' + id].src = plus.src;
+	}
 }
\ No newline at end of file

Property changes on: branches/2.8.x/wb/admin/pages/page_trash.js
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1 +1 ##
-Id
\ No newline at end of property
+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/sections_save.php
===================================================================
--- branches/2.8.x/wb/admin/pages/sections_save.php	(revision 1456)
+++ branches/2.8.x/wb/admin/pages/sections_save.php	(revision 1457)
@@ -11,8 +11,8 @@
  * @platform        WebsiteBaker 2.8.x
  * @requirements    PHP 5.2.2 and higher
  * @version         $Id$
- * @filesource		$HeadURL: http://svn.websitebaker2.org/branches/2.8.x/wb/admin/pages/sections.php $
- * @lastmodified    $Date: 2011-01-10 13:14:10 +0100 (Mo, 10. Jan 2011) $
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
  *
  */
 
@@ -29,13 +29,16 @@
 /**/
 // Create new admin object
 require_once(WB_PATH.'/framework/class.admin.php');
-$admin = new admin('Pages', 'pages_modify');
+// suppress to print the header, so no new FTAN will be set
+$admin = new admin('Pages', 'pages_modify',false);
 
 if (!$admin->checkFTAN())
 {
+	$admin->print_header();
 	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'],ADMIN_URL.'/pages/sections.php?page_id='.$page_id);
-	exit();
 }
+// After check print the header
+$admin->print_header();
 
 // Get page id
 if(!isset($_GET['page_id']) || !is_numeric($_GET['page_id'])) {

Property changes on: branches/2.8.x/wb/admin/pages/sections_save.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1 +1 ##
-Id
\ No newline at end of property
+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/index.php
===================================================================
--- branches/2.8.x/wb/admin/pages/index.php	(revision 1456)
+++ branches/2.8.x/wb/admin/pages/index.php	(revision 1457)
@@ -11,8 +11,8 @@
  * @platform        WebsiteBaker 2.8.x
  * @requirements    PHP 5.2.2 and higher and higher
  * @version         $Id$
- * @filesource		$HeadURL:  $
- * @lastmodified    $Date:  $
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
  *
  */
 
@@ -344,9 +344,9 @@
 	</tr>
 	</table>
 	<?php
-    // Work-out if we should check for existing page_code
-    $field_sql = $database->query("DESCRIBE ".TABLE_PREFIX."pages page_code");
-    $field_set = $field_sql->numRows();
+	// Work-out if we should check for existing page_code
+	$field_set = $database->field_exists(TABLE_PREFIX.'pages', 'page_code');
+
     $par = array();
 	$par['num_subs'] = 1;
 	$editable_pages = make_list(0, 0);
@@ -498,7 +498,7 @@
 			}
 			// Title -'s prefix
 			$title_prefix = '';
-			for($i = 1; $i <= $page['level']; $i++) { $title_prefix .= ' - '; }
+			for($i = 1; $i <= $page['level']; $i++) { $title_prefix .= ' - - &nbsp;'; }
 				$template->set_var(array(
 										'ID' => $page['page_id'],
 										'TITLE' => ($title_prefix.$page['menu_title']),
@@ -518,12 +518,12 @@
 $template->set_block('main_block', 'page_list_block2', 'page_list2');
 if($admin->get_permission('pages_add_l0') == true) {
 	$template->set_var(array(
-									'ID' => '0',
-									'TITLE' => $TEXT['NONE'],
-									'SELECTED' => ' selected="selected"',
-									'DISABLED' => ''
-									)
-							);
+						'ID' => '0',
+						'TITLE' => $TEXT['NONE'],
+						'SELECTED' => ' selected="selected"',
+						'DISABLED' => ''
+					)
+				);
 	$template->parse('page_list2', 'page_list_block2', true);
 }
 parent_list(0);

Property changes on: branches/2.8.x/wb/admin/pages/index.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1 +1 ##
-Id
\ No newline at end of property
+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/move_up.php
===================================================================
--- branches/2.8.x/wb/admin/pages/move_up.php	(revision 1456)
+++ branches/2.8.x/wb/admin/pages/move_up.php	(revision 1457)
@@ -11,8 +11,8 @@
  * @platform        WebsiteBaker 2.8.x
  * @requirements    PHP 5.2.2 and higher
  * @version         $Id$
- * @filesource		$HeadURL: http://svn.websitebaker2.org/branches/2.8.x/wb/admin/users/save.php $
- * @lastmodified    $Date: 2011-01-10 13:21:47 +0100 (Mo, 10. Jan 2011) $
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
  *
  */
 

Property changes on: branches/2.8.x/wb/admin/pages/move_up.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1 +1 ##
-Id
\ No newline at end of property
+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 1456)
+++ branches/2.8.x/wb/admin/pages/intro2.php	(revision 1457)
@@ -11,8 +11,8 @@
  * @platform        WebsiteBaker 2.8.x
  * @requirements    PHP 5.2.2 and higher
  * @version         $Id$
- * @filesource		$HeadURL: http://svn.websitebaker2.org/branches/2.8.x/wb/admin/users/save.php $
- * @lastmodified    $Date: 2011-01-10 13:21:47 +0100 (Mo, 10. Jan 2011) $
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
  *
  */
 

Property changes on: branches/2.8.x/wb/admin/pages/intro2.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1 +1 ##
-Id
\ No newline at end of property
+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/trash.php
===================================================================
--- branches/2.8.x/wb/admin/pages/trash.php	(revision 1456)
+++ branches/2.8.x/wb/admin/pages/trash.php	(revision 1457)
@@ -11,8 +11,8 @@
  * @platform        WebsiteBaker 2.8.x
  * @requirements    PHP 5.2.2 and higher
  * @version         $Id$
- * @filesource		$HeadURL: http://svn282.websitebaker-dev.de/branches/2.8.x/wb/admin/pages/trash.php $
- * @lastmodified    $Date: 2010-05-29 10:36:20 +0200 (Sa, 29. Mai 2010) $
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
  *
  */
 

Property changes on: branches/2.8.x/wb/admin/pages/trash.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1 +1 ##
-Id
\ No newline at end of property
+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/page_settings.js
===================================================================
--- branches/2.8.x/wb/admin/pages/page_settings.js	(revision 1456)
+++ branches/2.8.x/wb/admin/pages/page_settings.js	(revision 1457)
@@ -1,26 +1,26 @@
-function toggle_viewers() {
-	if(document.settings.visibility.value == 'private' || document.settings.visibility.value == 'registered') {
-		document.getElementById('allowed_viewers').style.display = 'block';
-	} else {
-		document.getElementById('allowed_viewers').style.display = 'none';
-	}
-}
-var lastselectedindex = new Array();
-
-function disabled_hack_for_ie(sel) {
-	var sels = document.getElementsByTagName("select");
-	var i;
-	var sel_num_in_doc = 0;
-	for (i = 0; i <sels.length; i++) {
-		if (sel == sels[i]) {
-			sel_num_in_doc = i;
-		}
-	}
-	// never true for browsers that support option.disabled
-	if (sel.options[sel.selectedIndex].disabled) {
-		sel.selectedIndex = lastselectedindex[sel_num_in_doc];
-	} else {
-		lastselectedindex[sel_num_in_doc] = sel.selectedIndex;
-	}
-	return true;
+function toggle_viewers() {
+	if(document.settings.visibility.value == 'private' || document.settings.visibility.value == 'registered') {
+		document.getElementById('allowed_viewers').style.display = 'block';
+	} else {
+		document.getElementById('allowed_viewers').style.display = 'none';
+	}
+}
+var lastselectedindex = new Array();
+
+function disabled_hack_for_ie(sel) {
+	var sels = document.getElementsByTagName("select");
+	var i;
+	var sel_num_in_doc = 0;
+	for (i = 0; i <sels.length; i++) {
+		if (sel == sels[i]) {
+			sel_num_in_doc = i;
+		}
+	}
+	// never true for browsers that support option.disabled
+	if (sel.options[sel.selectedIndex].disabled) {
+		sel.selectedIndex = lastselectedindex[sel_num_in_doc];
+	} else {
+		lastselectedindex[sel_num_in_doc] = sel.selectedIndex;
+	}
+	return true;
 }
\ No newline at end of file

Property changes on: branches/2.8.x/wb/admin/pages/page_settings.js
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1 +1 ##
-Id
\ No newline at end of property
+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/settings2.php
===================================================================
--- branches/2.8.x/wb/admin/pages/settings2.php	(revision 1456)
+++ branches/2.8.x/wb/admin/pages/settings2.php	(revision 1457)
@@ -20,8 +20,10 @@
 // Create new admin object and print admin header
 require('../../config.php');
 require_once(WB_PATH.'/framework/class.admin.php');
-$admin = new admin('Pages', 'pages_settings');
 
+// suppress to print the header, so no new FTAN will be set
+$admin = new admin('Pages', 'pages_settings',false);
+
 // Get page id
 if(!isset($_POST['page_id']) || !is_numeric($_POST['page_id']))
 {
@@ -28,25 +30,26 @@
 	header("Location: index.php");
 	exit(0);
 } else {
-	$page_id = $_POST['page_id'];
+	$page_id = (int)$_POST['page_id'];
 }
+
+/*
+if( (!($page_id = $admin->checkIDKEY('page_id', 0, $_SERVER['REQUEST_METHOD']))) )
+{
+	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']);
+}
+*/
 $pagetree_url = ADMIN_URL.'/pages/index.php';
 $target_url = ADMIN_URL.'/pages/settings.php?page_id='.$page_id;
 
 if (!$admin->checkFTAN())
 {
+	$admin->print_header();
 	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'],$target_url);
-	exit();
 }
+// After check print the header
+$admin->print_header();
 
-/*
-if( (!($page_id = $admin->checkIDKEY('page_id', 0, $_SERVER['REQUEST_METHOD']))) )
-{
-	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']);
-	exit();
-}
-*/
-
 // Include the WB functions file
 require_once(WB_PATH.'/framework/functions.php');
 
@@ -92,9 +95,7 @@
 $old_admin_users = explode(',', str_replace('_', '', $results_array['admin_users']));
 
 // Work-out if we should check for existing page_code
-$sql = 'DESCRIBE `'.TABLE_PREFIX.'pages` `page_code`';
-$field_sql = $database->query($sql);
-$field_set = $field_sql->numRows();
+$field_set = $database->field_exists(TABLE_PREFIX.'pages', 'page_code');
 
 $in_old_group = FALSE;
 foreach($admin->get_groups_id() as $cur_gid)

Property changes on: branches/2.8.x/wb/admin/pages/settings2.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1,4 +1 ##
-Id
-Revision
-HeadURL
-Date
\ No newline at end of property
+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/restore.php
===================================================================
--- branches/2.8.x/wb/admin/pages/restore.php	(revision 1456)
+++ branches/2.8.x/wb/admin/pages/restore.php	(revision 1457)
@@ -11,8 +11,8 @@
  * @platform        WebsiteBaker 2.8.x
  * @requirements    PHP 5.2.2 and higher
  * @version         $Id$
- * @filesource		$HeadURL: http://svn.websitebaker2.org/branches/2.8.x/wb/admin/users/save.php $
- * @lastmodified    $Date: 2011-01-10 13:21:47 +0100 (Mo, 10. Jan 2011) $
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
  *
  */
 

Property changes on: branches/2.8.x/wb/admin/pages/restore.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1 +1 ##
-Id
\ No newline at end of property
+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/eggsurplus.js
===================================================================
--- branches/2.8.x/wb/admin/pages/eggsurplus.js	(revision 1456)
+++ branches/2.8.x/wb/admin/pages/eggsurplus.js	(revision 1457)
@@ -1,15 +1,15 @@
-	function add_child_page(page_id)
-    {
-		//find and select the page in the parent dropdown
-		var selectBox = document.add.parent;
-		for (var i = 0; i < selectBox.options.length; i++)
-		{
-			  if (selectBox.options[i].value == page_id)
-			  {
-					selectBox.selectedIndex = i;
-					break;
-			  }
-		}
-		//set focus to add form
-		document.add.title.focus();
-	}
+	function add_child_page(page_id)
+    {
+		//find and select the page in the parent dropdown
+		var selectBox = document.add.parent;
+		for (var i = 0; i < selectBox.options.length; i++)
+		{
+			  if (selectBox.options[i].value == page_id)
+			  {
+					selectBox.selectedIndex = i;
+					break;
+			  }
+		}
+		//set focus to add form
+		document.add.title.focus();
+	}

Property changes on: branches/2.8.x/wb/admin/pages/eggsurplus.js
___________________________________________________________________
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/modify.php
===================================================================
--- branches/2.8.x/wb/admin/pages/modify.php	(revision 1456)
+++ branches/2.8.x/wb/admin/pages/modify.php	(revision 1457)
@@ -28,14 +28,13 @@
 	header("Location: index.php");
 	exit(0);
 } else {
-	$page_id = $_GET['page_id'];
+	$page_id = (int)$_GET['page_id'];
 }
 
 /*
-if( (!($page_id = $admin->checkIDKEY('page_id', 0, $_SERVER['REQUEST_METHOD']))) )
+if( (!($page_id = $admin->checkIDKEY('page_id', $page_id, $_SERVER['REQUEST_METHOD']))) )
 {
 	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']);
-	exit();
 }
 */
 
@@ -55,14 +54,14 @@
 // Convert the unix ts for modified_when to human a readable form
 
 $modified_ts = ($results_array['modified_when'] != 0)
-        ? $modified_ts = gmdate(TIME_FORMAT.', '.DATE_FORMAT, $results_array['modified_when']+TIMEZONE)
+        ? $modified_ts = date(TIME_FORMAT.', '.DATE_FORMAT, $results_array['modified_when']+TIMEZONE)
         : 'Unknown';
-
+// $ftan_module = $GLOBALS['ftan_module'];
 // Include page info script
 $template = new Template(THEME_PATH.'/templates');
 $template->set_file('page', 'pages_modify.htt');
 $template->set_block('page', 'main_block', 'main');
-$template->set_var('FTAN', $admin->getFTAN());
+$template->set_var('FTAN', $admin->getFTAN() );
 
 $template->set_var(array(
 			'PAGE_ID' => $results_array['page_id'],
@@ -180,9 +179,12 @@
 							$block_name = '#' . (int) $section['block'];
 						}
 					}
-					print '<div id="wb_'.$section['section_id'].'"><b>' . $TEXT['BLOCK'] . ': </b>' . $block_name;
+
+                    $sec_anchor = (defined( 'SEC_ANCHOR' ) && ( SEC_ANCHOR != '' )  ? 'id="'.SEC_ANCHOR.$section['section_id'].'"' : '');
+					print '<div class="section-info" '.$sec_anchor.' ><b>' . $TEXT['BLOCK'] . ': </b>' . $block_name;
 					print '<b>  Modul: </b>' . $section['module']." ";
 					print '<b>  ID: </b>' . $section_id."</div>\n";
+
 				}
 				require(WB_PATH.'/modules/'.$module.'/modify.php');
 			}
@@ -192,5 +194,3 @@
 
 // Print admin footer
 $admin->print_footer();
-
-?>
\ No newline at end of file

Property changes on: branches/2.8.x/wb/admin/pages/modify.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1,4 +1 ##
-Id
-Revision
-HeadURL
-Date
\ No newline at end of property
+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/sections.php
===================================================================
--- branches/2.8.x/wb/admin/pages/sections.php	(revision 1456)
+++ branches/2.8.x/wb/admin/pages/sections.php	(revision 1457)

Property changes on: branches/2.8.x/wb/admin/pages/sections.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1,4 +1 ##
-Id
-Revision
-HeadURL
-Date
\ No newline at end of property
+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/page_index.js
===================================================================
--- branches/2.8.x/wb/admin/pages/page_index.js	(revision 1456)
+++ branches/2.8.x/wb/admin/pages/page_index.js	(revision 1457)
@@ -1,35 +1,35 @@
-/*-- Addition for remembering expanded state of pages --*/
-function writeSessionCookie (cookieName, cookieValue) {
-	document.cookie = escape(cookieName) + "=" + escape(cookieValue) + ";";
-}
-
-function toggle_viewers() {
-	if(document.add.visibility.value == 'private') {
-		document.getElementById('viewers').style.display = 'block';
-	} else if(document.add.visibility.value == 'registered') {
-		document.getElementById('viewers').style.display = 'block';
-	} else {
-		document.getElementById('viewers').style.display = 'none';
-	}
-}
-function toggle_visibility(id){
-	if(document.getElementById(id).style.display == "block") {
-		document.getElementById(id).style.display = "none";
-		writeSessionCookie (id, "0");//Addition for remembering expanded state of pages
-	} else {
-		document.getElementById(id).style.display = "block";
-		writeSessionCookie (id, "1");//Addition for remembering expanded state of pages
-	}
-}
-var plus = new Image;
-plus.src = THEME_URL+"/images/plus_16.png";
-var minus = new Image;
-minus.src = THEME_URL+"/images/minus_16.png";
-function toggle_plus_minus(id) {
-	var img_src = document.images['plus_minus_' + id].src;
-	if(img_src == plus.src) {
-		document.images['plus_minus_' + id].src = minus.src;
-	} else {
-		document.images['plus_minus_' + id].src = plus.src;
-	}
+/*-- Addition for remembering expanded state of pages --*/
+function writeSessionCookie (cookieName, cookieValue) {
+	document.cookie = escape(cookieName) + "=" + escape(cookieValue) + ";";
+}
+
+function toggle_viewers() {
+	if(document.add.visibility.value == 'private') {
+		document.getElementById('viewers').style.display = 'block';
+	} else if(document.add.visibility.value == 'registered') {
+		document.getElementById('viewers').style.display = 'block';
+	} else {
+		document.getElementById('viewers').style.display = 'none';
+	}
+}
+function toggle_visibility(id){
+	if(document.getElementById(id).style.display == "block") {
+		document.getElementById(id).style.display = "none";
+		writeSessionCookie (id, "0");//Addition for remembering expanded state of pages
+	} else {
+		document.getElementById(id).style.display = "block";
+		writeSessionCookie (id, "1");//Addition for remembering expanded state of pages
+	}
+}
+var plus = new Image;
+plus.src = THEME_URL+"/images/plus_16.png";
+var minus = new Image;
+minus.src = THEME_URL+"/images/minus_16.png";
+function toggle_plus_minus(id) {
+	var img_src = document.images['plus_minus_' + id].src;
+	if(img_src == plus.src) {
+		document.images['plus_minus_' + id].src = minus.src;
+	} else {
+		document.images['plus_minus_' + id].src = plus.src;
+	}
 }
\ No newline at end of file

Property changes on: branches/2.8.x/wb/admin/pages/page_index.js
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1 +1 ##
-Id
\ No newline at end of property
+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/add.php
===================================================================
--- branches/2.8.x/wb/admin/pages/add.php	(revision 1456)
+++ branches/2.8.x/wb/admin/pages/add.php	(revision 1457)
@@ -19,13 +19,15 @@
 // Create new admin object and print admin header
 require('../../config.php');
 require_once(WB_PATH.'/framework/class.admin.php');
-$admin = new admin('Pages', 'pages_add');
-
+// suppress to print the header, so no new FTAN will be set
+$admin = new admin('Pages', 'pages_add', false);
 if (!$admin->checkFTAN())
 {
+	$admin->print_header();
 	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']);
-	exit();
 }
+// After check print the header
+$admin->print_header();
 
 // Include the WB functions file
 require_once(WB_PATH.'/framework/functions.php');
@@ -41,9 +43,7 @@
 $viewing_groups = $admin->get_post('viewing_groups');
 
 // Work-out if we should check for existing page_code
-$sql = 'DESCRIBE `'.TABLE_PREFIX.'pages` `page_code`';
-$field_sql = $database->query($sql);
-$field_set = $field_sql->numRows();
+$field_set = $database->field_exists(TABLE_PREFIX.'pages', 'page_code');
 
 // add Admin to admin and viewing-groups
 $admin_groups[] = 1;

Property changes on: branches/2.8.x/wb/admin/pages/add.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1,4 +1 ##
-Id
-Revision
-HeadURL
-Date
\ No newline at end of property
+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/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php	(revision 1456)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 1457)
@@ -52,6 +52,6 @@
 
 // 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.RC6');
-if(!defined('REVISION')) define('REVISION', '1456');
+if(!defined('REVISION')) define('REVISION', '1457');
 
 ?>
Index: branches/2.8.x/wb/admin/settings/save.php
===================================================================
--- branches/2.8.x/wb/admin/settings/save.php	(revision 1456)
+++ branches/2.8.x/wb/admin/settings/save.php	(revision 1457)
@@ -26,21 +26,23 @@
 require('../../config.php');
 require_once(WB_PATH.'/framework/class.admin.php');
 
+// suppress to print the header, so no new FTAN will be set
 if($advanced == '')
 {
-	$admin = new admin('Settings', 'settings_basic');
+	$admin = new admin('Settings', 'settings_basic',false);
 } else {
-	$admin = new admin('Settings', 'settings_advanced');
+	$admin = new admin('Settings', 'settings_advanced',false);
 }
 
 // Create a javascript back link
 $js_back = ADMIN_URL.'/settings/index.php'.$advanced;
-
 if( !$admin->checkFTAN() )
 {
+	$admin->print_header();
 	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'],$js_back );
-	exit();
 }
+// After check print the header
+$admin->print_header();
 
 // Ensure that the specified default email is formally valid
 if(isset($_POST['server_email']))

Property changes on: branches/2.8.x/wb/admin/settings/save.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1,4 +1 ##
-Id
-Revision
-HeadURL
-Date
\ No newline at end of property
+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/settings/setting.js
===================================================================
--- branches/2.8.x/wb/admin/settings/setting.js	(revision 1456)
+++ branches/2.8.x/wb/admin/settings/setting.js	(revision 1457)
@@ -1,44 +1,44 @@
-function change_os(type) {
-	if(type == 'linux') {
-		document.getElementById('file_perms_box1').style.display = 'block';
-		document.getElementById('file_perms_box2').style.display = 'block';
-		document.getElementById('file_perms_box3').style.display = 'block';
-	} else if(type == 'windows') {
-		document.getElementById('file_perms_box1').style.display = 'none';
-		document.getElementById('file_perms_box2').style.display = 'none';
-		document.getElementById('file_perms_box3').style.display = 'none';
-	}
-}
-
-function change_wbmailer(type) {
-	if(type == 'smtp') {
-		document.getElementById('row_wbmailer_smtp_settings').style.display = '';
-		document.getElementById('row_wbmailer_smtp_host').style.display = '';
-		document.getElementById('row_wbmailer_smtp_auth_mode').style.display = '';
-		document.getElementById('row_wbmailer_smtp_username').style.display = '';
-		document.getElementById('row_wbmailer_smtp_password').style.display = '';
-		if( document.settings.wbmailer_smtp_auth.checked == true ) {
-			document.getElementById('row_wbmailer_smtp_username').style.display = '';
-			document.getElementById('row_wbmailer_smtp_password').style.display = '';
-		} else {
-			document.getElementById('row_wbmailer_smtp_username').style.display = 'none';
-			document.getElementById('row_wbmailer_smtp_password').style.display = 'none';
-		}
-	} else if(type == 'phpmail') {
-		document.getElementById('row_wbmailer_smtp_settings').style.display = 'none';
-		document.getElementById('row_wbmailer_smtp_host').style.display = 'none';
-		document.getElementById('row_wbmailer_smtp_auth_mode').style.display = 'none';
-		document.getElementById('row_wbmailer_smtp_username').style.display = 'none';
-		document.getElementById('row_wbmailer_smtp_password').style.display = 'none';
-	}
-}
-
-function toggle_wbmailer_auth() {
-	if( document.settings.wbmailer_smtp_auth.checked == true ) {
-		document.getElementById('row_wbmailer_smtp_username').style.display = '';
-		document.getElementById('row_wbmailer_smtp_password').style.display = '';
-	} else {
-		document.getElementById('row_wbmailer_smtp_username').style.display = 'none';
-		document.getElementById('row_wbmailer_smtp_password').style.display = 'none';
-	}
+function change_os(type) {
+	if(type == 'linux') {
+		document.getElementById('file_perms_box1').style.display = 'block';
+		document.getElementById('file_perms_box2').style.display = 'block';
+		document.getElementById('file_perms_box3').style.display = 'block';
+	} else if(type == 'windows') {
+		document.getElementById('file_perms_box1').style.display = 'none';
+		document.getElementById('file_perms_box2').style.display = 'none';
+		document.getElementById('file_perms_box3').style.display = 'none';
+	}
+}
+
+function change_wbmailer(type) {
+	if(type == 'smtp') {
+		document.getElementById('row_wbmailer_smtp_settings').style.display = '';
+		document.getElementById('row_wbmailer_smtp_host').style.display = '';
+		document.getElementById('row_wbmailer_smtp_auth_mode').style.display = '';
+		document.getElementById('row_wbmailer_smtp_username').style.display = '';
+		document.getElementById('row_wbmailer_smtp_password').style.display = '';
+		if( document.settings.wbmailer_smtp_auth.checked == true ) {
+			document.getElementById('row_wbmailer_smtp_username').style.display = '';
+			document.getElementById('row_wbmailer_smtp_password').style.display = '';
+		} else {
+			document.getElementById('row_wbmailer_smtp_username').style.display = 'none';
+			document.getElementById('row_wbmailer_smtp_password').style.display = 'none';
+		}
+	} else if(type == 'phpmail') {
+		document.getElementById('row_wbmailer_smtp_settings').style.display = 'none';
+		document.getElementById('row_wbmailer_smtp_host').style.display = 'none';
+		document.getElementById('row_wbmailer_smtp_auth_mode').style.display = 'none';
+		document.getElementById('row_wbmailer_smtp_username').style.display = 'none';
+		document.getElementById('row_wbmailer_smtp_password').style.display = 'none';
+	}
+}
+
+function toggle_wbmailer_auth() {
+	if( document.settings.wbmailer_smtp_auth.checked == true ) {
+		document.getElementById('row_wbmailer_smtp_username').style.display = '';
+		document.getElementById('row_wbmailer_smtp_password').style.display = '';
+	} else {
+		document.getElementById('row_wbmailer_smtp_username').style.display = 'none';
+		document.getElementById('row_wbmailer_smtp_password').style.display = 'none';
+	}
 }
\ No newline at end of file

Property changes on: branches/2.8.x/wb/admin/settings/setting.js
___________________________________________________________________
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/settings/index.php
===================================================================
--- branches/2.8.x/wb/admin/settings/index.php	(revision 1456)
+++ branches/2.8.x/wb/admin/settings/index.php	(revision 1457)
@@ -157,9 +157,11 @@
 	if($result->numRows() > 0)
 	{
 		while($addon = $result->fetchRow()) {
+	        $langIcons = (empty($addon['directory'])) ? 'none' : strtolower($addon['directory']);
+
 			$template->set_var('CODE',        $addon['directory']);
 			$template->set_var('NAME',        $addon['name']);
-			$template->set_var('FLAG',        THEME_URL.'/images/flags/'.strtolower($addon['directory']));
+			$template->set_var('FLAG',        THEME_URL.'/images/flags/'.$langIcons);
 			$template->set_var('SELECTED',    (DEFAULT_LANGUAGE == $addon['directory'] ? ' selected="selected"' : '') );
 			$template->parse('language_list', 'language_list_block', true);
 		}

Property changes on: branches/2.8.x/wb/admin/settings/index.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1,4 +1 ##
-Id
-Revision
-HeadURL
-Date
\ No newline at end of property
+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/users/save.php
===================================================================
--- branches/2.8.x/wb/admin/users/save.php	(revision 1456)
+++ branches/2.8.x/wb/admin/users/save.php	(revision 1457)
@@ -19,19 +19,19 @@
 // Print admin header
 require('../../config.php');
 require_once(WB_PATH.'/framework/class.admin.php');
-$admin = new admin('Access', 'users_modify');
+// suppress to print the header, so no new FTAN will be set
+$admin = new admin('Access', 'users_modify', false);
 
-
 // Create a javascript back link
 $js_back = ADMIN_URL.'/users/index.php';
 
-// Create new database object
-//$database = new database();
 if( !$admin->checkFTAN() )
 {
+	$admin->print_header();
 	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'],$js_back);
-	exit();
 }
+// After check print the header
+$admin->print_header();
 
 // Check if user id is a valid number and doesnt equal 1
 if(!isset($_POST['user_id']) OR !is_numeric($_POST['user_id']) OR $_POST['user_id'] == 1) {
Index: branches/2.8.x/wb/admin/users/add.php
===================================================================
--- branches/2.8.x/wb/admin/users/add.php	(revision 1456)
+++ branches/2.8.x/wb/admin/users/add.php	(revision 1457)
@@ -19,18 +19,18 @@
 // Print admin header
 require('../../config.php');
 require_once(WB_PATH.'/framework/class.admin.php');
-$admin = new admin('Access', 'users_add');
+// suppress to print the header, so no new FTAN will be set
+$admin = new admin('Access', 'users_add', false);
 
 // Create a javascript back link
 $js_back = ADMIN_URL.'/users/index.php';
 
-// Create new database object
-//$database = new database();
 if( !$admin->checkFTAN() )
 {
 	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], $js_back);
-	exit();
 }
+// After check print the header
+$admin->print_header();
 
 // Get details entered
 $groups_id = (isset($_POST['groups'])) ? implode(",", $admin->add_slashes($_POST['groups'])) : ''; //should check permissions
@@ -108,4 +108,4 @@
 // Print admin footer
 $admin->print_footer();
 
-?>
+
Index: branches/2.8.x/wb/admin/preferences/save.php
===================================================================
--- branches/2.8.x/wb/admin/preferences/save.php	(revision 1456)
+++ branches/2.8.x/wb/admin/preferences/save.php	(revision 1457)
@@ -21,7 +21,9 @@
 // Print admin header
 require('../../config.php');
 require_once(WB_PATH.'/framework/class.admin.php');
-$admin = new admin('Preferences');
+
+// suppress to print the header, so no new FTAN will be set
+$admin = new admin('Preferences','start', false);
 // $js_back = "javascript: history.go(-1);"; // Create a javascript back link
 
 function save_preferences( &$admin, &$database)
@@ -31,6 +33,8 @@
 	$min_pass_length = 6;
 // first check form-tan
 	if(!$admin->checkFTAN()){ $err_msg[] = $MESSAGE['GENERIC_SECURITY_ACCESS']; }
+// After check print the header
+	$admin->print_header();
 // Get entered values and validate all
 	// remove any dangerouse chars from display_name
 	$display_name     = $admin->add_slashes(strip_tags(trim($admin->get_post('display_name'))));
Index: branches/2.8.x/wb/admin/preferences/index.php
===================================================================
--- branches/2.8.x/wb/admin/preferences/index.php	(revision 1456)
+++ branches/2.8.x/wb/admin/preferences/index.php	(revision 1457)
@@ -51,9 +51,10 @@
 		$template->set_block('main_block', 'language_list_block', 'language_list');
 		while( $rec_lang = $res_lang->fetchRow() )
 		{
+	        $langIcons = (empty($rec_lang['directory'])) ? 'none' : strtolower($rec_lang['directory']);
 			$template->set_var('CODE',        $rec_lang['directory']);
 			$template->set_var('NAME',        $rec_lang['name']);
-			$template->set_var('FLAG',        THEME_URL.'/images/flags/'.strtolower($rec_lang['directory']));
+			$template->set_var('FLAG',        THEME_URL.'/images/flags/'.$langIcons);
 			$template->set_var('SELECTED',    (LANGUAGE == $rec_lang['directory'] ? ' selected="selected"' : '') );
 			$template->parse('language_list', 'language_list_block', true);
 		}
Index: branches/2.8.x/wb/admin/images/modify.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: branches/2.8.x/wb/admin/images/modify.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: branches/2.8.x/wb/admin/languages/uninstall.php
===================================================================
--- branches/2.8.x/wb/admin/languages/uninstall.php	(revision 1456)
+++ branches/2.8.x/wb/admin/languages/uninstall.php	(revision 1457)
@@ -23,6 +23,17 @@
 
 */
 
+// Setup admin object
+require('../../config.php');
+require_once(WB_PATH.'/framework/class.admin.php');
+$admin = new admin('Addons', 'languages_uninstall', false);
+if( !$admin->checkFTAN() )
+{
+	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']);
+}
+// After check print the header
+$admin->print_header();
+
 // Check if user selected language
 if(!isset($_POST['code']) OR $_POST['code'] == "") {
 	header("Location: index.php");
@@ -35,11 +46,6 @@
 	exit(0);
 }
 
-// Setup admin object
-require('../../config.php');
-require_once(WB_PATH.'/framework/class.admin.php');
-$admin = new admin('Addons', 'languages_uninstall');
-
 // Include the WB functions file
 require_once(WB_PATH.'/framework/functions.php');
 

Property changes on: branches/2.8.x/wb/admin/languages/uninstall.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1 +1 ##
-Id
\ No newline at end of property
+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/languages/details.php
===================================================================
--- branches/2.8.x/wb/admin/languages/details.php	(revision 1456)
+++ branches/2.8.x/wb/admin/languages/details.php	(revision 1457)
@@ -26,6 +26,16 @@
 // Include the config code
 require('../../config.php');
 
+// Print admin header
+require_once(WB_PATH.'/framework/class.admin.php');
+$admin = new admin('Addons', 'languages_view', false);
+if( !$admin->checkFTAN() )
+{
+	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']);
+}
+// After check print the header
+$admin->print_header();
+
 // Get language name
 if(!isset($_POST['code']) OR $_POST['code'] == "") {
 	$code = '';
@@ -45,10 +55,6 @@
 	exit(0);
 }
 
-// Print admin header
-require_once(WB_PATH.'/framework/class.admin.php');
-$admin = new admin('Addons', 'languages_view');
-
 // Setup language object
 $template = new Template(THEME_PATH.'/templates');
 $template->set_file('page', 'languages_details.htt');

Property changes on: branches/2.8.x/wb/admin/languages/details.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1 +1 ##
-Id
\ No newline at end of property
+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/languages/install.php
===================================================================
--- branches/2.8.x/wb/admin/languages/install.php	(revision 1456)
+++ branches/2.8.x/wb/admin/languages/install.php	(revision 1457)
@@ -23,12 +23,6 @@
 
 */
 
-// Check if user uploaded a file
-if(!isset($_FILES['userfile'])) {
-	header("Location: index.php");
-	exit(0);
-}
-
 // do not display notices and warnings during installation
 error_reporting(E_ALL ^ E_NOTICE ^ E_WARNING);
 
@@ -35,8 +29,20 @@
 // Setup admin object
 require('../../config.php');
 require_once(WB_PATH.'/framework/class.admin.php');
-$admin = new admin('Addons', 'languages_install');
+$admin = new admin('Addons', 'languages_install', false);
+if( !$admin->checkFTAN() )
+{
+	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']);
+}
+// After check print the header
+$admin->print_header();
 
+// Check if user uploaded a file
+if(!isset($_FILES['userfile'])) {
+	header("Location: index.php");
+	exit(0);
+}
+
 // Include the WB functions file
 require_once(WB_PATH.'/framework/functions.php');
 

Property changes on: branches/2.8.x/wb/admin/languages/install.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1 +1 ##
-Id
\ No newline at end of property
+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/languages/index.php
===================================================================
--- branches/2.8.x/wb/admin/languages/index.php	(revision 1456)
+++ branches/2.8.x/wb/admin/languages/index.php	(revision 1457)
@@ -64,18 +64,19 @@
 						);
 // insert urls
 $template->set_var(array(
-								'ADMIN_URL' => ADMIN_URL,
-								'WB_URL' => WB_URL,
-								'THEME_URL' => THEME_URL
-								)
-						);
+					'ADMIN_URL' => ADMIN_URL,
+					'WB_URL' => WB_URL,
+					'THEME_URL' => THEME_URL,
+					'FTAN' => $admin->getFTAN()
+				)
+			);
 // Insert language text and messages
 $template->set_var(array(
-	'URL_MODULES' => $admin->get_permission('modules') ? 
+	'URL_MODULES' => $admin->get_permission('modules') ?
 		'<a href="' . ADMIN_URL . '/modules/index.php">' . $MENU['MODULES'] . '</a>' : '',
-	'URL_ADVANCED' => $admin->get_permission('admintools') ? 
-		'<a href="' . ADMIN_URL . '/modules/index.php?advanced">' . $TEXT['ADVANCED'] . '</a>' : '',		
-	'URL_TEMPLATES' => $admin->get_permission('templates') ? 
+	'URL_ADVANCED' => $admin->get_permission('admintools') ?
+		'<a href="' . ADMIN_URL . '/modules/index.php?advanced">' . $TEXT['ADVANCED'] . '</a>' : '',
+	'URL_TEMPLATES' => $admin->get_permission('templates') ?
 		'<a href="' . ADMIN_URL . '/templates/index.php">' . $MENU['TEMPLATES'] . '</a>' : '',
 	'TEXT_INSTALL' => $TEXT['INSTALL'],
 	'TEXT_UNINSTALL' => $TEXT['UNINSTALL'],
@@ -90,5 +91,3 @@
 
 // Print admin footer
 $admin->print_footer();
-
-?>
\ No newline at end of file

Property changes on: branches/2.8.x/wb/admin/languages/index.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1 +1 ##
-Id
\ No newline at end of property
+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/addons/reload.php
===================================================================
--- branches/2.8.x/wb/admin/addons/reload.php	(revision 1456)
+++ branches/2.8.x/wb/admin/addons/reload.php	(revision 1457)
@@ -11,8 +11,8 @@
  * @platform        WebsiteBaker 2.8.x
  * @requirements    PHP 5.2.2 and higher
  * @version         $Id$
- * @filesource		$HeadURL:  $
- * @lastmodified    $Date:  $
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
  *
  */
 
@@ -52,13 +52,13 @@
 require_once(WB_PATH . '/languages/' . LANGUAGE .'.php');
 
 // create Admin object with admin header
-$admin = new admin('Addons', '', true, false);
+$admin = new admin('Addons', '', false, false);
 $js_back = ADMIN_URL . '/addons/index.php?advanced';
 
 if (!$admin->checkFTAN())
 {
+	$admin->print_header();
 	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'],$js_back);
-	exit();
 }
 
 /**
@@ -109,6 +109,7 @@
 
 			} else {
 				// provide error message and stop
+				$admin->print_header();
 				$admin->print_error($MESSAGE['ADDON']['ERROR_RELOAD'], $js_back);
 			}
 			break;
@@ -131,6 +132,7 @@
 				
 			} else {
 				// provide error message and stop
+				$admin->print_header();
 				$admin->print_error($MESSAGE['ADDON']['ERROR_RELOAD'], $js_back);
 			}
 			break;
@@ -138,6 +140,7 @@
 }
 
 // output success message
+$admin->print_header();
 $admin->print_success(implode($msg, '<br />'), $js_back);
 $admin->print_footer();
 

Property changes on: branches/2.8.x/wb/admin/addons/reload.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1 +1 ##
-Id
\ No newline at end of property
+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/addons/index.php
===================================================================
--- branches/2.8.x/wb/admin/addons/index.php	(revision 1456)
+++ branches/2.8.x/wb/admin/addons/index.php	(revision 1457)
@@ -1,99 +1,99 @@
-<?php
-/**
- *
- * @category        admin
- * @package         addons
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
- * @copyright       2009-2011, Website Baker Org. e.V.
- * @link			http://www.websitebaker2.org/
- * @license         http://www.gnu.org/licenses/gpl.html
- * @platform        WebsiteBaker 2.8.x
- * @requirements    PHP 5.2.2 and higher
- * @version         $Id$
- * @filesource		$HeadURL:  $
- * @lastmodified    $Date:  $
- *
- */
-
-require('../../config.php');
-require_once(WB_PATH.'/framework/class.admin.php');
-$admin = new admin('Addons', 'addons');
-
-// Setup template object
-$template = new Template(THEME_PATH.'/templates');
-$template->set_file('page', 'addons.htt');
-$template->set_block('page', 'main_block', 'main');
-
-// Insert values into the template object
-$template->set_var(array(
-		'ADMIN_URL' => ADMIN_URL,
-		'THEME_URL' => THEME_URL,
-		'WB_URL' => WB_URL
-	)
-);
-
-/**
- *	Setting up the blocks
- */
-$template->set_block('main_block', "modules_block", "modules");
-$template->set_block('main_block', "templates_block", "templates");
-$template->set_block('main_block', "languages_block", "languages");
-$template->set_block('main_block', "reload_block", "reload");
-
-/**
- *	Insert permission values into the template object
- *	Obsolete as we are using blocks ... see "parsing the blocks" section
- */
-$display_none = "style=\"display: none;\"";
-if($admin->get_permission('modules') != true) 	$template->set_var('DISPLAY_MODULES', $display_none);	
-if($admin->get_permission('templates') != true)	$template->set_var('DISPLAY_TEMPLATES', $display_none);
-if($admin->get_permission('languages') != true)	$template->set_var('DISPLAY_LANGUAGES', $display_none);
-if($admin->get_permission('admintools') != true)	$template->set_var('DISPLAY_ADVANCED', $display_none);
-
-if(!isset($_GET['advanced']) || $admin->get_permission('admintools') != true)
-	$template->set_var('DISPLAY_RELOAD', $display_none);
-
-/**
- *	Insert section names and descriptions
- */
-$template->set_var(array(
-	'ADDONS_OVERVIEW' => $MENU['ADDONS'],
-	'MODULES' => $MENU['MODULES'],
-	'TEMPLATES' => $MENU['TEMPLATES'],
-	'LANGUAGES' => $MENU['LANGUAGES'],
-	'MODULES_OVERVIEW' => $OVERVIEW['MODULES'],
-	'TEMPLATES_OVERVIEW' => $OVERVIEW['TEMPLATES'],
-	'LANGUAGES_OVERVIEW' => $OVERVIEW['LANGUAGES'],
-	'TXT_ADMIN_SETTINGS' => $TEXT['ADMIN'] . ' ' . $TEXT['SETTINGS'],
-	'MESSAGE_RELOAD_ADDONS' => $MESSAGE['ADDON']['RELOAD'],
-	'TEXT_RELOAD' => $TEXT['RELOAD'],
-	'RELOAD_URL' => ADMIN_URL . '/addons/reload.php',
-	'URL_ADVANCED' => $admin->get_permission('admintools')
-                ? '<a href="' . ADMIN_URL . '/addons/index.php?advanced">' . $TEXT['ADVANCED'] . '</a>' : '',
-	'ADVANCED_URL' => $admin->get_permission('admintools') ? ADMIN_URL . '/addons/index.php' : '',
-    'TEXT_ADVANCED' => $TEXT['ADVANCED'],
-	'FTAN'			=> $admin->getFTAN()
-	)
-);
-
-/**
- *	Parsing the blocks ...
- */
-if ( $admin->get_permission('modules') == true) $template->parse('main_block', "modules_block", true);
-if ( $admin->get_permission('templates') == true) $template->parse('main_block', "templates_block", true);
-if ( $admin->get_permission('languages') == true) $template->parse('main_block', "languages_block", true);
-if ( isset($_GET['advanced']) AND $admin->get_permission('admintools') == true) $template->parse('main_block', "reload_block", true);
-
-/**
- *	Parse template object
- */
-$template->parse('main', 'main_block', false);
-$template->pparse('output', 'page');
-
-/**
- *	Print admin footer
- */
-$admin->print_footer();
-
+<?php
+/**
+ *
+ * @category        admin
+ * @package         addons
+ * @author          WebsiteBaker Project
+ * @copyright       2004-2009, Ryan Djurovich
+ * @copyright       2009-2011, Website Baker Org. e.V.
+ * @link			http://www.websitebaker2.org/
+ * @license         http://www.gnu.org/licenses/gpl.html
+ * @platform        WebsiteBaker 2.8.x
+ * @requirements    PHP 5.2.2 and higher
+ * @version         $Id$
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
+ *
+ */
+
+require('../../config.php');
+require_once(WB_PATH.'/framework/class.admin.php');
+$admin = new admin('Addons', 'addons');
+
+// Setup template object
+$template = new Template(THEME_PATH.'/templates');
+$template->set_file('page', 'addons.htt');
+$template->set_block('page', 'main_block', 'main');
+
+// Insert values into the template object
+$template->set_var(array(
+		'ADMIN_URL' => ADMIN_URL,
+		'THEME_URL' => THEME_URL,
+		'WB_URL' => WB_URL
+	)
+);
+
+/**
+ *	Setting up the blocks
+ */
+$template->set_block('main_block', "modules_block", "modules");
+$template->set_block('main_block', "templates_block", "templates");
+$template->set_block('main_block', "languages_block", "languages");
+$template->set_block('main_block', "reload_block", "reload");
+
+/**
+ *	Insert permission values into the template object
+ *	Obsolete as we are using blocks ... see "parsing the blocks" section
+ */
+$display_none = "style=\"display: none;\"";
+if($admin->get_permission('modules') != true) 	$template->set_var('DISPLAY_MODULES', $display_none);	
+if($admin->get_permission('templates') != true)	$template->set_var('DISPLAY_TEMPLATES', $display_none);
+if($admin->get_permission('languages') != true)	$template->set_var('DISPLAY_LANGUAGES', $display_none);
+if($admin->get_permission('admintools') != true)	$template->set_var('DISPLAY_ADVANCED', $display_none);
+
+if(!isset($_GET['advanced']) || $admin->get_permission('admintools') != true)
+	$template->set_var('DISPLAY_RELOAD', $display_none);
+
+/**
+ *	Insert section names and descriptions
+ */
+$template->set_var(array(
+	'ADDONS_OVERVIEW' => $MENU['ADDONS'],
+	'MODULES' => $MENU['MODULES'],
+	'TEMPLATES' => $MENU['TEMPLATES'],
+	'LANGUAGES' => $MENU['LANGUAGES'],
+	'MODULES_OVERVIEW' => $OVERVIEW['MODULES'],
+	'TEMPLATES_OVERVIEW' => $OVERVIEW['TEMPLATES'],
+	'LANGUAGES_OVERVIEW' => $OVERVIEW['LANGUAGES'],
+	'TXT_ADMIN_SETTINGS' => $TEXT['ADMIN'] . ' ' . $TEXT['SETTINGS'],
+	'MESSAGE_RELOAD_ADDONS' => $MESSAGE['ADDON']['RELOAD'],
+	'TEXT_RELOAD' => $TEXT['RELOAD'],
+	'RELOAD_URL' => ADMIN_URL . '/addons/reload.php',
+	'URL_ADVANCED' => $admin->get_permission('admintools')
+                ? '<a href="' . ADMIN_URL . '/addons/index.php?advanced">' . $TEXT['ADVANCED'] . '</a>' : '',
+	'ADVANCED_URL' => $admin->get_permission('admintools') ? ADMIN_URL . '/addons/index.php' : '',
+    'TEXT_ADVANCED' => $TEXT['ADVANCED'],
+	'FTAN'			=> $admin->getFTAN()
+	)
+);
+
+/**
+ *	Parsing the blocks ...
+ */
+if ( $admin->get_permission('modules') == true) $template->parse('main_block', "modules_block", true);
+if ( $admin->get_permission('templates') == true) $template->parse('main_block', "templates_block", true);
+if ( $admin->get_permission('languages') == true) $template->parse('main_block', "languages_block", true);
+if ( isset($_GET['advanced']) AND $admin->get_permission('admintools') == true) $template->parse('main_block', "reload_block", true);
+
+/**
+ *	Parse template object
+ */
+$template->parse('main', 'main_block', false);
+$template->pparse('output', 'page');
+
+/**
+ *	Print admin footer
+ */
+$admin->print_footer();
+
 ?>
\ No newline at end of file

Property changes on: branches/2.8.x/wb/admin/addons/index.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1 +1 ##
-Id
\ No newline at end of property
+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/login/index.php
===================================================================
--- branches/2.8.x/wb/admin/login/index.php	(revision 1456)
+++ branches/2.8.x/wb/admin/login/index.php	(revision 1457)
@@ -38,26 +38,23 @@
 	$password_fieldname = 'password';
 }
 
-$thisApp = new Login(
-							array(
-									'MAX_ATTEMPS' => "3",
-									'WARNING_URL' => THEME_URL."/templates/warning.html",
-									'USERNAME_FIELDNAME' => $username_fieldname,
-									'PASSWORD_FIELDNAME' => $password_fieldname,
-									'REMEMBER_ME_OPTION' => SMART_LOGIN,
-									'MIN_USERNAME_LEN' => "2",
-									'MIN_PASSWORD_LEN' => "2",
-									'MAX_USERNAME_LEN' => "30",
-									'MAX_PASSWORD_LEN' => "30",
-									'LOGIN_URL' => ADMIN_URL."/login/index.php",
-									'DEFAULT_URL' => ADMIN_URL."/start/index.php",
-									'TEMPLATE_DIR' => THEME_PATH."/templates",
-									'TEMPLATE_FILE' => "login.htt",
-									'FRONTEND' => false,
-									'FORGOTTEN_DETAILS_APP' => ADMIN_URL."/login/forgot/index.php",
-									'USERS_TABLE' => TABLE_PREFIX."users",
-									'GROUPS_TABLE' => TABLE_PREFIX."groups",
-							)
-					);
-
-?>
\ No newline at end of file
+$thisApp = new Login( array(
+						'MAX_ATTEMPS' => "3",
+						'WARNING_URL' => THEME_URL."/templates/warning.html",
+						'USERNAME_FIELDNAME' => $username_fieldname,
+						'PASSWORD_FIELDNAME' => $password_fieldname,
+						'REMEMBER_ME_OPTION' => SMART_LOGIN,
+						'MIN_USERNAME_LEN' => "2",
+						'MIN_PASSWORD_LEN' => "2",
+						'MAX_USERNAME_LEN' => "30",
+						'MAX_PASSWORD_LEN' => "30",
+						'LOGIN_URL' => ADMIN_URL."/login/index.php",
+						'DEFAULT_URL' => ADMIN_URL."/start/index.php",
+						'TEMPLATE_DIR' => THEME_PATH."/templates",
+						'TEMPLATE_FILE' => "login.htt",
+						'FRONTEND' => false,
+						'FORGOTTEN_DETAILS_APP' => ADMIN_URL."/login/forgot/index.php",
+						'USERS_TABLE' => TABLE_PREFIX."users",
+						'GROUPS_TABLE' => TABLE_PREFIX."groups",
+				)
+		);
Index: branches/2.8.x/wb/admin/modules/uninstall.php
===================================================================
--- branches/2.8.x/wb/admin/modules/uninstall.php	(revision 1456)
+++ branches/2.8.x/wb/admin/modules/uninstall.php	(revision 1457)
@@ -11,8 +11,8 @@
  * @platform        WebsiteBaker 2.8.x
  * @requirements    PHP 5.2.2 and higher
  * @version         $Id$
- * @filesource		$HeadURL: http://svn.websitebaker2.org/branches/2.8.x/wb/admin/users/save.php $
- * @lastmodified    $Date: 2011-01-10 13:21:47 +0100 (Mo, 10. Jan 2011) $
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
  *
  */
 
@@ -19,7 +19,13 @@
 // Setup admin object
 require('../../config.php');
 require_once(WB_PATH.'/framework/class.admin.php');
-$admin = new admin('Addons', 'modules_uninstall');
+$admin = new admin('Addons', 'modules_uninstall', false);
+if( !$admin->checkFTAN() )
+{
+	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']);
+}
+// After check print the header
+$admin->print_header();
 
 // Check if user selected module
 if(!isset($_POST['file']) OR $_POST['file'] == "") {

Property changes on: branches/2.8.x/wb/admin/modules/uninstall.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1 +1 ##
-Id
\ No newline at end of property
+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/modules/manual_install.php
===================================================================
--- branches/2.8.x/wb/admin/modules/manual_install.php	(revision 1456)
+++ branches/2.8.x/wb/admin/modules/manual_install.php	(revision 1457)
@@ -21,9 +21,6 @@
  * check if there is anything to do
  */
 
-if (!(isset($_POST['action']) && in_array($_POST['action'], array('install', 'upgrade', 'uninstall')))) { die(header('Location: index.php?advanced')); }
-if (!(isset($_POST['file']) && $_POST['file'] != '' && (strpos($_POST['file'], '..') === false))){  die(header('Location: index.php?advanced'));  }
-
 /**
  * check if user has permissions to access this file
  */
@@ -33,6 +30,17 @@
 
 // check user permissions for admintools (redirect users with wrong permissions)
 $admin = new admin('Admintools', 'admintools', false, false);
+
+if (!(isset($_POST['action']) && in_array($_POST['action'], array('install', 'upgrade', 'uninstall')))) { die(header('Location: index.php?advanced')); }
+if (!(isset($_POST['file']) && $_POST['file'] != '' && (strpos($_POST['file'], '..') === false))){  die(header('Location: index.php?advanced'));  }
+
+$js_back = ADMIN_URL . '/modules/index.php?advanced';
+if( !$admin->checkFTAN() )
+{
+	$admin->print_header();
+	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'],$js_back);
+}
+
 if ($admin->get_permission('admintools') == false) { die(header('Location: ../../index.php')); }
 
 // check if the referer URL if available
@@ -52,7 +60,6 @@
 
 // create Admin object with admin header
 $admin = new admin('Addons', '', true, false);
-$js_back = ADMIN_URL . '/modules/index.php?advanced';
 
 /**
  * Manually execute the specified module file (install.php, upgrade.php or uninstall.php)
@@ -64,6 +71,7 @@
 $module_dir = $mod_path;
 if (!file_exists($mod_path . '/' . $_POST['action'] . '.php'))
 {
+	$admin->print_header();
     $admin->print_error($TEXT['NOT_FOUND'].': <tt>"'.htmlentities(basename($mod_path)).'/'.$_POST['action'].'.php"</tt> ', $js_back);
 }
 
@@ -77,17 +85,19 @@
 switch ($_POST['action'])
 {
 	case 'install':
+		// $admin->print_header();
 		$admin->print_success($msg, $js_back);
 		break;
 
 	case 'upgrade':
 		upgrade_module(basename($mod_path), false);
+		// $admin->print_header();
 		$admin->print_success($msg, $js_back);
 		break;
 	
 	case 'uninstall':
+		// $admin->print_header();
 		$admin->print_success($msg, $js_back);
 		break;
 }
 
-?>
\ No newline at end of file

Property changes on: branches/2.8.x/wb/admin/modules/manual_install.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1,4 +1 ##
-Id
-Revision
-HeadURL
-Date
\ No newline at end of property
+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/modules/details.php
===================================================================
--- branches/2.8.x/wb/admin/modules/details.php	(revision 1456)
+++ branches/2.8.x/wb/admin/modules/details.php	(revision 1457)
@@ -11,8 +11,8 @@
  * @platform        WebsiteBaker 2.8.x
  * @requirements    PHP 5.2.2 and higher
  * @version         $Id$
- * @filesource		$HeadURL: http://svn.websitebaker2.org/branches/2.8.x/wb/admin/users/save.php $
- * @lastmodified    $Date: 2011-01-10 13:21:47 +0100 (Mo, 10. Jan 2011) $
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
  *
  */
 
@@ -22,6 +22,12 @@
 require_once(WB_PATH.'/framework/class.admin.php');
 // No print admin header
 $admin = new admin('Addons', 'modules_view', false);
+if( !$admin->checkFTAN() )
+{
+	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']);
+}
+// After check print the header
+$admin->print_header();
 
 // Get module name
 if(!isset($_POST['file']) OR $_POST['file'] == "")
@@ -40,9 +46,6 @@
 	exit(0);
 }
 
-// Print admin header
-$admin = new admin('Addons', 'modules_view');
-
 // Setup module object
 $template = new Template(THEME_PATH.'/templates');
 $template->set_file('page', 'modules_details.htt');

Property changes on: branches/2.8.x/wb/admin/modules/details.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1 +1 ##
-Id
\ No newline at end of property
+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/modules/install.php
===================================================================
--- branches/2.8.x/wb/admin/modules/install.php	(revision 1456)
+++ branches/2.8.x/wb/admin/modules/install.php	(revision 1457)
@@ -16,12 +16,6 @@
  *
  */
 
-// Check if user uploaded a file
-if(!isset($_FILES['userfile'])) {
-	header("Location: index.php");
-	exit(0);
-}
-
 // do not display notices and warnings during installation
 error_reporting(E_ALL ^ E_NOTICE ^ E_WARNING);
 
@@ -28,8 +22,20 @@
 // Setup admin object
 require('../../config.php');
 require_once(WB_PATH.'/framework/class.admin.php');
-$admin = new admin('Addons', 'modules_install');
+$admin = new admin('Addons', 'modules_install', false);
+if( !$admin->checkFTAN() )
+{
+	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']);
+}
+// After check print the header
+$admin->print_header();
 
+// Check if user uploaded a file
+if(!isset($_FILES['userfile'])) {
+	header("Location: index.php");
+	exit(0);
+}
+
 // Include the WB functions file
 require_once(WB_PATH.'/framework/functions.php');
 

Property changes on: branches/2.8.x/wb/admin/modules/install.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1,4 +1 ##
-Id
-Revision
-HeadURL
-Date
\ No newline at end of property
+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/modules/index.php
===================================================================
--- branches/2.8.x/wb/admin/modules/index.php	(revision 1456)
+++ branches/2.8.x/wb/admin/modules/index.php	(revision 1457)
@@ -11,8 +11,8 @@
  * @platform        WebsiteBaker 2.8.x
  * @requirements    PHP 5.2.2 and higher
  * @version         $Id$
- * @filesource		$HeadURL: http://svn.websitebaker2.org/branches/2.8.x/wb/admin/modules/install.php $
- * @lastmodified    $Date: 2010-12-21 23:00:08 +0100 (Di, 21. Dez 2010) $
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
  *
  */
 
@@ -104,7 +104,8 @@
 $template->set_var(array(
 					'ADMIN_URL' => ADMIN_URL,
 					'WB_URL' => WB_URL,
-					'THEME_URL' => THEME_URL
+					'THEME_URL' => THEME_URL,
+					'FTAN' => $admin->getFTAN()
 					)
 				);
 // Insert language text and messages
@@ -132,5 +133,3 @@
 
 // Print admin footer
 $admin->print_footer();
-
-?>
\ No newline at end of file

Property changes on: branches/2.8.x/wb/admin/modules/index.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1 +1 ##
-Id
\ No newline at end of property
+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/admintools/modules.inc
===================================================================
--- branches/2.8.x/wb/admin/admintools/modules.inc	(nonexistent)
+++ branches/2.8.x/wb/admin/admintools/modules.inc	(revision 1457)
@@ -0,0 +1,8 @@
+# each line a single entry only!
+# list of all admintools which use FTAN
+code
+droplets
+output_filter
+jsadmin
+captcha_control
+pagecloner
\ No newline at end of file

Property changes on: branches/2.8.x/wb/admin/admintools/modules.inc
___________________________________________________________________
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/admintools/tool.php
===================================================================
--- branches/2.8.x/wb/admin/admintools/tool.php	(revision 1456)
+++ branches/2.8.x/wb/admin/admintools/tool.php	(revision 1457)
@@ -11,8 +11,8 @@
  * @platform        WebsiteBaker 2.8.x
  * @requirements    PHP 5.2.2 and higher
  * @version         $Id$
- * @filesource		$HeadURL:  $
- * @lastmodified    $Date:  $
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
  *
  */
 
@@ -20,20 +20,39 @@
 require_once(WB_PATH.'/framework/class.admin.php');
 require_once(WB_PATH.'/framework/functions.php');
 
-$admin = new admin('admintools', 'admintools');
-
 if(!isset($_GET['tool'])) {
 	header("Location: index.php");
 	exit(0);
+} else {
+	$array = array();
+	preg_match("/[a-z,_,a-z]+/i",$_GET['tool'],$array);
+	$tool = $array[0];
 }
 
+$list = array();
+if(isset($_POST['save_settings'])) {
+	$ModulesUsingFTAN = ADMIN_PATH.'/admintools/modules.inc';
+	if(file_exists($ModulesUsingFTAN)){
+		if(($list = file($ModulesUsingFTAN, FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES)) !== false)
+		{
+			// remove remark-lines
+			$list = preg_grep('/^\s*?[^#;]/', $list);
+		}
+	}
+}
+
+$admin_header = (in_array($tool, $list) ? false : true);
+$admin = new admin('admintools', 'admintools',$admin_header );
+unset($list);
+
 // Check if tool is installed
-$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'module' AND function = 'tool' AND directory = '".preg_replace("/\W/", "", $_GET['tool'])."'");
+$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'module' AND function = 'tool' AND directory = '".preg_replace("/\W/", "", $tool)."'");
 if($result->numRows() == 0) {
 	header("Location: index.php");
 	exit(0);
 }
 $tool = $result->fetchRow();
+if(!isset($_POST['save_settings'])) {
 
 ?>
 <h4>
@@ -42,8 +61,7 @@
 	<?php echo $tool['name']; ?>
 </h4>
 <?php
+}
 require(WB_PATH.'/modules/'.$tool['directory'].'/tool.php');
 
 $admin->print_footer();
-
-?>
\ No newline at end of file

Property changes on: branches/2.8.x/wb/admin/admintools/tool.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1 +1 ##
-Id
\ No newline at end of property
+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/admintools/index.php
===================================================================
--- branches/2.8.x/wb/admin/admintools/index.php	(revision 1456)
+++ branches/2.8.x/wb/admin/admintools/index.php	(revision 1457)
@@ -1,63 +1,61 @@
-<?php
-/**
- *
- * @category        admin
- * @package         admintools
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
- * @copyright       2009-2011, Website Baker Org. e.V.
- * @link			http://www.websitebaker2.org/
- * @license         http://www.gnu.org/licenses/gpl.html
- * @platform        WebsiteBaker 2.8.x
- * @requirements    PHP 5.2.2 and higher
- * @version         $Id$
- * @filesource		$HeadURL:  $
- * @lastmodified    $Date:  $
- *
- */
-
-require('../../config.php');
-require_once(WB_PATH.'/framework/class.admin.php');
-$admin = new admin('admintools', 'admintools');
-
-// Include the WB functions file
-require_once(WB_PATH.'/framework/functions.php');
-
-// Create new template object
-$template = new Template(THEME_PATH.'/templates');
-$template->set_file('page', 'admintools.htt');
-$template->set_block('page', 'main_block', 'main');
-
-// Insert required template variables
-$template->set_var('ADMIN_URL', ADMIN_URL);
-$template->set_var('THEME_URL', THEME_URL);
-$template->set_var('HEADING_ADMINISTRATION_TOOLS', $HEADING['ADMINISTRATION_TOOLS']);
-
-// Insert tools into tool list
-$template->set_block('main_block', 'tool_list_block', 'tool_list');
-$results = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'module' AND function = 'tool' order by name");
-if($results->numRows() > 0) {
-	while($tool = $results->fetchRow()) {
-		$template->set_var('TOOL_NAME', $tool['name']);
-		$template->set_var('TOOL_DIR', $tool['directory']);
-		// check if a module description exists for the displayed backend language
-		$tool_description = false;
-		if(function_exists('file_get_contents') && file_exists(WB_PATH.'/modules/'.$tool['directory'].'/languages/'.LANGUAGE .'.php')) {
-			// read contents of the module language file into string
-			$data = @file_get_contents(WB_PATH .'/modules/' .$tool['directory'] .'/languages/' .LANGUAGE .'.php');
-			$tool_description = get_variable_content('module_description', $data, true, false);
-		}		
-		$template->set_var('TOOL_DESCRIPTION', ($tool_description === False)? $tool['description'] :$tool_description);
-		$template->parse('tool_list', 'tool_list_block', true);
-	}
-} else {
-	$template->set_var('TOOL_LIST', $TEXT['NONE_FOUND']);	
-}
-
-// Parse template objects output
-$template->parse('main', 'main_block', false);
-$template->pparse('output', 'page');
-
-$admin->print_footer();
-
-?>
\ No newline at end of file
+<?php
+/**
+ *
+ * @category        admin
+ * @package         admintools
+ * @author          WebsiteBaker Project
+ * @copyright       2004-2009, Ryan Djurovich
+ * @copyright       2009-2011, Website Baker Org. e.V.
+ * @link			http://www.websitebaker2.org/
+ * @license         http://www.gnu.org/licenses/gpl.html
+ * @platform        WebsiteBaker 2.8.x
+ * @requirements    PHP 5.2.2 and higher
+ * @version         $Id$
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
+ *
+ */
+
+require('../../config.php');
+require_once(WB_PATH.'/framework/class.admin.php');
+$admin = new admin('admintools', 'admintools');
+
+// Include the WB functions file
+require_once(WB_PATH.'/framework/functions.php');
+
+// Create new template object
+$template = new Template(THEME_PATH.'/templates');
+$template->set_file('page', 'admintools.htt');
+$template->set_block('page', 'main_block', 'main');
+
+// Insert required template variables
+$template->set_var('ADMIN_URL', ADMIN_URL);
+$template->set_var('THEME_URL', THEME_URL);
+$template->set_var('HEADING_ADMINISTRATION_TOOLS', $HEADING['ADMINISTRATION_TOOLS']);
+
+// Insert tools into tool list
+$template->set_block('main_block', 'tool_list_block', 'tool_list');
+$results = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'module' AND function = 'tool' order by name");
+if($results->numRows() > 0) {
+	while($tool = $results->fetchRow()) {
+		$template->set_var('TOOL_NAME', $tool['name']);
+		$template->set_var('TOOL_DIR', $tool['directory']);
+		// check if a module description exists for the displayed backend language
+		$tool_description = false;
+		if(function_exists('file_get_contents') && file_exists(WB_PATH.'/modules/'.$tool['directory'].'/languages/'.LANGUAGE .'.php')) {
+			// read contents of the module language file into string
+			$data = @file_get_contents(WB_PATH .'/modules/' .$tool['directory'] .'/languages/' .LANGUAGE .'.php');
+			$tool_description = get_variable_content('module_description', $data, true, false);
+		}		
+		$template->set_var('TOOL_DESCRIPTION', ($tool_description === False)? $tool['description'] :$tool_description);
+		$template->parse('tool_list', 'tool_list_block', true);
+	}
+} else {
+	$template->set_var('TOOL_LIST', $TEXT['NONE_FOUND']);	
+}
+
+// Parse template objects output
+$template->parse('main', 'main_block', false);
+$template->pparse('output', 'page');
+
+$admin->print_footer();

Property changes on: branches/2.8.x/wb/admin/admintools/index.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1 +1 ##
-Id
\ No newline at end of property
+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/config.php
===================================================================
--- branches/2.8.x/wb/config.php	(revision 1456)
+++ branches/2.8.x/wb/config.php	(revision 1457)
@@ -1 +1 @@
-<?php ?>
\ No newline at end of file
+<?php
Index: branches/2.8.x/wb/framework/class.admin.php
===================================================================
--- branches/2.8.x/wb/framework/class.admin.php	(revision 1456)
+++ branches/2.8.x/wb/framework/class.admin.php	(revision 1457)
@@ -92,6 +92,8 @@
 		global $TEXT;
 		// Connect to database and get website title
 		global $database;
+		// $GLOBALS['FTAN'] = $this->getFTAN();
+		$this->createFTAN();
 		$get_title = $database->query("SELECT value FROM ".TABLE_PREFIX."settings WHERE name = 'website_title'");
 		$title = $get_title->fetchRow();
 		$header_template = new Template(THEME_PATH.'/templates');

Property changes on: branches/2.8.x/wb/framework/class.admin.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1,4 +1 ##
-Id
-Revision
-HeadURL
-Date
\ No newline at end of property
+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/framework/functions-utf8.php
===================================================================
--- branches/2.8.x/wb/framework/functions-utf8.php	(revision 1456)
+++ branches/2.8.x/wb/framework/functions-utf8.php	(revision 1457)

Property changes on: branches/2.8.x/wb/framework/functions-utf8.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1 +1 ##
-Id
\ No newline at end of property
+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/framework/module.functions.php
===================================================================
--- branches/2.8.x/wb/framework/module.functions.php	(revision 1456)
+++ branches/2.8.x/wb/framework/module.functions.php	(revision 1457)

Property changes on: branches/2.8.x/wb/framework/module.functions.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1 +1 ##
-Id
\ No newline at end of property
+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/framework/initialize.php
===================================================================
--- branches/2.8.x/wb/framework/initialize.php	(revision 1456)
+++ branches/2.8.x/wb/framework/initialize.php	(revision 1457)

Property changes on: branches/2.8.x/wb/framework/initialize.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1,4 +1 ##
-Id
-Revision
-HeadURL
-Date
\ No newline at end of property
+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/framework/DseTwo.php
===================================================================
--- branches/2.8.x/wb/framework/DseTwo.php	(nonexistent)
+++ branches/2.8.x/wb/framework/DseTwo.php	(revision 1457)
@@ -0,0 +1,314 @@
+<?php
+/**
+ * @category        ISTeasy
+ * @package         DatabaseSearchEngine 1
+ * @author          Werner von der Decken
+ * @copyright       2011, ISTeasy-project
+ * @license         http://www.gnu.org/licenses/gpl.html
+ * @version         $Id$
+ * @filesource		$HeadURL$
+ * @description     Searchengine to browse whoole database for text.
+ *                  Black- or whitelist is possible
+ *                  min requirements: PHP 5.2.2, mySQL 5.1
+ *                  this is a authorisised GPL-lizensed derivate from the original
+ *                  ISTeasy class DseOne which is available under a cc-by-sa-3.0 license
+*/
+
+class DseTwo {
+
+	const USE_ALL       = 0;
+	const USE_BLACKLIST = 1;
+	const USE_WHITELIST = 2;
+
+	const RETURN_UNUSED = 0;
+	const RETURN_USED   = 1;
+	/**
+	 *
+	 * @var object database 
+	 */
+	private $_db;
+	/**
+	 *
+	 * @var string prefix of tables to search for
+	 */
+	private $_TablePrefix;
+	/**
+	 *
+	 * @var string name of the database
+	 */
+	private $_db_name;
+	/**
+	 *
+	 * @var array list of unneeded tables.fields
+	 */
+	private $_ControllList;
+	private $_ControllListTyp;
+	private $_ControllListTypen = array('All','BlackList','WhiteList');
+
+	private $_Queries;
+	private $_BasePath = '';
+	private $_CachePath = '';
+	private $_TCacheFile = '';
+	private $_DCachePrefix = '';
+	private $_bUseCache = true;
+	/**
+	 *
+	 * @param object $database global database object
+	 */
+	public function __construct()
+	{
+		$this->_ControllList = array();
+		$this->_TCacheFile = 'Ie'.__CLASS__.'CacheTables';
+		$this->_DCachePrefix = 'Ie'.__CLASS__.'CacheDir';
+		$this->_Queries = array();
+	}
+	/**
+	 *
+	 * @param string $name name of the property
+	 *        (db_handle, db_name, table_prefix, base_dir, cache_dir, use_cache)
+	 * @param mixed $value value of the property
+	 */
+	public function  __set($name, $value) {
+
+		switch(strtolower($name)):
+			case 'db_handle':
+				if($value) { $this->_db = $value; }
+				break;
+			case 'db_name':
+				if($value != '') { $this->_db_name = $value; }
+				break;
+			case 'table_prefix':
+				if($value != '') { $this->_TablePrefix = $value; }
+				break;
+			case 'base_dir':
+				if($value != '') {
+					$this->_BasePath = rtrim(str_replace('\\', '/', $value) , '/');
+				}
+				break;
+			case 'cache_dir':
+				$value = rtrim(str_replace('\\', '/', $value) , '/');
+				if(!is_dir($value)) {
+					if(!mkdir($value, 0777, true)) {
+						$this->_CachePath = '';
+						$this->_bUseCache = false;
+						break;
+					}
+				}
+				if(is_writable($value)) {
+					$this->_CachePath = $value;
+					$this->_bUseCache = true;
+				}else {
+					$this->_CachePath = '';
+					$this->_bUseCache = false;
+				}
+				break;
+			default:
+				throw new InvalidArgumentException( __CLASS__.'::'.$name );
+				break;
+		endswitch;
+	}
+
+	/**
+	 * delete all table cache files
+	 */
+	public function clearCache()
+	{
+		foreach($this->_ControllListTypen as $type) {
+			$cFile = $this->_CachePath.'/'.$this->_TCacheFile.$type;
+			if(file_exists($cFile)) { @unlink($cFile); }
+		}
+	}
+	/**
+	 *
+	 * @param string $blacklist path/filename of the blacklist
+	 * @param int $type const USE_NO_LIST / USE_BLACKLIST / USE_WHITELIST
+	 * @return bool false if no or empty list is available
+	 */
+	public function addControllList($sControllList, $type = self::USE_BLACKLIST)
+	{
+		$this->_ControllList = array();
+		$this->_ControllListTyp = $type;
+		if(is_readable($sControllList)) {
+			if(($list = file($sControllList, FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES)) !== false)
+			{
+				$list = preg_grep('/^\s*?[^#;]/', $list);
+				$this->_ControllList = preg_replace('/^\s*?(.*)\s*?$/', $this->_TablePrefix.'$1', $list);
+				unset($list);
+			}
+		}else {
+			$this->_ControllListTyp = self::USE_ALL;
+		}
+		if(($type == self::USE_BLACKLIST) && (sizeof($this->_ControllList) > 0)) {
+			$this->_ControllListTyp = self::USE_ALL;
+		}
+		return (sizeof($this->_ControllList) > 0);
+	}
+	/**
+	 *
+	 * @param string $sDirToSearch directory to scan (relative to base_dir)
+	 * @param integer $bRetunMode select matching or unmatching files
+	 * @return array list of matching files
+	 */
+	public function getMatchesFromDir($sDirToSearch, $bRetunMode = self::RETURN_USED)
+	{
+		$aResultFileList = array();
+		$aNewFileList = array();
+		$sDirToSearch = trim(str_replace('\\', '/', $sDirToSearch) , '/');
+		$sPathToSearch = $this->_BasePath.'/'.$sDirToSearch;
+		$sCacheFile = $this->_DCachePrefix.$bRetunMode.urlencode('/'.$sDirToSearch);
+		$sCacheFile = $this->_CachePath.'/'.$sCacheFile;
+		if(sizeof($this->_Queries) <= 0) { $this->_getTableQueries(); }
+		// read fileList from directory
+		try{
+			foreach( new DirectoryIterator($sPathToSearch) as $fileinfo ) {
+			// at first collect all files from target directory
+				$fileName = $fileinfo->getFilename();
+				if(($fileinfo->isFile()) &&
+				   (!$fileinfo->isDot()) &&
+				   ($fileinfo->getFilename() != 'index.php')) {
+				   $aNewFileList[] = $fileinfo->getFilename();
+				}
+			}
+		}catch(UnexpectedValueException $e) {}
+		// make checksum of current directory
+		$bCacheValid = false;
+		if($this->_bUseCache) {
+			$checkSum = crc32(serialize($aNewFileList));
+			if(is_readable($sCacheFile)){
+			// read cachefile if available
+				$aResultFileList = unserialize(file_get_contents($sCacheFile));
+				if($checkSum == array_shift($aResultFileList)) {
+				// compare new checksum against checksum from cachefile
+					$bCacheValid = true;
+				}
+			}
+		}
+		if(!$bCacheValid) {
+		// skip this loop if valid cache is available
+			$aResultFileList = array();
+			while (list( , $sFilename) = each($aNewFileList)) {
+				// iterate all tables and search for filename
+				if( $this->_getMatch($sDirToSearch.'/'.$sFilename) !== false) {
+					if($bRetunMode == self::RETURN_USED) { $aResultFileList[] = $sFilename; }
+				}else {
+					if($bRetunMode == self::RETURN_UNUSED) { $aResultFileList[] = $sFilename; }
+				}
+			}
+			// calculate new checksum
+			$newCheckSum = crc32(serialize($aResultFileList));
+			// add checksum to array
+			array_unshift($aResultFileList,  $newCheckSum);
+			// try to write serialized array into new cachefile
+			if(file_put_contents($sCacheFile, serialize($aResultFileList)) === false) {
+				throw new RuntimeException();
+			}
+			// remove checksum again
+			array_shift($aResultFileList);
+		}
+		unset($aNewFileList);
+		return $aResultFileList;
+	}
+	/**
+	 *
+	 * @param <type> $sFilename
+	 * @return bool true if file found in db
+	 */
+	private function _getMatch($sFilename)
+	{
+		$result = 0;
+		$sFilename = str_replace('_', '\_', $sFilename);
+		$sSearch = '%'.str_replace('/', '_', $sFilename).'%';
+		while (list( , $sQuery) = each($this->_Queries)) {
+			$sql = sprintf($sQuery, $sSearch);
+			if( ($res = mysql_query($sql, $this->_db)) ) {
+				if( ($result = intval(mysql_fetch_array($res))) > 0 )  { break; }
+			}
+		}
+		return ($result != 0);
+	}
+	/**
+	 *
+	 */
+	private function _getTableQueries()
+	{
+		if($this->_bUseCache) {
+		// try to read queries from cace
+			$sCacheFile = $this->_CachePath.'/'.$this->_TCacheFile.$this->_ControllListTypen[$this->_ControllListTyp];
+			try {
+				if(is_readable($sCacheFile)) {
+					$this->_Queries = unserialize(file_get_contents($sCacheFile));
+				}
+			}catch(Exception $e) {
+				$this->_Queries = array();
+			}
+		}
+		if(sizeof($this->_Queries) > 0) { return; } // queries alreade loaded from cache
+		$TP = str_replace('_','\_', $this->_TablePrefix);
+		$sql  = 'SELECT TABLE_NAME `table`, COLUMN_NAME `column` ';
+		$sql .= 'FROM INFORMATION_SCHEMA.COLUMNS ';
+		$sql .= 'WHERE `table_schema` = \''.$this->_db_name.'\' AND ';
+		$sql .=        '`table_name` LIKE \''.$TP.'%\' AND ';
+		$sql .=        '(`data_type` LIKE \'%text\' OR ';
+		$sql .=           '(`data_type` = \'varchar\' AND `character_maximum_length` > 20)';
+		$sql .=        ')' ;
+		$sql .= 'ORDER BY `table`, `column`';
+		if(($res = mysql_query($sql, $this->_db))) {
+			$lastTable = '';
+			$aOrStatements = array();
+			$sPrefix = '';
+			while($rec = mysql_fetch_assoc($res))
+			{ // loop through all found tables/fields
+				$sTableColumn = $rec['table'].'.'.$rec['column'];
+				switch($this->_ControllListTyp):
+				// test against controll list
+					case self::USE_BLACKLIST:
+						$needRecord = true;
+						if(in_array($rec['table'], $this->_ControllList) ||
+						   in_array($sTableColumn, $this->_ControllList))
+						{
+							$needRecord = false;
+						}
+						break;
+					case self::USE_WHITELIST:
+						$needRecord = false;
+						if(in_array($rec['table'], $this->_ControllList) ||
+						   in_array($sTableColumn, $this->_ControllList))
+						{
+							$needRecord = true;
+						}
+						break;
+					default: // self::USE_ALL
+						$needRecord = true;
+						break;
+				endswitch;
+				if($needRecord) {
+					if($lastTable != $rec['table']) {
+						if(sizeof($aOrStatements)!= 0){
+						// close previous table
+							$this->_Queries[] = $sPrefix.implode(') OR (', $aOrStatements).')';
+						}
+					// start a new table
+						$sPrefix = 'SELECT COUNT(*) `count` FROM `'.$rec['table'].'` WHERE( ';
+						$aOrStatements = array();
+						$lastTable = $rec['table'];
+					}
+					// add table.column to query
+					$aOrStatements[] = '`'.$rec['table'].'`.`'.$rec['column'].'` LIKE \'%1$s\'';
+				}
+			}
+			if(sizeof($aOrStatements)!= 0){
+			// close last table
+				$this->_Queries[] = $sPrefix.implode(') OR (', $aOrStatements).')';
+			}
+			mysql_free_result($res);
+		}
+		if($this->_bUseCache) {
+		// try to write queries into the cache
+			if(file_put_contents($sCacheFile, serialize($this->_Queries)) === false) {
+				throw new RuntimeException('unable to write file ['.$sCacheFile.']');
+			}
+		}
+	}
+
+}
+?>

Property changes on: branches/2.8.x/wb/framework/DseTwo.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/framework/class.wbmailer.php
===================================================================
--- branches/2.8.x/wb/framework/class.wbmailer.php	(revision 1456)
+++ branches/2.8.x/wb/framework/class.wbmailer.php	(revision 1457)

Property changes on: branches/2.8.x/wb/framework/class.wbmailer.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1 +1 ##
-Id
\ No newline at end of property
+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/framework/index.php
===================================================================
--- branches/2.8.x/wb/framework/index.php	(revision 1456)
+++ branches/2.8.x/wb/framework/index.php	(revision 1457)

Property changes on: branches/2.8.x/wb/framework/index.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1 +1 ##
-Id
\ No newline at end of property
+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/framework/class.database.php
===================================================================
--- branches/2.8.x/wb/framework/class.database.php	(revision 1456)
+++ branches/2.8.x/wb/framework/class.database.php	(revision 1457)
@@ -11,8 +11,8 @@
  * @platform        WebsiteBaker 2.8.x
  * @requirements    PHP 5.2.2 and higher
  * @version         $Id$
- * @filesource      $HeadURL:  $
- * @lastmodified    $Date:  $
+ * @filesource      $HeadURL$
+ * @lastmodified    $Date$
  *
  */
 

Property changes on: branches/2.8.x/wb/framework/class.database.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1 +1 ##
-Id
\ No newline at end of property
+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/framework/functions.php
===================================================================
--- branches/2.8.x/wb/framework/functions.php	(revision 1456)
+++ branches/2.8.x/wb/framework/functions.php	(revision 1457)
@@ -676,7 +676,7 @@
 	return $string;
 }
 
-// Function to convert a desired media filename to a clean filename
+// Function to convert a desired media filename to a clean mediafilename
 function media_filename($string)
 {
 	require_once(WB_PATH.'/framework/functions-utf8.php');
@@ -703,15 +703,92 @@
 }
 
 // Create a new file in the pages directory
+function createFolderProtectFile($relative='',$make_dir=true)
+{
+	global $admin, $MESSAGE;
+	$retVal = array();
+    if($relative=='') { return $retVal;}
+
+	if ( $make_dir==true ) {
+		// Check to see if the folder already exists
+		if(file_exists($relative)) {
+			// $admin->print_error($MESSAGE['MEDIA_DIR_EXISTS']);
+			$retVal[] = $MESSAGE['MEDIA_DIR_EXISTS'];
+		}
+		if ( !make_dir($relative) ) {
+			// $admin->print_error($MESSAGE['MEDIA_DIR_NOT_MADE']);
+			$retVal[] = $MESSAGE['MEDIA_DIR_NOT_MADE'];
+		}
+	}
+
+	change_mode($relative);
+	if( is_writable($relative) )
+	{
+        if(file_exists($relative.'/index.php')) { unlink($relative.'/index.php'); }
+	    // Create default "index.php" file
+		$rel_pages_dir = str_replace(WB_PATH, '', dirname($relative) );
+		$step_back = str_repeat( '../', substr_count($rel_pages_dir, '/')+1 );
+
+		$sResponse  = $_SERVER['SERVER_PROTOCOL'].' 301 Moved Permanently';
+		$content =
+			'<?php'."\n".
+			'// *** This file is generated by WebsiteBaker Ver.'.VERSION."\n".
+			'// *** Creation date: '.date('c')."\n".
+			'// *** Do not modify this file manually'."\n".
+			'// *** WB will rebuild this file from time to time!!'."\n".
+			'// *************************************************'."\n".
+			"\t".'header(\''.$sResponse.'\');'."\n".
+			"\t".'header(\'Location: '.WB_URL.'/index.php\');'."\n".
+			'// *************************************************'."\n";
+		$filename = $relative.'/index.php';
+		// write content into file
+		if ($handle = fopen($filename, 'w')) {
+			fwrite($handle, $content);
+			fclose($handle);
+			change_mode($filename, 'file');
+		}
+		// $admin->print_success($MESSAGE['MEDIA']['DIR_MADE']);
+	} else {
+		// $admin->print_error($MESSAGE['GENERIC_BAD_PERMISSIONS']);
+			$retVal[] = '::'.$MESSAGE['GENERIC_BAD_PERMISSIONS'];
+	}
+	return $retVal;
+}
+
+// Rebuild a new file in the pages directory
+function rebuildFolderProtectFile($dir='')
+{
+	$retVal = array();
+    try {
+		$iterator = new RecursiveDirectoryIterator($dir);
+		foreach (new RecursiveIteratorIterator($iterator, RecursiveIteratorIterator::SELF_FIRST) as $file)
+		{
+		  if ($file->isDir()) {
+		     $protect_file = ($file->getPathname());
+		     $retVal[] = createFolderProtectFile($protect_file,false);
+		  } else {
+		     // print ($file->getPathname())."<br />";
+		  }
+		}
+	} catch ( Exception $e ) {
+		$retVal[] = $MESSAGE['MEDIA_DIR_ACCESS_DENIED'];
+	}
+
+    $retVal = array_merge($retVal);
+	return $retVal;
+}
+
+// Create a new file in the pages directory
 function create_access_file($filename,$page_id,$level)
 {
 	global $admin, $MESSAGE;
+/*
 	if(!is_writable(WB_PATH.PAGES_DIRECTORY.'/'))
 	{
 		$admin->print_error($MESSAGE['PAGES']['CANNOT_CREATE_ACCESS_FILE']);
-	}
-	else
-	{
+	} else {
+ 	}
+*/
 		// First make sure parent folder exists
 		$parent_folders = explode('/',str_replace(WB_PATH.PAGES_DIRECTORY, '', dirname($filename)));
 		$parents = '';
@@ -720,11 +797,14 @@
 			if($parent_folder != '/' AND $parent_folder != '')
 			{
 				$parents .= '/'.$parent_folder;
-				if(!file_exists(WB_PATH.PAGES_DIRECTORY.$parents))
-				{
-					make_dir(WB_PATH.PAGES_DIRECTORY.$parents);
+				$acces_file = WB_PATH.PAGES_DIRECTORY.$parents;
+				// can only be dirs
+				if(!file_exists($acces_file)) {
+					if(!make_dir($acces_file)) {
+						$admin->print_error($MESSAGE['PAGES']['CANNOT_CREATE_ACCESS_FILE_FOLDER']);
+					}
 				}
-			}	
+			}
 		}
 		// The depth of the page directory in the directory hierarchy
 		// '/pages' is at depth 1
@@ -735,24 +815,32 @@
 		{
 			$index_location .= '../';
 		}
-		$content = ''.
-'<?php
-$page_id = '.$page_id.';
-require("'.$index_location.'config.php");
-require(WB_PATH."/index.php");
-?>';
-		$handle = fopen($filename, 'w');
-		fwrite($handle, $content);
-		fclose($handle);
-		// Chmod the file
-		change_mode($filename);
-	}
-}
+		$content =
+			'<?php'."\n".
+			'// *** This file is generated by WebsiteBaker Ver.'.VERSION."\n".
+			'// *** Creation date: '.date('c')."\n".
+			'// *** Do not modify this file manually'."\n".
+			'// *** WB will rebuild this file from time to time!!'."\n".
+			'// *************************************************'."\n".
+			"\t".'$page_id    = '.$page_id.';'."\n".
+			"\t".'require(\''.$index_location.'index.php\');'."\n".
+			'// *************************************************'."\n";
 
+		if ($handle = fopen($filename, 'w')) {
+			fwrite($handle, $content);
+			fclose($handle);
+			// Chmod the file
+			change_mode($filename);
+		} else {
+			$admin->print_error($MESSAGE['PAGES']['CANNOT_CREATE_ACCESS_FILE']);
+		}
+	return;
+ }
+
 // Function for working out a file mime type (if the in-built PHP one is not enabled)
 if(!function_exists('mime_content_type'))
 {
-    function mime_content_type($filename) 
+    function mime_content_type($filename)
 	{
 	    $mime_types = array(
             'txt'	=> 'text/plain',

Property changes on: branches/2.8.x/wb/framework/functions.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1,4 +1 ##
-Id
-Revision
-HeadURL
-Date
\ No newline at end of property
+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/framework/SecureForm.php
===================================================================
--- branches/2.8.x/wb/framework/SecureForm.php	(revision 1456)
+++ branches/2.8.x/wb/framework/SecureForm.php	(revision 1457)
@@ -37,13 +37,14 @@
 		$this->_salt = $this->_generate_salt();
 		$this->_fingerprint = $this->_generate_fingerprint();
 	// generate names for session variables
-		$this->_ftan_name = substr($this->_fingerprint, -(16 + hexdec($this->_fingerprint[0])), 16);
+		$this->_ftan_name =
+			substr($this->_fingerprint, -(16 + hexdec($this->_fingerprint[0])), 16);
 	// make sure there is a alpha-letter at first position
-		$this->_ftan_name[0] = dechex(10 + (hexdec($this->_ftan_name[0]) % 5));
-		$this->_idkey_name = substr($this->_fingerprint,
-				                    hexdec($this->_fingerprint[strlen($this->_fingerprint)-1]), 16);
+		$this->_ftan_name = $this->_makeFirst2Letter($this->_ftan_name);
+		$this->_idkey_name = 
+			substr($this->_fingerprint, hexdec($this->_fingerprint[strlen($this->_fingerprint)-1]), 16);
 	// make sure there is a alpha-letter at first position
-		$this->_idkey_name[0] = dechex(10 + (hexdec($this->_idkey_name[0]) % 5));
+		$this->_idkey_name = $this->_makeFirst2Letter($this->_idkey_name);
 	// takeover id_keys from session if available
 		if(isset($_SESSION[$this->_idkey_name]) && is_array($_SESSION[$this->_idkey_name]))
 		{
@@ -54,6 +55,12 @@
 		}
 	}
 
+	private function _makeFirst2Letter($string)
+	{
+		$string[0] = dechex(10 + (hexdec($string[0]) % 5));
+		return $string;
+	}
+
 	private function _generate_salt()
 	{
 		if(function_exists('microtime'))
@@ -79,7 +86,7 @@
 		$fingerprint .= PHP_VERSION;
 	// client depending values
 		$fingerprint .= ( isset($_SERVER['HTTP_USER_AGENT']) ) ? $_SERVER['HTTP_USER_AGENT'] : '17';
-		$usedOctets = ( defined('FINGERPRINT_WITH_IP_OCTETS') ) ? intval(defined('FINGERPRINT_WITH_IP_OCTETS')) : 0;
+		$usedOctets = ( defined('FINGERPRINT_WITH_IP_OCTETS') ) ? (intval(FINGERPRINT_WITH_IP_OCTETS) % 5) : 2;
 		$clientIp = ( isset($_SERVER['REMOTE_ADDR'])  ? $_SERVER['REMOTE_ADDR'] : '' );
 		if(($clientIp != '') && ($usedOctets > 0)){
 			$ip = explode('.', $clientIp);
@@ -96,20 +103,17 @@
 	{
 		$ftan = md5($tanPart . $this->_fingerprint);
 		$name = substr($ftan, -(16 + hexdec($ftan[0])), 16);
-		$name[0] = dechex(10 + (hexdec($name[0]) % 5));
+		$name = $this->_makeFirst2Letter($name);
 		$value = substr($ftan, hexdec($ftan[strlen($ftan)-1]), 16);
 		return array( $name, $value);
 	}
-/*
+/**
  * creates Formular transactionnumbers for unique use
- * @access public
- * @param bool $asTAG: true returns a complete prepared, hidden HTML-Input-Tag (default)
- *                     false returns an GET argument 'key=value'
- * @return mixed:      array or string
  *
+ * @return void
  * requirements: an active session must be available
  */
-	final public function getFTAN( $as_tag = true)
+	final protected function createFTAN()
 	{
 		if( $this->_FTAN == '')
 		{ // if no FTAN exists, create new one from time and salt
@@ -116,11 +120,21 @@
 			$this->_FTAN = md5($this->_fingerprint.$this->_salt);
 			$_SESSION[$this->_ftan_name] = $this->_FTAN; // store FTAN into session
 		}
+	}
+/*
+ * returns the current FTAN
+ * @access public
+ * @param bool $mode: true or POST returns a complete prepared, hidden HTML-Input-Tag (default)
+ *                    false or GET returns an GET argument 'key=value'
+ * @return mixed:     array or string
+ */
+	final public function getFTAN( $mode = 'POST')
+	{
 		$ftan = $this->_calcFtan($this->_FTAN);
-		if($as_tag == true)
+		if((is_string($mode) && strtolower($mode) == 'post') || ($mode === true))
 		{ // by default return a complete, hidden <input>-tag
 			return '<input type="hidden" name="'.$ftan[0].'" value="'.$ftan[1].'" title="" alt="" />';
-		}else{ // return an array with raw FTAN0 and FTAN1
+		}else{ // return an string with GET params (FTAN0=FTAN1)
 			return $ftan[0].'='.$ftan[1];
 		}
 	}
@@ -137,16 +151,18 @@
 	final public function checkFTAN( $mode = 'POST')
 	{
 		$retval = false;
-		if(isset($_SESSION[$this->_ftan_name]) &&
-		   (strlen($_SESSION[$this->_ftan_name]) == strlen(md5('dummy'))))
+		if(isset($_SESSION[$this->_ftan_name]))
 		{
-			$ftan = $this->_calcFtan($_SESSION[$this->_ftan_name]);
-			unset($_SESSION[$this->_ftan_name]);
-			$mode = (strtoupper($mode) != 'POST' ? '_GET' : '_POST');
-			if( isset($GLOBALS[$mode][$ftan[0]]))
+			if( $_SESSION[$this->_ftan_name] && (strlen($_SESSION[$this->_ftan_name]) == strlen(md5('dummy'))))
 			{
-				$retval = ($GLOBALS[$mode][$ftan[0]] == $ftan[1]);
-				unset($GLOBALS[$mode][$ftan[0]]);
+				$ftan = $this->_calcFtan($_SESSION[$this->_ftan_name]);
+				unset($_SESSION[$this->_ftan_name]);
+				$mode = (strtoupper($mode) != 'POST' ? '_GET' : '_POST');
+				if( isset($GLOBALS[$mode][$ftan[0]]))
+				{
+					$retval = ($GLOBALS[$mode][$ftan[0]] == $ftan[1]);
+					unset($GLOBALS[$mode][$ftan[0]]);
+				}
 			}
 		}
 		return $retval;
@@ -211,6 +227,7 @@
 			default:
 				$key = $fieldname;
 		}
+
 		if( preg_match('/[0-9a-f]{16}$/', $key) )
 		{ // key must be a 16-digit hexvalue
 			if( array_key_exists($key, $this->_IDKEYs))
Index: branches/2.8.x/wb/framework/class.login.php
===================================================================
--- branches/2.8.x/wb/framework/class.login.php	(revision 1456)
+++ branches/2.8.x/wb/framework/class.login.php	(revision 1457)

Property changes on: branches/2.8.x/wb/framework/class.login.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1,4 +1 ##
-Id
-Revision
-HeadURL
-Date
\ No newline at end of property
+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/framework/class.wb.php
===================================================================
--- branches/2.8.x/wb/framework/class.wb.php	(revision 1456)
+++ branches/2.8.x/wb/framework/class.wb.php	(revision 1457)
@@ -11,8 +11,8 @@
  * @platform        WebsiteBaker 2.8.x
  * @requirements    PHP 5.2.2 and higher
  * @version         $Id$
- * @filesource		$HeadURL: $
- * @lastmodified    $Date:  $
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
  *
  */
 
@@ -31,8 +31,7 @@
 class wb extends SecureForm
 {
 
-	public $password_chars = 'a-zA-Z0-9\_\-\!\#\*\+';
-	// General initialization function
+ 	public $password_chars = 'a-zA-Z0-9\_\-\!\#\*\+\@\$\&\:';	// General initialization function
 	// performed when frontend or backend is loaded.
 
 	public function  __construct($mode = SecureForm::FRONTEND) {
@@ -400,6 +399,7 @@
 	    }
 	    $tpl->parse( 'main', 'main_block', false );
 	    $tpl->pparse( 'output', 'page' );
+		exit();
 	}
 
 	// Print an error message

Property changes on: branches/2.8.x/wb/framework/class.wb.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1 +1 ##
-Id
\ No newline at end of property
+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/framework/class.order.php
===================================================================
--- branches/2.8.x/wb/framework/class.order.php	(revision 1456)
+++ branches/2.8.x/wb/framework/class.order.php	(revision 1457)

Property changes on: branches/2.8.x/wb/framework/class.order.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1 +1 ##
-Id
\ No newline at end of property
+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/framework/addon.precheck.inc.php
===================================================================
--- branches/2.8.x/wb/framework/addon.precheck.inc.php	(revision 1456)
+++ branches/2.8.x/wb/framework/addon.precheck.inc.php	(revision 1457)

Property changes on: branches/2.8.x/wb/framework/addon.precheck.inc.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1,4 +1 ##
-Id
-Revision
-HeadURL
-Date
\ No newline at end of property
+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/framework/get_rel.php
===================================================================
--- branches/2.8.x/wb/framework/get_rel.php	(nonexistent)
+++ branches/2.8.x/wb/framework/get_rel.php	(revision 1457)
@@ -0,0 +1,38 @@
+<?php
+function debug_info ($var, $title='')
+{
+print '<pre><strong>function '.__FUNCTION__.'('.$title.');</strong> line: '.__LINE__.' -> ';
+print_r( $var ); print '</pre>'; // die();
+}
+
+function getBaseUrl()
+{
+	global $mod_path;
+	// identify Server Document_Root
+/*
+	define('PATH_thisScript', str_replace('//', '/', str_replace('\\', '/', (PHP_SAPI == 'fpm-fcgi' || PHP_SAPI == 'cgi' || PHP_SAPI == 'isapi' || PHP_SAPI == 'cgi-fcgi') &&
+		($_SERVER['ORIG_PATH_TRANSLATED'] ? $_SERVER['ORIG_PATH_TRANSLATED'] : $_SERVER['PATH_TRANSLATED']) ?
+		($_SERVER['ORIG_PATH_TRANSLATED'] ? $_SERVER['ORIG_PATH_TRANSLATED'] : $_SERVER['PATH_TRANSLATED']) :
+		($_SERVER['ORIG_SCRIPT_FILENAME'] ? $_SERVER['ORIG_SCRIPT_FILENAME'] : $_SERVER['SCRIPT_FILENAME']))));
+	define('PATH_site', dirname(PATH_thisScript) . '/');
+*/
+	// on WIN/IIS create this entry
+    $script_name = str_replace('\\', '/',dirname(dirname(__FILE__)));
+	$sys_root = ( !isset($_SERVER['DOCUMENT_ROOT']) && $_SERVER['DOCUMENT_ROOT'] == '' ) ? (str_replace('\\', '/', $script_name)) : str_replace('\\', '/',$_SERVER['DOCUMENT_ROOT']);
+
+    $_SERVER['DOCUMENT_ROOT'] = $sys_root;
+
+	$wb_rel = str_replace( $sys_root, '' ,($script_name));
+
+	$mod_path = (!empty($mod_path)) ? $mod_path : '/' ;
+	$regex = '/(?=\\'.$mod_path.').*/i';
+	$replace = '';
+	$wb_rel = preg_replace ($regex, $replace, $wb_rel, -1 );
+	$wb_rel = str_replace('//', '/', $wb_rel );
+	if(!defined('WB_REL')) {define('WB_REL', $wb_rel);}
+	if(!defined('ADMIN_REL')) {define('ADMIN_REL', $wb_rel.'/admin');}
+
+}
+
+getBaseUrl( );
+

Property changes on: branches/2.8.x/wb/framework/get_rel.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/framework/class.frontend.php
===================================================================
--- branches/2.8.x/wb/framework/class.frontend.php	(revision 1456)
+++ branches/2.8.x/wb/framework/class.frontend.php	(revision 1457)

Property changes on: branches/2.8.x/wb/framework/class.frontend.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1,4 +1 ##
-Id
-Revision
-HeadURL
-Date
\ No newline at end of property
+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/framework/charsets_table.php
===================================================================
--- branches/2.8.x/wb/framework/charsets_table.php	(revision 1456)
+++ branches/2.8.x/wb/framework/charsets_table.php	(revision 1457)

Property changes on: branches/2.8.x/wb/framework/charsets_table.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1 +1 ##
-Id
\ No newline at end of property
+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/framework/frontend.functions.php
===================================================================
--- branches/2.8.x/wb/framework/frontend.functions.php	(revision 1456)
+++ branches/2.8.x/wb/framework/frontend.functions.php	(revision 1457)

Property changes on: branches/2.8.x/wb/framework/frontend.functions.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1,4 +1 ##
-Id
-Revision
-HeadURL
-Date
\ No newline at end of property
+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/templates/wb_theme/images/pic_exist_16.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: branches/2.8.x/wb/templates/wb_theme/images/pic_exist_16.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: branches/2.8.x/wb/templates/wb_theme/images/files/blank_16.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: branches/2.8.x/wb/templates/wb_theme/images/files/blank_16.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: branches/2.8.x/wb/templates/wb_theme/images/files/blank_16.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/gif

Property changes on: branches/2.8.x/wb/templates/wb_theme/images/files/blank_16.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/gif
\ No newline at end of property
Index: branches/2.8.x/wb/templates/wb_theme/images/1x1.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/gif

Property changes on: branches/2.8.x/wb/templates/wb_theme/images/1x1.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/gif
\ No newline at end of property
Index: branches/2.8.x/wb/templates/wb_theme/images/blank_16.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/gif

Property changes on: branches/2.8.x/wb/templates/wb_theme/images/blank_16.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/gif
\ No newline at end of property
Index: branches/2.8.x/wb/templates/wb_theme/images/pic_16.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: branches/2.8.x/wb/templates/wb_theme/images/pic_16.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: branches/2.8.x/wb/templates/wb_theme/theme.css
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/theme.css	(revision 1456)
+++ branches/2.8.x/wb/templates/wb_theme/theme.css	(revision 1457)
@@ -149,3 +149,10 @@
 #new_password_2,
 #current_password {width:640px;}
 
+.section-info { margin : 1.5em 0; }
+
+.rounded { border-radius :10px; -khtml-border-radius :10px; -webkit-border-radius :10px; -moz-border-radius :10px; }
+.msg-box { background : #e5ffe6; border :0.2em #009900 solid; color :#336600; margin-bottom :1em; padding :0.63em; text-align :center; }
+.error-box { background :#fee; border :0.2em #844 solid; color :#400; margin-bottom :1em; padding :0.63em; text-align :center; }
+.bigger { font-size :150%; }
+.strong { font-weight :bold; }
\ No newline at end of file
Index: branches/2.8.x/wb/templates/wb_theme/templates/error.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/error.htt	(revision 1456)
+++ branches/2.8.x/wb/templates/wb_theme/templates/error.htt	(revision 1457)
@@ -1,6 +1,6 @@
 <!-- BEGIN main_block -->
-<div style="text-align:center;">
-	{MESSAGE}<br />
-	<h3 style="text-align:center;"><a href="{LINK}">{BACK}</a></h3>
+<div class="error-box rounded">
+	<p>{MESSAGE}</p>
+	<input type="button" name="submit" value="{BACK}" onclick="javascript: window.location = '{LINK}';" />
 </div>
 <!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/wb_theme/templates/media_browse.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/media_browse.htt	(revision 1456)
+++ branches/2.8.x/wb/templates/wb_theme/templates/media_browse.htt	(revision 1457)
@@ -66,6 +66,7 @@
 			<th align="right" width="80" class="headline">{TEXT_DATE}</th>
 			<th align="right" width="40" class="headline">{TEXT_RENAME}</th>
 			<th align="right" width="40" class="headline">{TEXT_DELETE}</th>
+			<th align="right" width="40" class="headline">&nbsp;</th>
 		</tr>
 	</thead>
 	<tbody>
@@ -91,6 +92,9 @@
 					<img src="{THEME_URL}/images/delete_16.png" alt="" border="0" />
 				</a>
 			</td>
+   <td width="16" align="right" class="">
+	   <img src="{THEME_URL}/images/{IMAGE_EXIST}" title="{IMAGE_TITLE}" alt="{IMAGE_TITLE}" />
+   </td>
 		</tr>
 		<!-- END list_block -->
 	</tbody>
Index: branches/2.8.x/wb/templates/wb_theme/templates/languages.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/languages.htt	(revision 1456)
+++ branches/2.8.x/wb/templates/wb_theme/templates/languages.htt	(revision 1457)
@@ -5,9 +5,8 @@
 </div>
 
 <form name="install" enctype="multipart/form-data" action="install.php" method="post" class="{DISPLAY_INSTALL}">
-
+{FTAN}
 <h2>{HEADING_INSTALL_LANGUAGE}</h2>
-
 <table summary="" cellpadding="2" cellspacing="0" border="0" width="100%">
 <tr>
 	<td>
@@ -27,7 +26,7 @@
 </form>
 
 <form name="uninstall" action="uninstall.php" method="post" class="{DISPLAY_UNINSTALL}">
-
+{FTAN}
 <h2>{HEADING_UNINSTALL_LANGUAGE}</h2>
 
 <table summary="" cellpadding="2" cellspacing="0" border="0" width="100%">
@@ -51,7 +50,7 @@
 </form>
 
 <form name="details" action="details.php" method="post" class="{DISPLAY_LIST}">
-
+{FTAN}
 <h2>{HEADING_LANGUAGE_DETAILS}</h2>
 
 <table summary="" cellpadding="2" cellspacing="0" border="0" width="100%">
Index: branches/2.8.x/wb/templates/wb_theme/templates/modules.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/modules.htt	(revision 1456)
+++ branches/2.8.x/wb/templates/wb_theme/templates/modules.htt	(revision 1457)
@@ -5,7 +5,7 @@
 </div>
 
 <form name="install" enctype="multipart/form-data" action="install.php" method="post" class="{DISPLAY_INSTALL}">
-
+{FTAN}
 <h2>{HEADING_INSTALL_MODULE}</h2>
 
 <table summary="" cellpadding="2" cellspacing="0" border="0" width="100%">
@@ -29,7 +29,7 @@
 </form>
 
 <form name="uninstall" action="uninstall.php" method="post" class="{DISPLAY_UNINSTALL}">
-
+{FTAN}
 <h2>{HEADING_UNINSTALL_MODULE}</h2>
 
 <table summary="" cellpadding="2" cellspacing="0" border="0" width="100%">
@@ -53,7 +53,7 @@
 </form>
 
 <form name="details" action="details.php" method="post" class="{DISPLAY_LIST}">
-
+{FTAN}
 <h2>{HEADING_MODULE_DETAILS}</h2>
 
 <table summary="" cellpadding="2" cellspacing="0" border="0" width="100%">
@@ -80,6 +80,7 @@
 <p>{TEXT_MANUAL_INSTALLATION}</p>
 
 <form name="manual_install" action="manual_install.php" method="post" class="{INSTALL_VISIBLE}">
+{FTAN}
 	<strong>{TEXT_FILE}:</strong> "install.php"&nbsp;&nbsp;&nbsp;
 	<input type="hidden" name="action" value="install" />
 	<select name="file" style="width: 250px;">
@@ -92,6 +93,7 @@
 </form>
 
 <form name="manual_upgrade" action="manual_install.php" method="post" class="{UPGRADE_VISIBLE}">
+{FTAN}
 	<br />{TEXT_FILE}: "upgrade.php"
 	<input type="hidden" name="action" value="upgrade" />
 	<select name="file" style="width: 250px;">
@@ -104,6 +106,7 @@
 </form>
 
 <form name="manual_uninstall" action="manual_install.php" method="post" class="{UNINSTALL_VISIBLE}">
+{FTAN}
 	<br />{TEXT_FILE}: "uninstall.php"
 	<input type="hidden" name="action" value="uninstall" />
 	<select name="file" style="width: 250px;">
Index: branches/2.8.x/wb/templates/wb_theme/templates/success.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/success.htt	(revision 1456)
+++ branches/2.8.x/wb/templates/wb_theme/templates/success.htt	(revision 1457)
@@ -1,11 +1,11 @@
 <!-- BEGIN main_block -->
-<div class="error_box">
- {MESSAGE}<br />
+<div class="msg-box rounded">
+	<p>{MESSAGE}</p>
 <!-- BEGIN show_redirect_block -->
  <script type="text/javascript">
   setTimeout("location.href='{REDIRECT}'", {REDIRECT_TIMER});
  </script>
 <!-- END show_redirect_block -->
- <h3 style="text-align:center;"><a href="{REDIRECT}" title="{NEXT}">{BACK}</a></h3>
+<input type="button" name="submit" value="{BACK}" onclick="javascript: window.location = '{REDIRECT}';" />
 </div>
 <!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/argos_theme/info.php
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/info.php	(revision 1456)
+++ branches/2.8.x/wb/templates/argos_theme/info.php	(revision 1457)
@@ -30,7 +30,7 @@
 $template_directory			= 'argos_theme';
 $template_name				= 'argos_theme';
 $template_function			= 'theme';
-$template_version			= '1.5';
+$template_version			= '1.6';
 $template_platform			= '2.8';
 $template_author			= 'Jurgen Nijhuis (Argos Media) & Ruud Eisinga';
 $template_license			= '<a href="http://www.gnu.org/licenses/gpl.html">GNU General Public License</a>';
Index: branches/2.8.x/wb/templates/argos_theme/images/pic_exist_16.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: branches/2.8.x/wb/templates/argos_theme/images/pic_exist_16.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: branches/2.8.x/wb/templates/argos_theme/images/files/fh.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: branches/2.8.x/wb/templates/argos_theme/images/files/fh.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: branches/2.8.x/wb/templates/argos_theme/images/files/fh10.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: branches/2.8.x/wb/templates/argos_theme/images/files/fh10.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: branches/2.8.x/wb/templates/argos_theme/images/files/mp3.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: branches/2.8.x/wb/templates/argos_theme/images/files/mp3.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: branches/2.8.x/wb/templates/argos_theme/images/files/aif.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: branches/2.8.x/wb/templates/argos_theme/images/files/aif.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: branches/2.8.x/wb/templates/argos_theme/images/files/ppt.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: branches/2.8.x/wb/templates/argos_theme/images/files/ppt.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: branches/2.8.x/wb/templates/argos_theme/images/files/html.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: branches/2.8.x/wb/templates/argos_theme/images/files/html.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: branches/2.8.x/wb/templates/argos_theme/images/files/doc.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: branches/2.8.x/wb/templates/argos_theme/images/files/doc.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: branches/2.8.x/wb/templates/argos_theme/images/files/gif.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: branches/2.8.x/wb/templates/argos_theme/images/files/gif.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: branches/2.8.x/wb/templates/argos_theme/images/files/xls.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: branches/2.8.x/wb/templates/argos_theme/images/files/xls.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: branches/2.8.x/wb/templates/argos_theme/images/files/asf.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: branches/2.8.x/wb/templates/argos_theme/images/files/asf.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: branches/2.8.x/wb/templates/argos_theme/images/files/ogg.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: branches/2.8.x/wb/templates/argos_theme/images/files/ogg.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: branches/2.8.x/wb/templates/argos_theme/images/files/vcd.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: branches/2.8.x/wb/templates/argos_theme/images/files/vcd.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: branches/2.8.x/wb/templates/argos_theme/images/files/txt.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: branches/2.8.x/wb/templates/argos_theme/images/files/txt.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: branches/2.8.x/wb/templates/argos_theme/images/files/tif.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: branches/2.8.x/wb/templates/argos_theme/images/files/tif.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: branches/2.8.x/wb/templates/argos_theme/images/files/rar.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: branches/2.8.x/wb/templates/argos_theme/images/files/rar.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: branches/2.8.x/wb/templates/argos_theme/images/files/cda.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: branches/2.8.x/wb/templates/argos_theme/images/files/cda.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: branches/2.8.x/wb/templates/argos_theme/images/files/tiff.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: branches/2.8.x/wb/templates/argos_theme/images/files/tiff.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: branches/2.8.x/wb/templates/argos_theme/images/files/css.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: branches/2.8.x/wb/templates/argos_theme/images/files/css.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: branches/2.8.x/wb/templates/argos_theme/images/files/csv.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: branches/2.8.x/wb/templates/argos_theme/images/files/csv.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: branches/2.8.x/wb/templates/argos_theme/images/files/wav.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: branches/2.8.x/wb/templates/argos_theme/images/files/wav.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: branches/2.8.x/wb/templates/argos_theme/images/files/blank_16.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: branches/2.8.x/wb/templates/argos_theme/images/files/blank_16.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: branches/2.8.x/wb/templates/argos_theme/images/files/unknown.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: branches/2.8.x/wb/templates/argos_theme/images/files/unknown.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: branches/2.8.x/wb/templates/argos_theme/images/files/swf.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: branches/2.8.x/wb/templates/argos_theme/images/files/swf.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: branches/2.8.x/wb/templates/argos_theme/images/files/fla.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: branches/2.8.x/wb/templates/argos_theme/images/files/fla.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: branches/2.8.x/wb/templates/argos_theme/images/files/zip.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: branches/2.8.x/wb/templates/argos_theme/images/files/zip.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: branches/2.8.x/wb/templates/argos_theme/images/files/tgz.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: branches/2.8.x/wb/templates/argos_theme/images/files/tgz.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: branches/2.8.x/wb/templates/argos_theme/images/files/wmv.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: branches/2.8.x/wb/templates/argos_theme/images/files/wmv.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: branches/2.8.x/wb/templates/argos_theme/images/files/pdf.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: branches/2.8.x/wb/templates/argos_theme/images/files/pdf.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: branches/2.8.x/wb/templates/argos_theme/images/files/index.php
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/images/files/index.php	(nonexistent)
+++ branches/2.8.x/wb/templates/argos_theme/images/files/index.php	(revision 1457)
@@ -0,0 +1,32 @@
+<?php
+/**
+ * $Id$
+ * Website Baker theme: wb_theme
+ * This theme is the default WB backend Theme
+ * Feel free to modify or build up on this template.
+ *
+ * This file prevents directory listing.
+ *
+ * LICENSE: GNU General Public License
+ * 
+ * @author     Johannes Tassilo Gruber
+ * @copyright  GNU General Public License
+ * @license    http://www.gnu.org/licenses/gpl.html
+ * @version    2.80
+ * @platform   Website Baker 2.8
+ *
+ * Website Baker is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Website Baker is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+*/
+
+// prevent directory listing
+header('Location: ../../../../index.php');
+
+?>
\ No newline at end of file

Property changes on: branches/2.8.x/wb/templates/argos_theme/images/files/index.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/templates/argos_theme/images/files/blank_16.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/gif

Property changes on: branches/2.8.x/wb/templates/argos_theme/images/files/blank_16.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/gif
\ No newline at end of property
Index: branches/2.8.x/wb/templates/argos_theme/images/files/avi.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: branches/2.8.x/wb/templates/argos_theme/images/files/avi.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: branches/2.8.x/wb/templates/argos_theme/images/files/jpg.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: branches/2.8.x/wb/templates/argos_theme/images/files/jpg.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: branches/2.8.x/wb/templates/argos_theme/images/files/gz.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: branches/2.8.x/wb/templates/argos_theme/images/files/gz.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: branches/2.8.x/wb/templates/argos_theme/images/files/mpg.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: branches/2.8.x/wb/templates/argos_theme/images/files/mpg.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: branches/2.8.x/wb/templates/argos_theme/images/files/png.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: branches/2.8.x/wb/templates/argos_theme/images/files/png.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: branches/2.8.x/wb/templates/argos_theme/images/files/jpeg.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: branches/2.8.x/wb/templates/argos_theme/images/files/jpeg.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: branches/2.8.x/wb/templates/argos_theme/images/files/php.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: branches/2.8.x/wb/templates/argos_theme/images/files/php.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: branches/2.8.x/wb/templates/argos_theme/images/files
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/images/files	(nonexistent)
+++ branches/2.8.x/wb/templates/argos_theme/images/files	(revision 1457)

Property changes on: branches/2.8.x/wb/templates/argos_theme/images/files
___________________________________________________________________
Added: bugtraq:number
## -0,0 +1 ##
+true
\ No newline at end of property
Index: branches/2.8.x/wb/templates/argos_theme/images/1x1.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/gif

Property changes on: branches/2.8.x/wb/templates/argos_theme/images/1x1.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/gif
\ No newline at end of property
Index: branches/2.8.x/wb/templates/argos_theme/images/flags/none.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: branches/2.8.x/wb/templates/argos_theme/images/flags/none.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: branches/2.8.x/wb/templates/argos_theme/images/flags/index.php
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/images/flags/index.php	(revision 1456)
+++ branches/2.8.x/wb/templates/argos_theme/images/flags/index.php	(revision 1457)
@@ -1,18 +1,18 @@
 <?php
 /**
  * $Id$
- * Website Baker theme: argos_theme
+ * Website Baker theme: wb_theme
  * This theme is the default WB backend Theme
  * Feel free to modify or build up on this template.
  *
- * This file defines the template variables required by Website Baker.
+ * This file prevents directory listing.
  *
  * LICENSE: GNU General Public License
  * 
- * @author     Jurgen Nijhuis (Argos Media) & Ruud Eisinga
+ * @author     Johannes Tassilo Gruber
  * @copyright  GNU General Public License
  * @license    http://www.gnu.org/licenses/gpl.html
- * @version    1.1
+ * @version    2.80
  * @platform   Website Baker 2.8
  *
  * Website Baker is free software; you can redistribute it and/or modify

Property changes on: branches/2.8.x/wb/templates/argos_theme/images/flags/index.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1 +1 ##
-Id
\ No newline at end of property
+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/templates/argos_theme/images/blank_16.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/gif

Property changes on: branches/2.8.x/wb/templates/argos_theme/images/blank_16.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/gif
\ No newline at end of property
Index: branches/2.8.x/wb/templates/argos_theme/images/pic_16.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: branches/2.8.x/wb/templates/argos_theme/images/pic_16.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: branches/2.8.x/wb/templates/argos_theme/theme.css
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/theme.css	(revision 1456)
+++ branches/2.8.x/wb/templates/argos_theme/theme.css	(revision 1457)
@@ -33,6 +33,7 @@
 
 .hide {display:none;}
 .note {color:#666;font-size:11px;}
+.center { text-align :center; }
 
 form {margin:0;}
 label {cursor:pointer;}
@@ -81,7 +82,7 @@
 #file_mode input, #dir_mode input {width:12px;height:12px;}
 #hide2 {display:none;}
 
-.pages_list {font-weight:bold;}
+.pages_list {font-weight:bold; margin :10px auto;}
 .pages_list .icon_col td img {display:block;border-style:none;float:left;padding-right:7px;}
 .pages_list table {width:900px;}
 .pages_list ul {margin:0;font-weight:normal;padding:0;}
@@ -177,3 +178,10 @@
 
 div#username {height:17px;width:640px;text-align:left;font-weight:bold;margin:0;} 
 .save_section {margin:20px auto 5px auto;}
+.section-info { margin : 1.5em 0; }
+
+.rounded { border-radius :10px; -khtml-border-radius :10px; -webkit-border-radius :10px; -moz-border-radius :10px; }
+.msg-box { background : #e5ffe6; border :0.2em #009900 solid; color :#336600; margin-bottom :1em; padding :0.63em; text-align :center; }
+.error-box { background :#fee; border :0.2em #844 solid; color :#400; margin-bottom :1em; padding :0.63em; text-align :center; }
+.bigger { font-size :150%; }
+.strong { font-weight :bold; }
\ No newline at end of file
Index: branches/2.8.x/wb/templates/argos_theme/templates/error.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/error.htt	(revision 1456)
+++ branches/2.8.x/wb/templates/argos_theme/templates/error.htt	(revision 1457)
@@ -1,6 +1,6 @@
 <!-- BEGIN main_block -->
-<div style="text-align:center;">
-	{MESSAGE}<br />
-	<h3 style="text-align:center;"><a href="{LINK}">{BACK}</a></h3>
+<div class="error-box rounded">
+	<p>{MESSAGE}</p>
+<input type="button" name="submit" value="{BACK}" onclick="javascript: window.location = '{LINK}';" />
 </div>
 <!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/argos_theme/templates/success.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/success.htt	(revision 1456)
+++ branches/2.8.x/wb/templates/argos_theme/templates/success.htt	(revision 1457)
@@ -1,11 +1,11 @@
 <!-- BEGIN main_block -->
-<div class="error_box">
- {MESSAGE}<br />
+<div class="msg-box rounded">
+	<p>{MESSAGE}</p>
 <!-- BEGIN show_redirect_block -->
  <script type="text/javascript">
   setTimeout("location.href='{REDIRECT}'", {REDIRECT_TIMER});
  </script>
 <!-- END show_redirect_block -->
- <h3 style="text-align:center;"><a href="{REDIRECT}" title="{NEXT}">{BACK}</a></h3>
+<input type="button" name="submit" value="{BACK}" onclick="javascript: window.location = '{REDIRECT}';" />
 </div>
 <!-- END main_block -->
\ No newline at end of file
Index: branches/2.8.x/wb/templates/argos_theme/templates/modules.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/modules.htt	(revision 1456)
+++ branches/2.8.x/wb/templates/argos_theme/templates/modules.htt	(revision 1457)
@@ -12,6 +12,7 @@
 </table>
 
 <form name="install" enctype="multipart/form-data" action="install.php" method="post" class="{DISPLAY_INSTALL}">
+{FTAN}
   <h2>{HEADING_INSTALL_MODULE}</h2>
   <table summary="" cellpadding="2" cellspacing="0" border="0" width="100%">
     <tr>
@@ -31,6 +32,7 @@
   <br />
 </form>
 <form name="uninstall" action="uninstall.php" method="post" class="{DISPLAY_UNINSTALL}">
+{FTAN}
   <h2>{HEADING_UNINSTALL_MODULE}</h2>
   <table summary="" cellpadding="2" cellspacing="0" border="0" width="100%">
     <tr>
@@ -50,6 +52,7 @@
   <br />
 </form>
 <form name="details" action="details.php" method="post" class="{DISPLAY_LIST}">
+{FTAN}
   <h2>{HEADING_MODULE_DETAILS}</h2>
   <table summary="" cellpadding="2" cellspacing="0" border="0" width="100%">
     <tr>
@@ -72,6 +75,7 @@
   <h2>{HEADING_INVOKE_MODULE_FILES}</h2>
   <p>{TEXT_MANUAL_INSTALLATION}</p>
   <form name="manual_install" action="manual_install.php" method="post" class="{INSTALL_VISIBLE}">
+{FTAN}
   <table summary="" cellpadding="0" cellspacing="2" border="0" width="80%">
 	  <tr>
 		<td width="150" valign="middle" nowrap="nowrap">{TEXT_FILE}: "install.php"</td>
@@ -90,6 +94,7 @@
   </form>
   
   <form name="manual_upgrade" action="manual_install.php" method="post" class="{UPGRADE_VISIBLE}">
+{FTAN}
   <table summary="" cellpadding="0" cellspacing="2" border="0" width="80%">
 	  <tr>
 		<td width="150" valign="middle" nowrap="nowrap">{TEXT_FILE}: "upgrade.php"</td>
@@ -108,6 +113,7 @@
   </form>
 
   <form name="manual_uninstall" action="manual_install.php" method="post" class="{UNINSTALL_VISIBLE}">
+{FTAN}
   <table summary="" cellpadding="0" cellspacing="2" border="0" width="80%">
 	  <tr>
 		<td width="150" valign="middle" nowrap="nowrap">{TEXT_FILE}: "uninstall.php"</td>
Index: branches/2.8.x/wb/templates/argos_theme/templates/header.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/header.htt	(revision 1456)
+++ branches/2.8.x/wb/templates/argos_theme/templates/header.htt	(revision 1457)
@@ -37,7 +37,7 @@
       <br />
       <span class="version">CMS Version  {VERSION}</span><br/>
       <span class="version">Revision {REVISION}</span><br/>
-      <span class="version">Admin version 1.5</span>
+      <span class="version">Admin version 1.6</span>
 	 </div>
     <a href="{ADMIN_URL}" title="{TITLE_START}" id="website_title">
     {WEBSITE_TITLE} - {TEXT_ADMINISTRATION}
Index: branches/2.8.x/wb/templates/argos_theme/templates/media_browse.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/media_browse.htt	(revision 1456)
+++ branches/2.8.x/wb/templates/argos_theme/templates/media_browse.htt	(revision 1457)
@@ -36,7 +36,7 @@
 	<td>
 		<a {MOUSEOVER} href="{LINK}" target="{LINK_TARGET}">{NAME}</a>
 	</td>
-	<td width="190">
+	<td width="120">
 		<small>{IMAGEDETAIL}<br />{DATE}</small>
 	</td>
 	<td width="60" align="right" class="{DISPLAY_RENAME}">
@@ -43,6 +43,9 @@
 		<a href="rename.php?dir={CURRENT_DIR}&amp;id={TEMP_ID}"><img src="{THEME_URL}/images/modify_16.png" alt="{TEXT_RENAME}" border="0" /> </a> &nbsp;&nbsp;
 		<a href="#" onclick="javascript: confirm_link('{CONFIRM_DELETE}\n {NAME_SLASHED}', 'delete.php?dir={CURRENT_DIR}&amp;id={TEMP_ID}');"><img src="{THEME_URL}/images/delete_16.png" alt="{TEXT_DELETE}" border="0" /></a>&nbsp;&nbsp;
 	</td>
+   <td width="16" align="right" class="">
+	   <img src="{THEME_URL}/images/{IMAGE_EXIST}" title="{IMAGE_TITLE}" alt="{IMAGE_TITLE}" />
+   </td>
 </tr>
 <!-- END list_block -->
 </table>
Index: branches/2.8.x/wb/pages/index.php
===================================================================
--- branches/2.8.x/wb/pages/index.php	(revision 1456)
+++ branches/2.8.x/wb/pages/index.php	(revision 1457)
@@ -1,22 +1,26 @@
 <?php
-/**
- *
- * @category        admin
- * @package         pages
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
- * @copyright       2009-2011, Website Baker Org. e.V.
- * @link			http://www.websitebaker2.org/
- * @license         http://www.gnu.org/licenses/gpl.html
- * @platform        WebsiteBaker 2.8.x
- * @requirements    PHP 5.2.2 and higher
- * @version         $Id$
- * @filesource		$HeadURL: http://svn.websitebaker2.org/branches/2.8.x/wb/admin/users/save.php $
- * @lastmodified    $Date: 2011-01-10 13:21:47 +0100 (Mo, 10. Jan 2011) $
- *
- */
 
-$no_intro = true;
-require('../config.php');
-require(WB_PATH.'/index.php');
-?>
\ No newline at end of file
+// $Id$
+
+/*
+
+ Website Baker Project <http://www.websitebaker.org/>
+ Copyright (C) 2004-2009, Ryan Djurovich
+
+ Website Baker is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ Website Baker is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Website Baker; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+*/
+
+header('Location: ../index.php');
Index: branches/2.8.x/wb/languages/FI.php
===================================================================
--- branches/2.8.x/wb/languages/FI.php	(revision 1456)
+++ branches/2.8.x/wb/languages/FI.php	(revision 1457)

Property changes on: branches/2.8.x/wb/languages/FI.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1,4 +1 ##
-Id
-Revision
-HeadURL
-Date
\ No newline at end of property
+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/languages/EN.php
===================================================================
--- branches/2.8.x/wb/languages/EN.php	(revision 1456)
+++ branches/2.8.x/wb/languages/EN.php	(revision 1457)

Property changes on: branches/2.8.x/wb/languages/EN.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1,4 +1 ##
-Id
-Revision
-HeadURL
-Date
\ No newline at end of property
+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/languages/CS.php
===================================================================
--- branches/2.8.x/wb/languages/CS.php	(revision 1456)
+++ branches/2.8.x/wb/languages/CS.php	(revision 1457)

Property changes on: branches/2.8.x/wb/languages/CS.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1,4 +1 ##
-Id
-Revision
-HeadURL
-Date
\ No newline at end of property
+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/languages/index.php
===================================================================
--- branches/2.8.x/wb/languages/index.php	(revision 1456)
+++ branches/2.8.x/wb/languages/index.php	(revision 1457)
@@ -1,21 +1,21 @@
-<?php
-/**
- *
- * @category        framework
- * @package         language
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
- * @copyright       2009-2011, Website Baker Org. e.V.
- * @link			http://www.websitebaker2.org/
- * @license         http://www.gnu.org/licenses/gpl.html
- * @platform        WebsiteBaker 2.8.x
- * @requirements    PHP 5.2.2 and higher
- * @version         $Id$
- * @filesource		$HeadURL$
- * @lastmodified    $Date$
- *
- */
-
-require('../config.php');
-header('Location: '.WB_URL.'/');
+<?php
+/**
+ *
+ * @category        framework
+ * @package         language
+ * @author          WebsiteBaker Project
+ * @copyright       2004-2009, Ryan Djurovich
+ * @copyright       2009-2011, Website Baker Org. e.V.
+ * @link			http://www.websitebaker2.org/
+ * @license         http://www.gnu.org/licenses/gpl.html
+ * @platform        WebsiteBaker 2.8.x
+ * @requirements    PHP 5.2.2 and higher
+ * @version         $Id$
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
+ *
+ */
+
+require('../config.php');
+header('Location: '.WB_URL.'/');
 exit;
\ No newline at end of file

Property changes on: branches/2.8.x/wb/languages/index.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1,4 +1 ##
-Id
-Revision
-HeadURL
-Date
\ No newline at end of property
+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/languages/SE.php
===================================================================
--- branches/2.8.x/wb/languages/SE.php	(revision 1456)
+++ branches/2.8.x/wb/languages/SE.php	(revision 1457)

Property changes on: branches/2.8.x/wb/languages/SE.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1,4 +1 ##
-Id
-Revision
-HeadURL
-Date
\ No newline at end of property
+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/languages/ES.php
===================================================================
--- branches/2.8.x/wb/languages/ES.php	(revision 1456)
+++ branches/2.8.x/wb/languages/ES.php	(revision 1457)

Property changes on: branches/2.8.x/wb/languages/ES.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1,4 +1 ##
-Id
-Revision
-HeadURL
-Date
\ No newline at end of property
+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/languages/FR.php
===================================================================
--- branches/2.8.x/wb/languages/FR.php	(revision 1456)
+++ branches/2.8.x/wb/languages/FR.php	(revision 1457)

Property changes on: branches/2.8.x/wb/languages/FR.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1,4 +1 ##
-Id
-Revision
-HeadURL
-Date
\ No newline at end of property
+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/languages/ET.php
===================================================================
--- branches/2.8.x/wb/languages/ET.php	(revision 1456)
+++ branches/2.8.x/wb/languages/ET.php	(revision 1457)

Property changes on: branches/2.8.x/wb/languages/ET.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1,4 +1 ##
-Id
-Revision
-HeadURL
-Date
\ No newline at end of property
+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/languages/HR.php
===================================================================
--- branches/2.8.x/wb/languages/HR.php	(revision 1456)
+++ branches/2.8.x/wb/languages/HR.php	(revision 1457)

Property changes on: branches/2.8.x/wb/languages/HR.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1,4 +1 ##
-Id
-Revision
-HeadURL
-Date
\ No newline at end of property
+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/languages/NL.php
===================================================================
--- branches/2.8.x/wb/languages/NL.php	(revision 1456)
+++ branches/2.8.x/wb/languages/NL.php	(revision 1457)
@@ -1,670 +1,670 @@
-<?php
-/**
- *
- * @category        framework
- * @package         language
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
- * @copyright       2009-2011, Website Baker Org. e.V.
- * @link			http://www.websitebaker2.org/
- * @license         http://www.gnu.org/licenses/gpl.html
- * @platform        WebsiteBaker 2.8.x
- * @requirements    PHP 5.2.2 and higher
- * @version         $Id$
- * @filesource		$HeadURL$
- * @lastmodified    $Date$
- *
- */
-
-// Must include code to stop this file being access directly
-if(defined('WB_PATH') == false) { exit("Cannot access this file directly"); }
-
-// Define that this file is loaded
-if(!defined('LANGUAGE_LOADED')) {
-define('LANGUAGE_LOADED', true);
-}
-
-// Set the language information
-$language_code = 'NL';
-$language_name = 'Nederlands';
-$language_version = '2.8';
-$language_platform = '2.8.x';
-$language_author = 'Bramus, CodeALot, Luckyluke, Argos';
-$language_license = 'GNU General Public License';
-
-/* MENU */
-$MENU['ACCESS'] = 'Toegang';
-$MENU['ADDON'] = 'Add-on';
-$MENU['ADDONS'] = 'Extra&rsquo;s';
-$MENU['ADMINTOOLS'] = 'Beheerfuncties';
-$MENU['BREADCRUMB'] = 'U bent hier: ';
-$MENU['FORGOT'] = 'Inloggegevens opnieuw aanvragen';
-$MENU['GROUP'] = 'Groep';
-$MENU['GROUPS'] = 'Groepen';
-$MENU['HELP'] = 'Help';
-$MENU['LANGUAGES'] = 'Talen';
-$MENU['LOGIN'] = 'Inloggen';
-$MENU['LOGOUT'] = 'Uitloggen';
-$MENU['MEDIA'] = 'Media';
-$MENU['MODULES'] = 'Modules';
-$MENU['PAGES'] = 'Pagina&rsquo;s';
-$MENU['PREFERENCES'] = 'Profiel';
-$MENU['SETTINGS'] = 'Instellingen';
-$MENU['START'] = 'Naar het hoofdmenu';
-$MENU['TEMPLATES'] = 'Templates';
-$MENU['USERS'] = 'Gebruikers';
-$MENU['VIEW'] = 'Website';
-
-/* TEXT */
-$TEXT['ACCOUNT_SIGNUP'] = 'Aanmelden als gebruiker';
-$TEXT['ACTIONS'] = 'Acties';
-$TEXT['ACTIVE'] = 'Actief';
-$TEXT['ADD'] = 'Toevoegen';
-$TEXT['ADDON'] = 'Add-On';
-$TEXT['ADD_SECTION'] = 'Toevoegen sectie';
-$TEXT['ADMIN'] = 'Beheer';
-$TEXT['ADMINISTRATION'] = 'Beheer';
-$TEXT['ADMINISTRATION_TOOL'] = 'Beheeropties';
-$TEXT['ADMINISTRATOR'] = 'Administrator';
-$TEXT['ADMINISTRATORS'] = 'Beheerders';
-$TEXT['ADVANCED'] = 'Geavanceerd';
-$TEXT['ALLOWED_FILETYPES_ON_UPLOAD'] = 'Toegestane upload-bestanden';
-$TEXT['ALLOWED_VIEWERS'] = 'Toegestane kijkers';
-$TEXT['ALLOW_MULTIPLE_SELECTIONS'] = 'Meerdere selecties toestaan';
-$TEXT['ALL_WORDS'] = 'Term of deel van term';
-$TEXT['ANCHOR'] = 'Anker';
-$TEXT['ANONYMOUS'] = 'Anoniem';
-$TEXT['ANY_WORDS'] = 'E&eacute;n van de termen';
-$TEXT['APP_NAME'] = 'Applicatienaam';
-$TEXT['ARE_YOU_SURE'] = 'Weet u het zeker?';
-$TEXT['AUTHOR'] = 'Auteur';
-$TEXT['BACK'] = 'Terug';
-$TEXT['BACKUP'] = 'Backup maken';
-$TEXT['BACKUP_ALL_TABLES'] = 'Backup van alle tabellen in de database';
-$TEXT['BACKUP_DATABASE'] = 'Backup van de database maken';
-$TEXT['BACKUP_MEDIA'] = 'Backup van de Media-map maken';
-$TEXT['BACKUP_WB_SPECIFIC'] = 'Backup van alleen WB-gerelateerde tabellen';
-$TEXT['BASIC'] = 'Basis';
-$TEXT['BLOCK'] = 'Blok';
-$TEXT['CALENDAR'] = 'Kalender';
-$TEXT['CANCEL'] = 'Annuleren';
-$TEXT['CAN_DELETE_HIMSELF'] = 'Kan zichzelf verwijderen';
-$TEXT['CAPTCHA_VERIFICATION'] = 'Captcha-verificatie';
-$TEXT['CAP_EDIT_CSS'] = 'Wijzig CSS';
-$TEXT['CHANGE'] = 'Verander';
-$TEXT['CHANGES'] = 'Veranderingen';
-$TEXT['CHANGE_SETTINGS'] = 'Wijzig instellingen';
-$TEXT['CHARSET'] = 'Tekenset';
-$TEXT['CHECKBOX_GROUP'] = 'Aankruisvakjes';
-$TEXT['CLOSE'] = 'Sluiten';
-$TEXT['CODE'] = 'Code';
-$TEXT['CODE_SNIPPET'] = 'Code snippet';
-$TEXT['COLLAPSE'] = 'Inklappen';
-$TEXT['COMMENT'] = 'Reageren';
-$TEXT['COMMENTING'] = 'Reactie-opties';
-$TEXT['COMMENTS'] = 'Reacties';
-$TEXT['CREATE_FOLDER'] = 'Cre&euml;er map';
-$TEXT['CURRENT'] = 'Huidig(e)';
-$TEXT['CURRENT_FOLDER'] = 'Huidige map';
-$TEXT['CURRENT_PAGE'] = 'Huidige pagina';
-$TEXT['CURRENT_PASSWORD'] = 'Huidig wachtwoord';
-$TEXT['CUSTOM'] = 'Handmatige invoer';
-$TEXT['DATABASE'] = 'Database';
-$TEXT['DATE'] = 'Datum';
-$TEXT['DATE_FORMAT'] = 'Datumweergave';
-$TEXT['DEFAULT'] = 'Standaard';
-$TEXT['DEFAULT_CHARSET'] = 'Standaard tekenset';
-$TEXT['DEFAULT_TEXT'] = 'Standaardtekst';
-$TEXT['DELETE'] = 'Verwijderen';
-$TEXT['DELETED'] = 'Verwijderd';
-$TEXT['DELETE_DATE'] = 'Wis datum';
-$TEXT['DELETE_ZIP'] = 'Verwijder ZIP van server na uitpakken';
-$TEXT['DESCRIPTION'] = 'Metatag "Description"';
-$TEXT['DESIGNED_FOR'] = 'Ontworpen voor';
-$TEXT['DIRECTORIES'] = 'Mappen';
-$TEXT['DIRECTORY_MODE'] = 'Directory-modus';
-$TEXT['DISABLED'] = 'Uit';
-$TEXT['DISPLAY_NAME'] = 'Naamweergave';
-$TEXT['EMAIL'] = 'E-mail';
-$TEXT['EMAIL_ADDRESS'] = 'E-mailadres';
-$TEXT['EMPTY_TRASH'] = 'Prullenbak legen';
-$TEXT['ENABLED'] = 'Aan';
-$TEXT['END'] = 'Einde';
-$TEXT['ERROR'] = 'Fout';
-$TEXT['EXACT_MATCH'] = 'Exacte term';
-$TEXT['EXECUTE'] = 'Uitvoeren';
-$TEXT['EXPAND'] = 'Uitklappen';
-$TEXT['EXTENSION'] = 'Extensie';
-$TEXT['FIELD'] = 'Veld';
-$TEXT['FILE'] = 'Bestand';
-$TEXT['FILES'] = 'bestanden';
-$TEXT['FILESYSTEM_PERMISSIONS'] = 'Bestandssysteembevoegdheden';
-$TEXT['FILE_MODE'] = 'Bestandsmodus';
-$TEXT['FINISH_PUBLISHING'] = 'Einde publicatie';
-$TEXT['FOLDER'] = 'Map';
-$TEXT['FOLDERS'] = 'Mappen';
-$TEXT['FOOTER'] = 'Footer';
-$TEXT['FORGOTTEN_DETAILS'] = 'Gegevens vergeten?';
-$TEXT['FORGOT_DETAILS'] = 'Gegevens vergeten?';
-$TEXT['FROM'] = 'Van';
-$TEXT['FRONTEND'] = 'Website';
-$TEXT['FULL_NAME'] = 'Volledige naam';
-$TEXT['FUNCTION'] = 'Functie';
-$TEXT['GROUP'] = 'Groep';
-$TEXT['HEADER'] = 'Header';
-$TEXT['HEADING'] = 'Titel';
-$TEXT['HEADING_CSS_FILE'] = 'Actuele modulebestand: ';
-$TEXT['HEIGHT'] = 'Hoogte';
-$TEXT['HIDDEN'] = 'Verborgen';
-$TEXT['HIDE'] = 'Verbergen';
-$TEXT['HIDE_ADVANCED'] = 'Verberg geavanceerde opties';
-$TEXT['HOME'] = 'Home';
-$TEXT['HOMEPAGE_REDIRECTION'] = 'Homepage-omleiding';
-$TEXT['HOME_FOLDER'] = 'Persoonlijke folder';
-$TEXT['HOME_FOLDERS'] = 'Persoonlijke folders';
-$TEXT['HOST'] = 'Host';
-$TEXT['ICON'] = 'Icoon';
-$TEXT['IMAGE'] = 'Afbeelding';
-$TEXT['INLINE'] = 'Inline';
-$TEXT['INSTALL'] = 'Installeren';
-$TEXT['INSTALLATION'] = 'Installatie';
-$TEXT['INSTALLATION_PATH'] = 'Installatiepad';
-$TEXT['INSTALLATION_URL'] = 'Installatie-URL';
-$TEXT['INSTALLED'] = 'ge&iuml;nstalleerd';
-$TEXT['INTRO'] = 'Introductie';
-$TEXT['INTRO_PAGE'] = 'Introductiepagina';
-$TEXT['INVALID_SIGNS'] = 'moet met een letter beginnen, of heeft een ongeldig teken';
-$TEXT['KEYWORDS'] = 'Metatag "Keywords"';
-$TEXT['LANGUAGE'] = 'Taal';
-$TEXT['LAST_UPDATED_BY'] = 'Laatste wijzigingen door';
-$TEXT['LENGTH'] = 'Lengte';
-$TEXT['LEVEL'] = 'Niveau';
-$TEXT['LINK'] = 'Link';
-$TEXT['LINUX_UNIX_BASED'] = 'Linux/Unix';
-$TEXT['LIST_OPTIONS'] = 'Lijstopties';
-$TEXT['LOGGED_IN'] = 'Ingelogd';
-$TEXT['LOGIN'] = 'Inloggen';
-$TEXT['LONG'] = 'Lang';
-$TEXT['LONG_TEXT'] = 'Lange tekst';
-$TEXT['LOOP'] = '"Loop"';
-$TEXT['MAIN'] = 'Primair(e)';
-$TEXT['MAINTENANCE_OFF'] = 'Onderhoud uit';
-$TEXT['MAINTENANCE_ON'] = 'Onderhoud aan';
-$TEXT['MANAGE'] = 'Beheren';
-$TEXT['MANAGE_GROUPS'] = 'Groepenbeheer';
-$TEXT['MANAGE_USERS'] = 'Gebruikersbeheer';
-$TEXT['MATCH'] = 'Gelijk aan';
-$TEXT['MATCHING'] = 'Overeenkomend';
-$TEXT['MAX_EXCERPT'] = 'Maximaal aantal gelijktijdige zoekacties';
-$TEXT['MAX_SUBMISSIONS_PER_HOUR'] = 'Maximaal aantal inzendingen per uur';
-$TEXT['MEDIA_DIRECTORY'] = 'Media-map';
-$TEXT['MENU'] = 'Menu';
-$TEXT['MENU_ICON_0'] = 'Menu-icoon normal';
-$TEXT['MENU_ICON_1'] = 'Menu-icoon hover';
-$TEXT['MENU_TITLE'] = 'Menutitel';
-$TEXT['MESSAGE'] = 'Bericht';
-$TEXT['MODIFY'] = 'Wijzigen';
-$TEXT['MODIFY_CONTENT'] = 'Wijzig inhoud';
-$TEXT['MODIFY_SETTINGS'] = 'Wijzig instellingen';
-$TEXT['MODULE_ORDER'] = 'Modules doorzoeken';
-$TEXT['MODULE_PERMISSIONS'] = 'Modulebevoegdheden';
-$TEXT['MORE'] = 'Meer';
-$TEXT['MOVE_DOWN'] = 'Naar beneden';
-$TEXT['MOVE_UP'] = 'Naar boven';
-$TEXT['MULTIPLE_MENUS'] = 'Meerdere menu&rsquo;s';
-$TEXT['MULTISELECT'] = 'Meervoudige selectie';
-$TEXT['NAME'] = 'Naam';
-$TEXT['NEED_CURRENT_PASSWORD'] = 'Huidig wachtwoord';
-$TEXT['NEED_TO_LOGIN'] = 'Inloggen?';
-$TEXT['NEW_PASSWORD'] = 'Nieuw wachtwoord';
-$TEXT['NEW_WINDOW'] = 'Nieuw scherm';
-$TEXT['NEXT'] = 'Volgende';
-$TEXT['NEXT_PAGE'] = 'Volgende pagina';
-$TEXT['NO'] = 'Nee';
-$TEXT['NONE'] = 'Geen';
-$TEXT['NONE_FOUND'] = 'Niet gevonden';
-$TEXT['NOT_FOUND'] = 'Niet gevonden';
-$TEXT['NOT_INSTALLED'] = 'niet ge&iuml;nstalleerd';
-$TEXT['NO_IMAGE_SELECTED'] = 'geen afbeelding geselecteerd';
-$TEXT['NO_RESULTS'] = 'Geen resultaten';
-$TEXT['OF'] = 'van de';
-$TEXT['ON'] = 'Op';
-$TEXT['OPEN'] = 'Openen';
-$TEXT['OPTION'] = 'Optie';
-$TEXT['OTHERS'] = 'Anderen';
-$TEXT['OUT_OF'] = 'Buiten';
-$TEXT['OVERWRITE_EXISTING'] = 'Overschrijf bestaand(e)';
-$TEXT['PAGE'] = 'Pagina';
-$TEXT['PAGES_DIRECTORY'] = 'Pagina&rsquo;s-map';
-$TEXT['PAGES_PERMISSION'] = 'Paginapermissie';
-$TEXT['PAGES_PERMISSIONS'] = 'Paginapermissies';
-$TEXT['PAGE_EXTENSION'] = 'Pagina-extensie';
-$TEXT['PAGE_ICON'] = 'Pagina-afbeelding';
-$TEXT['PAGE_ICON_DIR'] = 'Pad naar pagina- en menu-afbeeldingen';
-$TEXT['PAGE_LANGUAGES'] = 'Meerdere talen';
-$TEXT['PAGE_LEVEL_LIMIT'] = 'Paginaniveaulimiet';
-$TEXT['PAGE_SPACER'] = 'Pagina-spacer';
-$TEXT['PAGE_TITLE'] = 'Paginatitel';
-$TEXT['PAGE_TRASH'] = 'Paginaprullenbak';
-$TEXT['PARENT'] = 'Ouder';
-$TEXT['PASSWORD'] = 'Wachtwoord';
-$TEXT['PATH'] = 'Pad';
-$TEXT['PHP_ERROR_LEVEL'] = 'PHP-foutmeldingsniveau';
-$TEXT['PLEASE_LOGIN'] = 'Inloggen aub';
-$TEXT['PLEASE_SELECT'] = 'Selecteer';
-$TEXT['POST'] = 'Bericht';
-$TEXT['POSTS_PER_PAGE'] = 'Berichten per pagina';
-$TEXT['POST_FOOTER'] = 'Bericht-footer';
-$TEXT['POST_HEADER'] = 'Bericht-header';
-$TEXT['PREVIOUS'] = 'Vorige';
-$TEXT['PREVIOUS_PAGE'] = 'Vorige pagina';
-$TEXT['PRIVATE'] = 'Aangemeld';
-$TEXT['PRIVATE_VIEWERS'] = 'Aangemelde bezoekers';
-$TEXT['PROFILES_EDIT'] = 'Change the profile';
-$TEXT['PUBLIC'] = 'Iedereen';
-$TEXT['PUBL_END_DATE'] = 'Einddatum';
-$TEXT['PUBL_START_DATE'] = 'Startdatum';
-$TEXT['RADIO_BUTTON_GROUP'] = 'Radio buttons';
-$TEXT['READ'] = 'Lees';
-$TEXT['READ_MORE'] = 'Lees verder';
-$TEXT['REDIRECT_AFTER'] = 'Omleiding na (sec.)';
-$TEXT['REGISTERED'] = 'Geregistreerd';
-$TEXT['REGISTERED_VIEWERS'] = 'Geregistreerde bezoekers';
-$TEXT['RELOAD'] = 'Vernieuwen';
-$TEXT['REMEMBER_ME'] = 'Onthoud mijn gegevens.';
-$TEXT['RENAME'] = 'Hernoemen';
-$TEXT['RENAME_FILES_ON_UPLOAD'] = 'Bestanden hernoemen bij uploaden';
-$TEXT['REQUIRED'] = 'Verplicht';
-$TEXT['REQUIREMENT'] = 'Benodigd';
-$TEXT['RESET'] = 'Opnieuw';
-$TEXT['RESIZE'] = 'Veranderen grootte';
-$TEXT['RESIZE_IMAGE_TO'] = 'Verander afbeeldingsgrootte naar';
-$TEXT['RESTORE'] = 'Backup terugzetten';
-$TEXT['RESTORE_DATABASE'] = 'Backup van de database terugzetten';
-$TEXT['RESTORE_MEDIA'] = 'Backup van de Media-map terugzetten';
-$TEXT['RESULTS'] = 'Resultaten';
-$TEXT['RESULTS_FOOTER'] = 'Zoekresultaten-footer';
-$TEXT['RESULTS_FOR'] = 'Resultaten voor';
-$TEXT['RESULTS_HEADER'] = 'Resultaten-header';
-$TEXT['RESULTS_LOOP'] = 'Zoekresultaten';
-$TEXT['RETYPE_NEW_PASSWORD'] = 'Herhaal nieuw wachtwoord';
-$TEXT['RETYPE_PASSWORD'] = 'Herhaal wachtwoord';
-$TEXT['SAME_WINDOW'] = 'Zelfde scherm';
-$TEXT['SAVE'] = 'Opslaan';
-$TEXT['SEARCH'] = 'Zoeken';
-$TEXT['SEARCHING'] = 'Zoekfunctie';
-$TEXT['SECTION'] = 'Sectie';
-$TEXT['SECTION_BLOCKS'] = 'Sectieblokken';
-$TEXT['SEC_ANCHOR'] = 'Sessie-voorvoegsel';
-$TEXT['SELECT_BOX'] = 'Selectiemenu';
-$TEXT['SEND_DETAILS'] = 'Stuur gegevens';
-$TEXT['SEPARATE'] = 'Gescheiden';
-$TEXT['SEPERATOR'] = 'Scheidingsteken tussen opties (HTML toegestaan)';
-$TEXT['SERVER_EMAIL'] = 'Server e-mail';
-$TEXT['SERVER_OPERATING_SYSTEM'] = 'Serverbesturingssysteem';
-$TEXT['SESSION_IDENTIFIER'] = 'Sessie-identificatie';
-$TEXT['SETTINGS'] = 'Instellingen';
-$TEXT['SHORT'] = 'Kort';
-$TEXT['SHORT_TEXT'] = 'Korte tekst';
-$TEXT['SHOW'] = 'Tonen';
-$TEXT['SHOW_ADVANCED'] = 'Bekijk geavanceerde opties';
-$TEXT['SIGNUP'] = 'Primaire aanmeldgroep';
-$TEXT['SIZE'] = 'Grootte';
-$TEXT['SMART_LOGIN'] = 'Snel inloggen';
-$TEXT['START'] = 'Aanvang';
-$TEXT['START_PUBLISHING'] = 'Aanvang publicatie';
-$TEXT['SUBJECT'] = 'Onderwerp';
-$TEXT['SUBMISSIONS'] = 'Inzendingen';
-$TEXT['SUBMISSIONS_STORED_IN_DATABASE'] = 'Maximaal aantal te bewaren inzendingen';
-$TEXT['SUBMISSION_ID'] = 'Ingezonden bericht';
-$TEXT['SUBMITTED'] = 'Ingezonden';
-$TEXT['SUCCESS'] = 'Succes';
-$TEXT['SYSTEM_DEFAULT'] = 'Standaardinstellingen';
-$TEXT['SYSTEM_PERMISSIONS'] = 'Systeembevoegdheden';
-$TEXT['TABLE_PREFIX'] = 'Tabelvoorvoegsel';
-$TEXT['TARGET'] = 'Doel';
-$TEXT['TARGET_FOLDER'] = 'Doelmap';
-$TEXT['TEMPLATE'] = 'Template';
-$TEXT['TEMPLATE_PERMISSIONS'] = 'Templatebevoegdheden';
-$TEXT['TEXT'] = 'Tekst';
-$TEXT['TEXTAREA'] = 'Tekstveld';
-$TEXT['TEXTFIELD'] = 'Tekstregel';
-$TEXT['THEME'] = 'Thema Website-beheer';
-$TEXT['TIME'] = 'Tijd';
-$TEXT['TIMEZONE'] = 'Tijdzone';
-$TEXT['TIME_FORMAT'] = 'Tijdweergave';
-$TEXT['TIME_LIMIT'] = 'Maximale zoektijd per module';
-$TEXT['TITLE'] = 'Titel';
-$TEXT['TO'] = 'Aan';
-$TEXT['TOP_FRAME'] = 'Bovenste frame';
-$TEXT['TRASH_EMPTIED'] = 'Prullenbak geleegd';
-$TEXT['TXT_EDIT_CSS_FILE'] = 'Wijzig de CSS-definities in het tekstveld hieronder.';
-$TEXT['TYPE'] = 'Type';
-$TEXT['UNDER_CONSTRUCTION'] = 'In bewerking';
-$TEXT['UNINSTALL'] = 'Verwijderen';
-$TEXT['UNKNOWN'] = 'Onbekend(e)';
-$TEXT['UNLIMITED'] = 'Ongelimiteerd';
-$TEXT['UNZIP_FILE'] = 'Uploaden en uitpakken van ZIP-bestand';
-$TEXT['UP'] = 'Omhoog';
-$TEXT['UPGRADE'] = 'Upgraden';
-$TEXT['UPLOAD_FILES'] = 'Upload bestand(en)';
-$TEXT['URL'] = 'URL';
-$TEXT['USER'] = 'Gebruiker';
-$TEXT['USERNAME'] = 'Gebruikersnaam';
-$TEXT['USERS_ACTIVE'] = 'gebruiker is op actief gezet';
-$TEXT['USERS_CAN_SELFDELETE'] = 'gebruiker kan zijn eigen account verwijderen';
-$TEXT['USERS_CHANGE_SETTINGS'] = 'Gebruiker kan de eigen instellingen aanpassen';
-$TEXT['USERS_DELETED'] = 'Gebruiker is gemarkeerd als verwijderd';
-$TEXT['USERS_FLAGS'] = 'User-Flags';
-$TEXT['USERS_PROFILE_ALLOWED'] = 'Gebruiker kan uitgebreid profiel aanmaken';
-$TEXT['VERIFICATION'] = 'Verificatie';
-$TEXT['VERSION'] = 'Versie';
-$TEXT['VIEW'] = 'Bekijken';
-$TEXT['VIEW_DELETED_PAGES'] = 'Bekijk verwijderde pagina&rsquo;s';
-$TEXT['VIEW_DETAILS'] = 'Gegevens bekijken';
-$TEXT['VISIBILITY'] = 'Zichtbaarheid';
-$TEXT['WBMAILER_DEFAULT_SENDER_MAIL'] = 'Standaard afzendermailadres';
-$TEXT['WBMAILER_DEFAULT_SENDER_NAME'] = 'Standaard afzendernaam';
-$TEXT['WBMAILER_DEFAULT_SETTINGS_NOTICE'] = 'Specificeer hieronder een standaard afzenderadres en afzendernaam. Het is aanbevolen om een afzenderadres als: <strong>admin@uwdomein.nl</strong> te gebruiken. Om verspreiding van spam tegen te gaan, kunnen sommige mailproviders (bijv. <em>mail.com</em>) mails verwerpen met een afzenderadres als <em>name@mail.com</em>, die verzonden worden vanaf een relay-server. Onderstaande standaardwaarden worden enkel gebruikt indien geen andere waarden gespecifieerd worden door WebsiteBaker. Indien uw server <acronym title="Simple mail transfer protocol">SMTP</acronym> ondersteunt kunt u deze optie gebruiken voor het versturen van uitgaande mails.';
-$TEXT['WBMAILER_FUNCTION'] = 'Mailafhandeling';
-$TEXT['WBMAILER_NOTICE'] = '<strong>Instellingen SMTP Mailer:</strong><br />Onderstaande instellingen zijn alleen van toepassing indien u mails wilt verzenden via <acronym title="Simple mail transfer protocol">SMTP</acronym>. Indien u de naam of instellingen van de SMTP-server niet kent, selecteer dan bij de standaard mailroutine: PHP MAIL.';
-$TEXT['WBMAILER_PHP'] = 'PHP MAIL';
-$TEXT['WBMAILER_SMTP'] = 'SMTP';
-$TEXT['WBMAILER_SMTP_AUTH'] = 'SMTP-authenticatie';
-$TEXT['WBMAILER_SMTP_AUTH_NOTICE'] = 'Alleen wanneer men zich dient aan te melden bij de SMTP-host';
-$TEXT['WBMAILER_SMTP_HOST'] = 'SMTP-host';
-$TEXT['WBMAILER_SMTP_PASSWORD'] = 'SMTP-wachtwoord';
-$TEXT['WBMAILER_SMTP_USERNAME'] = 'SMTP-gebruikersnaam';
-$TEXT['WEBSITE'] = 'Website';
-$TEXT['WEBSITE_DESCRIPTION'] = 'Metatag "Description"';
-$TEXT['WEBSITE_FOOTER'] = 'Website-footer';
-$TEXT['WEBSITE_HEADER'] = 'Website-header';
-$TEXT['WEBSITE_KEYWORDS'] = 'Metatag "Keywords"';
-$TEXT['WEBSITE_TITLE'] = 'Metatag "Title"';
-$TEXT['WELCOME_BACK'] = 'Welkom terug';
-$TEXT['WIDTH'] = 'Breedte';
-$TEXT['WINDOW'] = 'Scherm';
-$TEXT['WINDOWS'] = 'Windows';
-$TEXT['WORLD_WRITEABLE_FILE_PERMISSIONS'] = 'CHMOD 777 alle bestanden';
-$TEXT['WRITE'] = 'Schrijf';
-$TEXT['WYSIWYG_EDITOR'] = 'WYSIWYG-editor';
-$TEXT['WYSIWYG_STYLE'] = 'WYSIWYG-stijl';
-$TEXT['YES'] = 'Ja';
-
-/* HEADING */
-$HEADING['ADDON_PRECHECK_FAILED'] = 'Module voldoet niet aan de eisen';
-$HEADING['ADD_CHILD_PAGE'] = 'Toevoegen subpagina';
-$HEADING['ADD_GROUP'] = 'Toevoegen groep';
-$HEADING['ADD_GROUPS'] = 'Toevoegen groepen';
-$HEADING['ADD_HEADING'] = 'Toevoegen titel';
-$HEADING['ADD_PAGE'] = 'Toevoegen nieuwe pagina';
-$HEADING['ADD_USER'] = 'Toevoegen gebruiker';
-$HEADING['ADMINISTRATION_TOOLS'] = 'Beheerfuncties';
-$HEADING['BROWSE_MEDIA'] = 'Bladeren door Media-map';
-$HEADING['CREATE_FOLDER'] = 'Toevoegen nieuwe map';
-$HEADING['DEFAULT_SETTINGS'] = 'Standaardinstellingen';
-$HEADING['DELETED_PAGES'] = 'Verwijderde pagina&rsquo;s';
-$HEADING['FILESYSTEM_SETTINGS'] = 'Bestandssysteeminstellingen';
-$HEADING['GENERAL_SETTINGS'] = 'Algemene instellingen';
-$HEADING['INSTALL_LANGUAGE'] = 'Toevoegen taalbestand';
-$HEADING['INSTALL_MODULE'] = 'Toevoegen module';
-$HEADING['INSTALL_TEMPLATE'] = 'Toevoegen template';
-$HEADING['INVOKE_LANGUAGE_FILES'] = 'Taal-bestanden handmatig inschakelen';
-$HEADING['INVOKE_MODULE_FILES'] = 'Handmatige module-installatie';
-$HEADING['INVOKE_TEMPLATE_FILES'] = 'Template-bestanden handmatig inschakelen';
-$HEADING['LANGUAGE_DETAILS'] = 'Taalbestandgegevens';
-$HEADING['MANAGE_SECTIONS'] = 'Sectiebeheer';
-$HEADING['MODIFY_ADVANCED_PAGE_SETTINGS'] = 'Geavanceerde pagina-instellingen';
-$HEADING['MODIFY_DELETE_GROUP'] = 'Beheren groep';
-$HEADING['MODIFY_DELETE_PAGE'] = 'Beheren bestaande pagina&rsquo;s';
-$HEADING['MODIFY_DELETE_USER'] = 'Beheren gebruikers';
-$HEADING['MODIFY_GROUP'] = 'Groepsgegevens';
-$HEADING['MODIFY_GROUPS'] = 'Modify Groups';
-$HEADING['MODIFY_INTRO_PAGE'] = 'Wijzigen introductiepagina';
-$HEADING['MODIFY_PAGE'] = 'Aanpassen pagina';
-$HEADING['MODIFY_PAGE_SETTINGS'] = 'Pagina-instellingen';
-$HEADING['MODIFY_USER'] = 'Gebruikersgegevens';
-$HEADING['MODULE_DETAILS'] = 'Modulegegevens';
-$HEADING['MY_EMAIL'] = 'Mijn e-mailadres';
-$HEADING['MY_PASSWORD'] = 'Mijn wachtwoord';
-$HEADING['MY_SETTINGS'] = 'Mijn gegevens';
-$HEADING['SEARCH_SETTINGS'] = 'Zoekinstellingen';
-$HEADING['SERVER_SETTINGS'] = 'Serverinstellingen';
-$HEADING['TEMPLATE_DETAILS'] = 'Templategegevens';
-$HEADING['UNINSTALL_LANGUAGE'] = 'Verwijderen taalbestand';
-$HEADING['UNINSTALL_MODULE'] = 'Verwijderen module';
-$HEADING['UNINSTALL_TEMPLATE'] = 'Verwijderen template';
-$HEADING['UPGRADE_LANGUAGE'] = 'Upgraden/inschakelen taalbestand';
-$HEADING['UPLOAD_FILES'] = 'Uploaden bestanden';
-$HEADING['WBMAILER_SETTINGS'] = 'Mailer-instellingen';
-
-/* MESSAGE */
-$MESSAGE['ADDON_ERROR_RELOAD'] = 'Fout tijdens het updaten van de add-onbestanden.';
-$MESSAGE['ADDON_LANGUAGES_RELOADED'] = 'Taalbestanden succesvol herladen';
-$MESSAGE['ADDON_MANUAL_FTP_LANGUAGE'] = '<strong>ATTENTIE!</strong> Om veiligheidsredenen dient u de taalbestanden in de folder /languages/ via FTP te uploaden en vervolgens de Upgrade-functie te gebruiken om ze aan het systeem toe te voegen.';
-$MESSAGE['ADDON_MANUAL_FTP_WARNING'] = 'Waarschuwing: bestaande module database-informatie zal verloren gaan! ';
-$MESSAGE['ADDON_MANUAL_INSTALLATION'] = 'When modules are uploaded via FTP (not recommended), the module installation functions <tt>install</tt>, <tt>upgrade</tt> or <tt>uninstall</tt> will not be executed automatically. Those modules may not work correct or do not uninstall properly.<br /><br />You can execute the module functions manually for modules uploaded via FTP below.';
-$MESSAGE['ADDON_MANUAL_INSTALLATION_WARNING'] = 'Waarschuwing: de bestaande module database-informatie zal verloren gaan! Gebruik deze optie alleen indien u ervaring heeft met modules die zijn geupload via FTP.';
-$MESSAGE['ADDON_MANUAL_RELOAD_WARNING'] = 'Waarschuwing: de bestaande module database-informatie zal verloren gaan! ';
-$MESSAGE['ADDON_MODULES_RELOADED'] = 'Modules succesvol herladen';
-$MESSAGE['ADDON_OVERWRITE_NEWER_FILES'] = 'Nieuwere bestanden overschrijven';
-$MESSAGE['ADDON_PRECHECK_FAILED'] = 'Add-on installatie mislukt. Uw systeem voldoet niet aan de eisen van deze add-on. Om deze situatie te veranderen kunt u de informatie hieronder toepassen.';
-$MESSAGE['ADDON_RELOAD'] = 'Update database met informatie uit de add-on bestanden (bijvoorbeeld na FTP-upload).';
-$MESSAGE['ADDON_TEMPLATES_RELOADED'] = 'Templates succesvol herladen';
-$MESSAGE['ADMIN_INSUFFICIENT_PRIVELLIGES'] = 'Onvoldoende rechten om hier te zijn';
-$MESSAGE['FORGOT_PASS_ALREADY_RESET'] = 'Sorry, het wachtwoord kan maximaal eens per uur worden aangepast.';
-$MESSAGE['FORGOT_PASS_CANNOT_EMAIL'] = 'Het is niet mogelijk uw wachtwoord per e-mail te versturen. Neem contact op met de beheerder';
-$MESSAGE['FORGOT_PASS_EMAIL_NOT_FOUND'] = 'Het door u opgegeven e-mailadres is niet gevonden in onze database';
-$MESSAGE['FORGOT_PASS_NO_DATA'] = 'Vult u alstublieft uw e-mailadres hieronder in';
-$MESSAGE['FORGOT_PASS_PASSWORD_RESET'] = 'Uw gebruikersnaam en wachtwoord zijn verzonden naar het opgegeven e-mailadres';
-$MESSAGE['FRONTEND_SORRY_NO_ACTIVE_SECTIONS'] = 'Sorry, er is niets om af te beelden';
-$MESSAGE['FRONTEND_SORRY_NO_VIEWING_PERMISSIONS'] = 'Sorry, u heeft geen bevoegdheden om deze pagina te bekijken';
-$MESSAGE['GENERIC_ALREADY_INSTALLED'] = 'Is al ge&iuml;nstalleerd';
-$MESSAGE['GENERIC_BAD_PERMISSIONS'] = 'Kan niet schrijven naar doelmap';
-$MESSAGE['GENERIC_BE_PATIENT'] = 'Please be patient.';
-$MESSAGE['GENERIC_CANNOT_UNINSTALL'] = 'Kan niet de&iuml;nstalleren';
-$MESSAGE['GENERIC_CANNOT_UNINSTALL_IN_USE'] = 'Kan niet de&iuml;nstalleren: het geselecteerde bestand is in gebruik';
-$MESSAGE['GENERIC_CANNOT_UNINSTALL_IN_USE_TMPL'] = '<br /><br />De {{type}} <b>{{type_name}}</b> kan niet verwijderd worden omdat het in gebruik is op {{pages}}:<br /><br />';
-$MESSAGE['GENERIC_CANNOT_UNINSTALL_IN_USE_TMPL_PAGES'] = 'volgende pagina;volgende pagina\'s';
-$MESSAGE['GENERIC_CANNOT_UNINSTALL_IS_DEFAULT_TEMPLATE'] = 'De template <b>{{name}}</b> kan niet verwijderd worden omdat het de standaard-template is.';
-$MESSAGE['GENERIC_CANNOT_UNINSTALL_IS_DEFAULT_THEME'] = 'Het is niet mogelijk de template <b>{{name}}</b> te verwijderen omdat het het standaard admin-thema is.';
-$MESSAGE['GENERIC_CANNOT_UNZIP'] = 'Kan het bestand niet uitpakken';
-$MESSAGE['GENERIC_CANNOT_UPLOAD'] = 'Kan niet uploaden';
-$MESSAGE['GENERIC_COMPARE'] = ' succesvol';
-$MESSAGE['GENERIC_ERROR_OPENING_FILE'] = 'Kan bestand niet openen.';
-$MESSAGE['GENERIC_FAILED_COMPARE'] = ' mislukt';
-$MESSAGE['GENERIC_FILE_TYPE'] = 'Let op: het bestand moet het volgende formaat hebben:';
-$MESSAGE['GENERIC_FILE_TYPES'] = 'Let op: de bestanden moeten het volgende formaat hebben:';
-$MESSAGE['GENERIC_FILL_IN_ALL'] = 'Niet alle velden zijn ingevuld. Probeert u het nog eens';
-$MESSAGE['GENERIC_FORGOT_OPTIONS'] = 'U heeft niets geselecteerd!';
-$MESSAGE['GENERIC_INSTALLED'] = 'Installatie voltooid';
-$MESSAGE['GENERIC_INVALID'] = 'Ongeldig bestand';
-$MESSAGE['GENERIC_INVALID_ADDON_FILE'] = 'Ongeldig WebsiteBaker installatiebestand. Controleer het *.zip bestand.';
-$MESSAGE['GENERIC_INVALID_LANGUAGE_FILE'] = 'Ongeldig WebsiteBaker taalbestand. Controleer het tekstbestand.';
-$MESSAGE['GENERIC_INVALID_MODULE_FILE'] = 'Ongeldig WebsiteBaker modulebestand. Controleer het tekstbestand';
-$MESSAGE['GENERIC_INVALID_TEMPLATE_FILE'] = 'Ongeldig WebsiteBaker template-bestand. Controleer het tekstbestand';
-$MESSAGE['GENERIC_IN_USE'] = ' gebruikt in ';
-$MESSAGE['GENERIC_MISSING_ARCHIVE_FILE'] = 'Ontbrekend archiefbestand!';
-$MESSAGE['GENERIC_MODULE_VERSION_ERROR'] = 'De module is niet juist ge&iuml;nstalleerd!';
-$MESSAGE['GENERIC_NOT_COMPARE'] = ' niet mogelijk';
-$MESSAGE['GENERIC_NOT_INSTALLED'] = 'Niet ge&iuml;nstalleerd';
-$MESSAGE['GENERIC_NOT_UPGRADED'] = 'Actualisatie niet mogelijk';
-$MESSAGE['GENERIC_PLEASE_BE_PATIENT'] = 'Even geduld aub, dit kan even duren.';
-$MESSAGE['GENERIC_PLEASE_CHECK_BACK_SOON'] = 'Probeert u het a.u.b. binnenkort nog eens.';
-$MESSAGE['GENERIC_SECURITY_ACCESS'] = 'Veiligheidsrisico! Toegang geweigerd!';
-$MESSAGE['GENERIC_SECURITY_OFFENSE'] = 'Veiligheidsrisico! Data-opslag geweigerd!';
-$MESSAGE['GENERIC_UNINSTALLED'] = 'De&iuml;nstallatie voltooid';
-$MESSAGE['GENERIC_UPGRADED'] = 'Upgrade voltooid';
-$MESSAGE['GENERIC_VERSION_COMPARE'] = 'Versievergelijking';
-$MESSAGE['GENERIC_VERSION_GT'] = 'Upgrade noodzakelijk!';
-$MESSAGE['GENERIC_VERSION_LT'] = 'Downgrade';
-$MESSAGE['GENERIC_WEBSITE_LOCKED'] = 'Deze site is tijdelijk offline wegens onderhoud.';
-$MESSAGE['GENERIC_WEBSITE_UNDER_CONSTRUCTION'] = 'Website in bewerking';
-$MESSAGE['GROUPS_ADDED'] = 'Groep toegevoegd';
-$MESSAGE['GROUPS_CONFIRM_DELETE'] = 'Weet u zeker dat u de geselecteerde groep wilt verwijderen (en alle daarbij behorende gebruikers)?';
-$MESSAGE['GROUPS_DELETED'] = 'Groep verwijderd';
-$MESSAGE['GROUPS_GROUP_NAME_BLANK'] = 'Groepsnaam is niet ingevuld';
-$MESSAGE['GROUPS_GROUP_NAME_EXISTS'] = 'Groepnaam is reeds in gebruik';
-$MESSAGE['GROUPS_NO_GROUPS_FOUND'] = 'Geen groep gevonden';
-$MESSAGE['GROUPS_SAVED'] = 'Groep opgeslagen';
-$MESSAGE['LOGIN_AUTHENTICATION_FAILED'] = 'Gebruikersnaam en/of wachtwoord incorrect';
-$MESSAGE['LOGIN_BOTH_BLANK'] = 'Vul uw gebruikersnaam en wachtwoord in:';
-$MESSAGE['LOGIN_PASSWORD_BLANK'] = 'Vul uw wachtwoord in';
-$MESSAGE['LOGIN_PASSWORD_TOO_LONG'] = 'Dit wachtwoord is te lang';
-$MESSAGE['LOGIN_PASSWORD_TOO_SHORT'] = 'Dit wachtwoord is te kort';
-$MESSAGE['LOGIN_USERNAME_BLANK'] = 'Vul uw gebruikersnaam in';
-$MESSAGE['LOGIN_USERNAME_TOO_LONG'] = 'Deze gebruikersnaam is te lang';
-$MESSAGE['LOGIN_USERNAME_TOO_SHORT'] = 'Deze gebruikersnaam is te kort';
-$MESSAGE['MEDIA_BLANK_EXTENSION'] = 'U heeft geen bestandsextensie opgegeven';
-$MESSAGE['MEDIA_BLANK_NAME'] = 'U heeft geen nieuwe naam opgegeven';
-$MESSAGE['MEDIA_CANNOT_DELETE_DIR'] = 'Kan geselecteerde map niet verwijderen';
-$MESSAGE['MEDIA_CANNOT_DELETE_FILE'] = 'Kan geselecteerde bestand niet verwijderen';
-$MESSAGE['MEDIA_CANNOT_RENAME'] = 'Hernoemen niet gelukt';
-$MESSAGE['MEDIA_CONFIRM_DELETE'] = 'Weet u zeker dat u het volgende bestand of map wilt verwijderen?';
-$MESSAGE['MEDIA_DELETED_DIR'] = 'Map verwijderd';
-$MESSAGE['MEDIA_DELETED_FILE'] = 'Bestand verwijderd';
-$MESSAGE['MEDIA_DIR_ACCESS_DENIED'] = 'Specified directory does not exist or is not allowed.';
-$MESSAGE['MEDIA_DIR_DOES_NOT_EXIST'] = 'Map bestaat niet';
-$MESSAGE['MEDIA_DIR_DOT_DOT_SLASH'] = 'Gebruik van ../ in de mapnaam is niet toegestaan';
-$MESSAGE['MEDIA_DIR_EXISTS'] = 'Opgegeven naam van de map bestaat al';
-$MESSAGE['MEDIA_DIR_MADE'] = 'Map aangemaakt';
-$MESSAGE['MEDIA_DIR_NOT_MADE'] = 'Aanmaken map mislukt';
-$MESSAGE['MEDIA_FILE_EXISTS'] = 'Opgegeven bestandsnaam bestaat al';
-$MESSAGE['MEDIA_FILE_NOT_FOUND'] = 'Bestand niet gevonden';
-$MESSAGE['MEDIA_NAME_DOT_DOT_SLASH'] = 'Gebruik van ../ in de naam is niet toegestaan';
-$MESSAGE['MEDIA_NAME_INDEX_PHP'] = 'index.php als naam is niet toegestaan';
-$MESSAGE['MEDIA_NONE_FOUND'] = 'Geen mediabestanden gevonden in de huidige map';
-$MESSAGE['MEDIA_NO_FILE_UPLOADED'] = 'geen bestand(en) ontvangen';
-$MESSAGE['MEDIA_RENAMED'] = 'Hernoemen geslaagd';
-$MESSAGE['MEDIA_SINGLE_UPLOADED'] = ' geupload';
-$MESSAGE['MEDIA_TARGET_DOT_DOT_SLASH'] = 'Gebruik van ../ in de map is niet toegestaan';
-$MESSAGE['MEDIA_UPLOADED'] = ' geupload';
-$MESSAGE['MOD_FORM_EXCESS_SUBMISSIONS'] = 'Dit formulier is te vaak verstuurd binnen dit uur. Probeert u het over een uur nog eens.';
-$MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'] = 'Het verificatienummer (ook wel Captcha genoemd) dat u hebt ingevoerd is incorrect. Als u de Captcha niet goed kunt lezen, stuur dan een e-mail naar: SERVER_EMAIL';
-$MESSAGE['MOD_FORM_REQUIRED_FIELDS'] = 'De volgende velden zijn verplicht';
-$MESSAGE['PAGES_ADDED'] = 'Pagina toegevoegd';
-$MESSAGE['PAGES_ADDED_HEADING'] = 'Paginatitel opgeslagen';
-$MESSAGE['PAGES_BLANK_MENU_TITLE'] = 'Vul a.u.b. een menutitel in';
-$MESSAGE['PAGES_BLANK_PAGE_TITLE'] = 'Vul a.u.b. een paginatitel in';
-$MESSAGE['PAGES_CANNOT_CREATE_ACCESS_FILE'] = 'Kan geen bestanden opslaan in de /pages-map (onvoldoende rechten)';
-$MESSAGE['PAGES_CANNOT_DELETE_ACCESS_FILE'] = 'Kan geen bestanden verwijderen uit de /pages-map (onvoldoende rechten)';
-$MESSAGE['PAGES_CANNOT_REORDER'] = 'Fout bij herordenen pagina';
-$MESSAGE['PAGES_DELETED'] = 'Pagina verwijderd';
-$MESSAGE['PAGES_DELETE_CONFIRM'] = 'Weet u zeker dat u deze pagina wilt verwijderen (en al zijn subpagina&rsquo;s)';
-$MESSAGE['PAGES_INSUFFICIENT_PERMISSIONS'] = 'U heeft niet de rechten om deze pagina aan te passen';
-$MESSAGE['PAGES_INTRO_LINK'] = 'Klik hier om de introductiepagina aan te passen';
-$MESSAGE['PAGES_INTRO_NOT_WRITABLE'] = 'Kan instellingen niet opslaan in het bestand /pages/intro.php (onvoldoende rechten)';
-$MESSAGE['PAGES_INTRO_SAVED'] = 'Introductiepagina opgeslagen';
-$MESSAGE['PAGES_LAST_MODIFIED'] = 'Als laatste aangepast door';
-$MESSAGE['PAGES_NOT_FOUND'] = 'Pagina niet gevonden';
-$MESSAGE['PAGES_NOT_SAVED'] = 'Fout tijdens opslaan pagina';
-$MESSAGE['PAGES_PAGE_EXISTS'] = 'Een pagina met dezelfde naam bestaat al';
-$MESSAGE['PAGES_REORDERED'] = 'Pagina herordend';
-$MESSAGE['PAGES_RESTORED'] = 'Pagina teruggehaald';
-$MESSAGE['PAGES_RETURN_TO_PAGES'] = 'Keer terug naar pagina&rsquo;s';
-$MESSAGE['PAGES_SAVED'] = 'Pagina opgeslagen';
-$MESSAGE['PAGES_SAVED_SETTINGS'] = 'Pagina-instellingen opgeslagen';
-$MESSAGE['PAGES_SECTIONS_PROPERTIES_SAVED'] = 'Sectie-instellingen opgeslagen';
-$MESSAGE['PREFERENCES_CURRENT_PASSWORD_INCORRECT'] = 'Het (huidige) ingevoerde wachtwoord is niet correct';
-$MESSAGE['PREFERENCES_DETAILS_SAVED'] = 'Details opgeslagen';
-$MESSAGE['PREFERENCES_EMAIL_UPDATED'] = 'E-mail gewijzigd';
-$MESSAGE['PREFERENCES_INVALID_CHARS'] = 'Ongeldige wachtwoordtekens gebruikt';
-$MESSAGE['PREFERENCES_PASSWORD_CHANGED'] = 'Wachtwoord gewijzigd';
-$MESSAGE['RECORD_MODIFIED_FAILED'] = 'De aanpassing is mislukt.';
-$MESSAGE['RECORD_MODIFIED_SAVED'] = 'De aanpassing is opgeslagen.';
-$MESSAGE['RECORD_NEW_FAILED'] = 'De toevoeging is mislukt.';
-$MESSAGE['RECORD_NEW_SAVED'] = 'De toevoeging is opgeslagen';
-$MESSAGE['SETTINGS_MODE_SWITCH_WARNING'] = 'Opgelet: sla eerst de wijzigingen op die u eventueel zojuist heeft aangebracht!';
-$MESSAGE['SETTINGS_SAVED'] = 'Instellingen opgeslagen';
-$MESSAGE['SETTINGS_UNABLE_OPEN_CONFIG'] = 'Het configuratiebestand kan niet worden geopend';
-$MESSAGE['SETTINGS_UNABLE_WRITE_CONFIG'] = 'Het configuratiebestand kan niet worden opgeslagen';
-$MESSAGE['SETTINGS_WORLD_WRITEABLE_WARNING'] = 'Opgelet: dit is alleen bedoeld voor testdoeleinden!';
-$MESSAGE['SIGNUP2_ADMIN_INFO'] = '
-Een nieuwe gebruiker heeft zich aangemeld.
-
-Gebruikersnaam: {LOGIN_NAME}
-Gebruiker Id: {LOGIN_ID}
-E-mail: {LOGIN_EMAIL}
-IP-adres: {LOGIN_IP}
-Registratiedatum: {SIGNUP_DATE}
-----------------------------------------
-Dit bericht is automatisch aangemaakt!
-
-';
-$MESSAGE['SIGNUP2_BODY_LOGIN_FORGOT'] = '
-Beste {LOGIN_DISPLAY_NAME},
-
-deze mail is aan u verzonden omdat u de \'wachtwoord vergeten\' functie heeft gebruikt.
-
-Uw nieuwe \'{LOGIN_WEBSITE_TITLE}\' inloggegevens zijn:
-
-Gebruikersnaam: {LOGIN_NAME}
-Wachtwoord: {LOGIN_PASSWORD}
-
-Let op: dit is een automatisch aangemaakt nieuw wachtwoord. Uw oude wachtwoord is niet meer geldig!
-Heeft u vragen of opmerkingen, neem dan contact op met de websitebeheerder.
-
-Het is aan te raden om uw browser-cache te legen voordat u het nieuwe wachtwoord gebruikt.
-
-Vriendelijke groet
-
-------------------------------------
-Dit bericht is automatisch aangemaakt!
-
-';
-$MESSAGE['SIGNUP2_BODY_LOGIN_INFO'] = '
-Beste {LOGIN_DISPLAY_NAME},
-
-Welkom bij \'{LOGIN_WEBSITE_TITLE}\'.
-
-Uw \'{LOGIN_WEBSITE_TITLE}\' inloggegevens zijn:
-Gebruikersnaam: {LOGIN_NAME}
-Wachtwoord: {LOGIN_PASSWORD}
-
-Vriendelijke groet
-
--------------------------------------
-Dit bericht is automatisch aangemaakt!
-';
-$MESSAGE['SIGNUP2_SUBJECT_LOGIN_INFO'] = 'Uw inloggegevens...';
-$MESSAGE['SIGNUP_NO_EMAIL'] = 'U moet een e-mailadres invullen';
-$MESSAGE['START_CURRENT_USER'] = 'U bent ingelogd als';
-$MESSAGE['START_INSTALL_DIR_EXISTS'] = 'Waarschuwing, de installatiemap bestaat nog steeds. U dient deze te verwijderen om veiligheidsrisico&rsquo;s te vermijden!';
-$MESSAGE['START_WELCOME_MESSAGE'] = 'Welkom bij het websitebeheer';
-$MESSAGE['TEMPLATES_CHANGE_TEMPLATE_NOTICE'] = 'Attentie: om de template aan te passen moet u naar de instellingensectie';
-$MESSAGE['USERS_ADDED'] = 'Gebruiker toegevoegd';
-$MESSAGE['USERS_CANT_SELFDELETE'] = 'Functie geweigerd. U kunt zichzelf niet verwijderen!';
-$MESSAGE['USERS_CHANGING_PASSWORD'] = 'Attentie: vul alleen de bovenstaande velden in wanneer u het wachtwoord van de gebruiker wilt veranderen';
-$MESSAGE['USERS_CONFIRM_DELETE'] = 'Weet u zeker dat u de geselecteerde gebruiker wilt verwijderen?';
-$MESSAGE['USERS_DELETED'] = 'Gebruiker verwijderd';
-$MESSAGE['USERS_EMAIL_TAKEN'] = 'Het ingevoerde e-mailadres is al in gebruik';
-$MESSAGE['USERS_INVALID_EMAIL'] = 'Het ingevoerde e-mailadres is niet correct';
-$MESSAGE['USERS_NAME_INVALID_CHARS'] = 'Ongeldige tekens voor de gebruikersnaam ingevoerd';
-$MESSAGE['USERS_NO_GROUP'] = 'Geen groep geselecteerd';
-$MESSAGE['USERS_PASSWORD_MISMATCH'] = 'De ingevoerde wachtwoorden komen niet overeen';
-$MESSAGE['USERS_PASSWORD_TOO_SHORT'] = 'Het ingevoerde wachtwoord is te kort';
-$MESSAGE['USERS_SAVED'] = 'Gebruiker opgeslagen';
-$MESSAGE['USERS_USERNAME_TAKEN'] = 'De ingevoerde gebruikersnaam is al in gebruik';
-$MESSAGE['USERS_USERNAME_TOO_SHORT'] = 'De ingevoerde  gebruikersnaam is te kort';
-
-/* OVERVIEW */
-$OVERVIEW['ADMINTOOLS'] = 'Diverse extra beheerinstellingen.';
-$OVERVIEW['GROUPS'] = 'Beheren van de gebruikersgroepen en hun rechten.';
-$OVERVIEW['HELP'] = 'Uitgebreide hulp voor het gebruik van dit systeem.';
-$OVERVIEW['LANGUAGES'] = 'Beheren van de aanwezige taalbestanden.';
-$OVERVIEW['MEDIA'] = 'Beheren van bestanden in de Media-map.';
-$OVERVIEW['MODULES'] = 'Beheren van modules die extra functies toevoegen aan uw site.';
-$OVERVIEW['PAGES'] = 'Aanmaken en beheren van de sitestructuur en pagina&rsquo;s.';
-$OVERVIEW['PREFERENCES'] = 'Beheren van uw persoonlijk profiel.';
-$OVERVIEW['SETTINGS'] = 'Beheren van de technische website-instellingen.';
-$OVERVIEW['START'] = 'Websitebeheer';
-$OVERVIEW['TEMPLATES'] = 'Beheren van de templates die u kunt toepassen.';
-$OVERVIEW['USERS'] = 'Beheren van de gebruikers van uw website.';
-$OVERVIEW['VIEW'] = 'Bekijk uw website zoals deze voor bezoekers te zien is (in een afzonderlijk venster).';
-
-/* include old languages format */
-if(file_exists(WB_PATH.'/languages/old.format.inc.php'))
-{
-	include(WB_PATH.'/languages/old.format.inc.php');
-}
-
+<?php
+/**
+ *
+ * @category        framework
+ * @package         language
+ * @author          WebsiteBaker Project
+ * @copyright       2004-2009, Ryan Djurovich
+ * @copyright       2009-2011, Website Baker Org. e.V.
+ * @link			http://www.websitebaker2.org/
+ * @license         http://www.gnu.org/licenses/gpl.html
+ * @platform        WebsiteBaker 2.8.x
+ * @requirements    PHP 5.2.2 and higher
+ * @version         $Id$
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
+ *
+ */
+
+// Must include code to stop this file being access directly
+if(defined('WB_PATH') == false) { exit("Cannot access this file directly"); }
+
+// Define that this file is loaded
+if(!defined('LANGUAGE_LOADED')) {
+define('LANGUAGE_LOADED', true);
+}
+
+// Set the language information
+$language_code = 'NL';
+$language_name = 'Nederlands';
+$language_version = '2.8';
+$language_platform = '2.8.x';
+$language_author = 'Bramus, CodeALot, Luckyluke, Argos';
+$language_license = 'GNU General Public License';
+
+/* MENU */
+$MENU['ACCESS'] = 'Toegang';
+$MENU['ADDON'] = 'Add-on';
+$MENU['ADDONS'] = 'Extra&rsquo;s';
+$MENU['ADMINTOOLS'] = 'Beheerfuncties';
+$MENU['BREADCRUMB'] = 'U bent hier: ';
+$MENU['FORGOT'] = 'Inloggegevens opnieuw aanvragen';
+$MENU['GROUP'] = 'Groep';
+$MENU['GROUPS'] = 'Groepen';
+$MENU['HELP'] = 'Help';
+$MENU['LANGUAGES'] = 'Talen';
+$MENU['LOGIN'] = 'Inloggen';
+$MENU['LOGOUT'] = 'Uitloggen';
+$MENU['MEDIA'] = 'Media';
+$MENU['MODULES'] = 'Modules';
+$MENU['PAGES'] = 'Pagina&rsquo;s';
+$MENU['PREFERENCES'] = 'Profiel';
+$MENU['SETTINGS'] = 'Instellingen';
+$MENU['START'] = 'Naar het hoofdmenu';
+$MENU['TEMPLATES'] = 'Templates';
+$MENU['USERS'] = 'Gebruikers';
+$MENU['VIEW'] = 'Website';
+
+/* TEXT */
+$TEXT['ACCOUNT_SIGNUP'] = 'Aanmelden als gebruiker';
+$TEXT['ACTIONS'] = 'Acties';
+$TEXT['ACTIVE'] = 'Actief';
+$TEXT['ADD'] = 'Toevoegen';
+$TEXT['ADDON'] = 'Add-On';
+$TEXT['ADD_SECTION'] = 'Toevoegen sectie';
+$TEXT['ADMIN'] = 'Beheer';
+$TEXT['ADMINISTRATION'] = 'Beheer';
+$TEXT['ADMINISTRATION_TOOL'] = 'Beheeropties';
+$TEXT['ADMINISTRATOR'] = 'Administrator';
+$TEXT['ADMINISTRATORS'] = 'Beheerders';
+$TEXT['ADVANCED'] = 'Geavanceerd';
+$TEXT['ALLOWED_FILETYPES_ON_UPLOAD'] = 'Toegestane upload-bestanden';
+$TEXT['ALLOWED_VIEWERS'] = 'Toegestane kijkers';
+$TEXT['ALLOW_MULTIPLE_SELECTIONS'] = 'Meerdere selecties toestaan';
+$TEXT['ALL_WORDS'] = 'Term of deel van term';
+$TEXT['ANCHOR'] = 'Anker';
+$TEXT['ANONYMOUS'] = 'Anoniem';
+$TEXT['ANY_WORDS'] = 'E&eacute;n van de termen';
+$TEXT['APP_NAME'] = 'Applicatienaam';
+$TEXT['ARE_YOU_SURE'] = 'Weet u het zeker?';
+$TEXT['AUTHOR'] = 'Auteur';
+$TEXT['BACK'] = 'Terug';
+$TEXT['BACKUP'] = 'Backup maken';
+$TEXT['BACKUP_ALL_TABLES'] = 'Backup van alle tabellen in de database';
+$TEXT['BACKUP_DATABASE'] = 'Backup van de database maken';
+$TEXT['BACKUP_MEDIA'] = 'Backup van de Media-map maken';
+$TEXT['BACKUP_WB_SPECIFIC'] = 'Backup van alleen WB-gerelateerde tabellen';
+$TEXT['BASIC'] = 'Basis';
+$TEXT['BLOCK'] = 'Blok';
+$TEXT['CALENDAR'] = 'Kalender';
+$TEXT['CANCEL'] = 'Annuleren';
+$TEXT['CAN_DELETE_HIMSELF'] = 'Kan zichzelf verwijderen';
+$TEXT['CAPTCHA_VERIFICATION'] = 'Captcha-verificatie';
+$TEXT['CAP_EDIT_CSS'] = 'Wijzig CSS';
+$TEXT['CHANGE'] = 'Verander';
+$TEXT['CHANGES'] = 'Veranderingen';
+$TEXT['CHANGE_SETTINGS'] = 'Wijzig instellingen';
+$TEXT['CHARSET'] = 'Tekenset';
+$TEXT['CHECKBOX_GROUP'] = 'Aankruisvakjes';
+$TEXT['CLOSE'] = 'Sluiten';
+$TEXT['CODE'] = 'Code';
+$TEXT['CODE_SNIPPET'] = 'Code snippet';
+$TEXT['COLLAPSE'] = 'Inklappen';
+$TEXT['COMMENT'] = 'Reageren';
+$TEXT['COMMENTING'] = 'Reactie-opties';
+$TEXT['COMMENTS'] = 'Reacties';
+$TEXT['CREATE_FOLDER'] = 'Cre&euml;er map';
+$TEXT['CURRENT'] = 'Huidig(e)';
+$TEXT['CURRENT_FOLDER'] = 'Huidige map';
+$TEXT['CURRENT_PAGE'] = 'Huidige pagina';
+$TEXT['CURRENT_PASSWORD'] = 'Huidig wachtwoord';
+$TEXT['CUSTOM'] = 'Handmatige invoer';
+$TEXT['DATABASE'] = 'Database';
+$TEXT['DATE'] = 'Datum';
+$TEXT['DATE_FORMAT'] = 'Datumweergave';
+$TEXT['DEFAULT'] = 'Standaard';
+$TEXT['DEFAULT_CHARSET'] = 'Standaard tekenset';
+$TEXT['DEFAULT_TEXT'] = 'Standaardtekst';
+$TEXT['DELETE'] = 'Verwijderen';
+$TEXT['DELETED'] = 'Verwijderd';
+$TEXT['DELETE_DATE'] = 'Wis datum';
+$TEXT['DELETE_ZIP'] = 'Verwijder ZIP van server na uitpakken';
+$TEXT['DESCRIPTION'] = 'Metatag "Description"';
+$TEXT['DESIGNED_FOR'] = 'Ontworpen voor';
+$TEXT['DIRECTORIES'] = 'Mappen';
+$TEXT['DIRECTORY_MODE'] = 'Directory-modus';
+$TEXT['DISABLED'] = 'Uit';
+$TEXT['DISPLAY_NAME'] = 'Naamweergave';
+$TEXT['EMAIL'] = 'E-mail';
+$TEXT['EMAIL_ADDRESS'] = 'E-mailadres';
+$TEXT['EMPTY_TRASH'] = 'Prullenbak legen';
+$TEXT['ENABLED'] = 'Aan';
+$TEXT['END'] = 'Einde';
+$TEXT['ERROR'] = 'Fout';
+$TEXT['EXACT_MATCH'] = 'Exacte term';
+$TEXT['EXECUTE'] = 'Uitvoeren';
+$TEXT['EXPAND'] = 'Uitklappen';
+$TEXT['EXTENSION'] = 'Extensie';
+$TEXT['FIELD'] = 'Veld';
+$TEXT['FILE'] = 'Bestand';
+$TEXT['FILES'] = 'bestanden';
+$TEXT['FILESYSTEM_PERMISSIONS'] = 'Bestandssysteembevoegdheden';
+$TEXT['FILE_MODE'] = 'Bestandsmodus';
+$TEXT['FINISH_PUBLISHING'] = 'Einde publicatie';
+$TEXT['FOLDER'] = 'Map';
+$TEXT['FOLDERS'] = 'Mappen';
+$TEXT['FOOTER'] = 'Footer';
+$TEXT['FORGOTTEN_DETAILS'] = 'Gegevens vergeten?';
+$TEXT['FORGOT_DETAILS'] = 'Gegevens vergeten?';
+$TEXT['FROM'] = 'Van';
+$TEXT['FRONTEND'] = 'Website';
+$TEXT['FULL_NAME'] = 'Volledige naam';
+$TEXT['FUNCTION'] = 'Functie';
+$TEXT['GROUP'] = 'Groep';
+$TEXT['HEADER'] = 'Header';
+$TEXT['HEADING'] = 'Titel';
+$TEXT['HEADING_CSS_FILE'] = 'Actuele modulebestand: ';
+$TEXT['HEIGHT'] = 'Hoogte';
+$TEXT['HIDDEN'] = 'Verborgen';
+$TEXT['HIDE'] = 'Verbergen';
+$TEXT['HIDE_ADVANCED'] = 'Verberg geavanceerde opties';
+$TEXT['HOME'] = 'Home';
+$TEXT['HOMEPAGE_REDIRECTION'] = 'Homepage-omleiding';
+$TEXT['HOME_FOLDER'] = 'Persoonlijke folder';
+$TEXT['HOME_FOLDERS'] = 'Persoonlijke folders';
+$TEXT['HOST'] = 'Host';
+$TEXT['ICON'] = 'Icoon';
+$TEXT['IMAGE'] = 'Afbeelding';
+$TEXT['INLINE'] = 'Inline';
+$TEXT['INSTALL'] = 'Installeren';
+$TEXT['INSTALLATION'] = 'Installatie';
+$TEXT['INSTALLATION_PATH'] = 'Installatiepad';
+$TEXT['INSTALLATION_URL'] = 'Installatie-URL';
+$TEXT['INSTALLED'] = 'ge&iuml;nstalleerd';
+$TEXT['INTRO'] = 'Introductie';
+$TEXT['INTRO_PAGE'] = 'Introductiepagina';
+$TEXT['INVALID_SIGNS'] = 'moet met een letter beginnen, of heeft een ongeldig teken';
+$TEXT['KEYWORDS'] = 'Metatag "Keywords"';
+$TEXT['LANGUAGE'] = 'Taal';
+$TEXT['LAST_UPDATED_BY'] = 'Laatste wijzigingen door';
+$TEXT['LENGTH'] = 'Lengte';
+$TEXT['LEVEL'] = 'Niveau';
+$TEXT['LINK'] = 'Link';
+$TEXT['LINUX_UNIX_BASED'] = 'Linux/Unix';
+$TEXT['LIST_OPTIONS'] = 'Lijstopties';
+$TEXT['LOGGED_IN'] = 'Ingelogd';
+$TEXT['LOGIN'] = 'Inloggen';
+$TEXT['LONG'] = 'Lang';
+$TEXT['LONG_TEXT'] = 'Lange tekst';
+$TEXT['LOOP'] = '"Loop"';
+$TEXT['MAIN'] = 'Primair(e)';
+$TEXT['MAINTENANCE_OFF'] = 'Onderhoud uit';
+$TEXT['MAINTENANCE_ON'] = 'Onderhoud aan';
+$TEXT['MANAGE'] = 'Beheren';
+$TEXT['MANAGE_GROUPS'] = 'Groepenbeheer';
+$TEXT['MANAGE_USERS'] = 'Gebruikersbeheer';
+$TEXT['MATCH'] = 'Gelijk aan';
+$TEXT['MATCHING'] = 'Overeenkomend';
+$TEXT['MAX_EXCERPT'] = 'Maximaal aantal gelijktijdige zoekacties';
+$TEXT['MAX_SUBMISSIONS_PER_HOUR'] = 'Maximaal aantal inzendingen per uur';
+$TEXT['MEDIA_DIRECTORY'] = 'Media-map';
+$TEXT['MENU'] = 'Menu';
+$TEXT['MENU_ICON_0'] = 'Menu-icoon normal';
+$TEXT['MENU_ICON_1'] = 'Menu-icoon hover';
+$TEXT['MENU_TITLE'] = 'Menutitel';
+$TEXT['MESSAGE'] = 'Bericht';
+$TEXT['MODIFY'] = 'Wijzigen';
+$TEXT['MODIFY_CONTENT'] = 'Wijzig inhoud';
+$TEXT['MODIFY_SETTINGS'] = 'Wijzig instellingen';
+$TEXT['MODULE_ORDER'] = 'Modules doorzoeken';
+$TEXT['MODULE_PERMISSIONS'] = 'Modulebevoegdheden';
+$TEXT['MORE'] = 'Meer';
+$TEXT['MOVE_DOWN'] = 'Naar beneden';
+$TEXT['MOVE_UP'] = 'Naar boven';
+$TEXT['MULTIPLE_MENUS'] = 'Meerdere menu&rsquo;s';
+$TEXT['MULTISELECT'] = 'Meervoudige selectie';
+$TEXT['NAME'] = 'Naam';
+$TEXT['NEED_CURRENT_PASSWORD'] = 'Huidig wachtwoord';
+$TEXT['NEED_TO_LOGIN'] = 'Inloggen?';
+$TEXT['NEW_PASSWORD'] = 'Nieuw wachtwoord';
+$TEXT['NEW_WINDOW'] = 'Nieuw scherm';
+$TEXT['NEXT'] = 'Volgende';
+$TEXT['NEXT_PAGE'] = 'Volgende pagina';
+$TEXT['NO'] = 'Nee';
+$TEXT['NONE'] = 'Geen';
+$TEXT['NONE_FOUND'] = 'Niet gevonden';
+$TEXT['NOT_FOUND'] = 'Niet gevonden';
+$TEXT['NOT_INSTALLED'] = 'niet ge&iuml;nstalleerd';
+$TEXT['NO_IMAGE_SELECTED'] = 'geen afbeelding geselecteerd';
+$TEXT['NO_RESULTS'] = 'Geen resultaten';
+$TEXT['OF'] = 'van de';
+$TEXT['ON'] = 'Op';
+$TEXT['OPEN'] = 'Openen';
+$TEXT['OPTION'] = 'Optie';
+$TEXT['OTHERS'] = 'Anderen';
+$TEXT['OUT_OF'] = 'Buiten';
+$TEXT['OVERWRITE_EXISTING'] = 'Overschrijf bestaand(e)';
+$TEXT['PAGE'] = 'Pagina';
+$TEXT['PAGES_DIRECTORY'] = 'Pagina&rsquo;s-map';
+$TEXT['PAGES_PERMISSION'] = 'Paginapermissie';
+$TEXT['PAGES_PERMISSIONS'] = 'Paginapermissies';
+$TEXT['PAGE_EXTENSION'] = 'Pagina-extensie';
+$TEXT['PAGE_ICON'] = 'Pagina-afbeelding';
+$TEXT['PAGE_ICON_DIR'] = 'Pad naar pagina- en menu-afbeeldingen';
+$TEXT['PAGE_LANGUAGES'] = 'Meerdere talen';
+$TEXT['PAGE_LEVEL_LIMIT'] = 'Paginaniveaulimiet';
+$TEXT['PAGE_SPACER'] = 'Pagina-spacer';
+$TEXT['PAGE_TITLE'] = 'Paginatitel';
+$TEXT['PAGE_TRASH'] = 'Paginaprullenbak';
+$TEXT['PARENT'] = 'Ouder';
+$TEXT['PASSWORD'] = 'Wachtwoord';
+$TEXT['PATH'] = 'Pad';
+$TEXT['PHP_ERROR_LEVEL'] = 'PHP-foutmeldingsniveau';
+$TEXT['PLEASE_LOGIN'] = 'Inloggen aub';
+$TEXT['PLEASE_SELECT'] = 'Selecteer';
+$TEXT['POST'] = 'Bericht';
+$TEXT['POSTS_PER_PAGE'] = 'Berichten per pagina';
+$TEXT['POST_FOOTER'] = 'Bericht-footer';
+$TEXT['POST_HEADER'] = 'Bericht-header';
+$TEXT['PREVIOUS'] = 'Vorige';
+$TEXT['PREVIOUS_PAGE'] = 'Vorige pagina';
+$TEXT['PRIVATE'] = 'Aangemeld';
+$TEXT['PRIVATE_VIEWERS'] = 'Aangemelde bezoekers';
+$TEXT['PROFILES_EDIT'] = 'Change the profile';
+$TEXT['PUBLIC'] = 'Iedereen';
+$TEXT['PUBL_END_DATE'] = 'Einddatum';
+$TEXT['PUBL_START_DATE'] = 'Startdatum';
+$TEXT['RADIO_BUTTON_GROUP'] = 'Radio buttons';
+$TEXT['READ'] = 'Lees';
+$TEXT['READ_MORE'] = 'Lees verder';
+$TEXT['REDIRECT_AFTER'] = 'Omleiding na (sec.)';
+$TEXT['REGISTERED'] = 'Geregistreerd';
+$TEXT['REGISTERED_VIEWERS'] = 'Geregistreerde bezoekers';
+$TEXT['RELOAD'] = 'Vernieuwen';
+$TEXT['REMEMBER_ME'] = 'Onthoud mijn gegevens.';
+$TEXT['RENAME'] = 'Hernoemen';
+$TEXT['RENAME_FILES_ON_UPLOAD'] = 'Bestanden hernoemen bij uploaden';
+$TEXT['REQUIRED'] = 'Verplicht';
+$TEXT['REQUIREMENT'] = 'Benodigd';
+$TEXT['RESET'] = 'Opnieuw';
+$TEXT['RESIZE'] = 'Veranderen grootte';
+$TEXT['RESIZE_IMAGE_TO'] = 'Verander afbeeldingsgrootte naar';
+$TEXT['RESTORE'] = 'Backup terugzetten';
+$TEXT['RESTORE_DATABASE'] = 'Backup van de database terugzetten';
+$TEXT['RESTORE_MEDIA'] = 'Backup van de Media-map terugzetten';
+$TEXT['RESULTS'] = 'Resultaten';
+$TEXT['RESULTS_FOOTER'] = 'Zoekresultaten-footer';
+$TEXT['RESULTS_FOR'] = 'Resultaten voor';
+$TEXT['RESULTS_HEADER'] = 'Resultaten-header';
+$TEXT['RESULTS_LOOP'] = 'Zoekresultaten';
+$TEXT['RETYPE_NEW_PASSWORD'] = 'Herhaal nieuw wachtwoord';
+$TEXT['RETYPE_PASSWORD'] = 'Herhaal wachtwoord';
+$TEXT['SAME_WINDOW'] = 'Zelfde scherm';
+$TEXT['SAVE'] = 'Opslaan';
+$TEXT['SEARCH'] = 'Zoeken';
+$TEXT['SEARCHING'] = 'Zoekfunctie';
+$TEXT['SECTION'] = 'Sectie';
+$TEXT['SECTION_BLOCKS'] = 'Sectieblokken';
+$TEXT['SEC_ANCHOR'] = 'Sessie-voorvoegsel';
+$TEXT['SELECT_BOX'] = 'Selectiemenu';
+$TEXT['SEND_DETAILS'] = 'Stuur gegevens';
+$TEXT['SEPARATE'] = 'Gescheiden';
+$TEXT['SEPERATOR'] = 'Scheidingsteken tussen opties (HTML toegestaan)';
+$TEXT['SERVER_EMAIL'] = 'Server e-mail';
+$TEXT['SERVER_OPERATING_SYSTEM'] = 'Serverbesturingssysteem';
+$TEXT['SESSION_IDENTIFIER'] = 'Sessie-identificatie';
+$TEXT['SETTINGS'] = 'Instellingen';
+$TEXT['SHORT'] = 'Kort';
+$TEXT['SHORT_TEXT'] = 'Korte tekst';
+$TEXT['SHOW'] = 'Tonen';
+$TEXT['SHOW_ADVANCED'] = 'Bekijk geavanceerde opties';
+$TEXT['SIGNUP'] = 'Primaire aanmeldgroep';
+$TEXT['SIZE'] = 'Grootte';
+$TEXT['SMART_LOGIN'] = 'Snel inloggen';
+$TEXT['START'] = 'Aanvang';
+$TEXT['START_PUBLISHING'] = 'Aanvang publicatie';
+$TEXT['SUBJECT'] = 'Onderwerp';
+$TEXT['SUBMISSIONS'] = 'Inzendingen';
+$TEXT['SUBMISSIONS_STORED_IN_DATABASE'] = 'Maximaal aantal te bewaren inzendingen';
+$TEXT['SUBMISSION_ID'] = 'Ingezonden bericht';
+$TEXT['SUBMITTED'] = 'Ingezonden';
+$TEXT['SUCCESS'] = 'Succes';
+$TEXT['SYSTEM_DEFAULT'] = 'Standaardinstellingen';
+$TEXT['SYSTEM_PERMISSIONS'] = 'Systeembevoegdheden';
+$TEXT['TABLE_PREFIX'] = 'Tabelvoorvoegsel';
+$TEXT['TARGET'] = 'Doel';
+$TEXT['TARGET_FOLDER'] = 'Doelmap';
+$TEXT['TEMPLATE'] = 'Template';
+$TEXT['TEMPLATE_PERMISSIONS'] = 'Templatebevoegdheden';
+$TEXT['TEXT'] = 'Tekst';
+$TEXT['TEXTAREA'] = 'Tekstveld';
+$TEXT['TEXTFIELD'] = 'Tekstregel';
+$TEXT['THEME'] = 'Thema Website-beheer';
+$TEXT['TIME'] = 'Tijd';
+$TEXT['TIMEZONE'] = 'Tijdzone';
+$TEXT['TIME_FORMAT'] = 'Tijdweergave';
+$TEXT['TIME_LIMIT'] = 'Maximale zoektijd per module';
+$TEXT['TITLE'] = 'Titel';
+$TEXT['TO'] = 'Aan';
+$TEXT['TOP_FRAME'] = 'Bovenste frame';
+$TEXT['TRASH_EMPTIED'] = 'Prullenbak geleegd';
+$TEXT['TXT_EDIT_CSS_FILE'] = 'Wijzig de CSS-definities in het tekstveld hieronder.';
+$TEXT['TYPE'] = 'Type';
+$TEXT['UNDER_CONSTRUCTION'] = 'In bewerking';
+$TEXT['UNINSTALL'] = 'Verwijderen';
+$TEXT['UNKNOWN'] = 'Onbekend(e)';
+$TEXT['UNLIMITED'] = 'Ongelimiteerd';
+$TEXT['UNZIP_FILE'] = 'Uploaden en uitpakken van ZIP-bestand';
+$TEXT['UP'] = 'Omhoog';
+$TEXT['UPGRADE'] = 'Upgraden';
+$TEXT['UPLOAD_FILES'] = 'Upload bestand(en)';
+$TEXT['URL'] = 'URL';
+$TEXT['USER'] = 'Gebruiker';
+$TEXT['USERNAME'] = 'Gebruikersnaam';
+$TEXT['USERS_ACTIVE'] = 'gebruiker is op actief gezet';
+$TEXT['USERS_CAN_SELFDELETE'] = 'gebruiker kan zijn eigen account verwijderen';
+$TEXT['USERS_CHANGE_SETTINGS'] = 'Gebruiker kan de eigen instellingen aanpassen';
+$TEXT['USERS_DELETED'] = 'Gebruiker is gemarkeerd als verwijderd';
+$TEXT['USERS_FLAGS'] = 'User-Flags';
+$TEXT['USERS_PROFILE_ALLOWED'] = 'Gebruiker kan uitgebreid profiel aanmaken';
+$TEXT['VERIFICATION'] = 'Verificatie';
+$TEXT['VERSION'] = 'Versie';
+$TEXT['VIEW'] = 'Bekijken';
+$TEXT['VIEW_DELETED_PAGES'] = 'Bekijk verwijderde pagina&rsquo;s';
+$TEXT['VIEW_DETAILS'] = 'Gegevens bekijken';
+$TEXT['VISIBILITY'] = 'Zichtbaarheid';
+$TEXT['WBMAILER_DEFAULT_SENDER_MAIL'] = 'Standaard afzendermailadres';
+$TEXT['WBMAILER_DEFAULT_SENDER_NAME'] = 'Standaard afzendernaam';
+$TEXT['WBMAILER_DEFAULT_SETTINGS_NOTICE'] = 'Specificeer hieronder een standaard afzenderadres en afzendernaam. Het is aanbevolen om een afzenderadres als: <strong>admin@uwdomein.nl</strong> te gebruiken. Om verspreiding van spam tegen te gaan, kunnen sommige mailproviders (bijv. <em>mail.com</em>) mails verwerpen met een afzenderadres als <em>name@mail.com</em>, die verzonden worden vanaf een relay-server. Onderstaande standaardwaarden worden enkel gebruikt indien geen andere waarden gespecifieerd worden door WebsiteBaker. Indien uw server <acronym title="Simple mail transfer protocol">SMTP</acronym> ondersteunt kunt u deze optie gebruiken voor het versturen van uitgaande mails.';
+$TEXT['WBMAILER_FUNCTION'] = 'Mailafhandeling';
+$TEXT['WBMAILER_NOTICE'] = '<strong>Instellingen SMTP Mailer:</strong><br />Onderstaande instellingen zijn alleen van toepassing indien u mails wilt verzenden via <acronym title="Simple mail transfer protocol">SMTP</acronym>. Indien u de naam of instellingen van de SMTP-server niet kent, selecteer dan bij de standaard mailroutine: PHP MAIL.';
+$TEXT['WBMAILER_PHP'] = 'PHP MAIL';
+$TEXT['WBMAILER_SMTP'] = 'SMTP';
+$TEXT['WBMAILER_SMTP_AUTH'] = 'SMTP-authenticatie';
+$TEXT['WBMAILER_SMTP_AUTH_NOTICE'] = 'Alleen wanneer men zich dient aan te melden bij de SMTP-host';
+$TEXT['WBMAILER_SMTP_HOST'] = 'SMTP-host';
+$TEXT['WBMAILER_SMTP_PASSWORD'] = 'SMTP-wachtwoord';
+$TEXT['WBMAILER_SMTP_USERNAME'] = 'SMTP-gebruikersnaam';
+$TEXT['WEBSITE'] = 'Website';
+$TEXT['WEBSITE_DESCRIPTION'] = 'Metatag "Description"';
+$TEXT['WEBSITE_FOOTER'] = 'Website-footer';
+$TEXT['WEBSITE_HEADER'] = 'Website-header';
+$TEXT['WEBSITE_KEYWORDS'] = 'Metatag "Keywords"';
+$TEXT['WEBSITE_TITLE'] = 'Metatag "Title"';
+$TEXT['WELCOME_BACK'] = 'Welkom terug';
+$TEXT['WIDTH'] = 'Breedte';
+$TEXT['WINDOW'] = 'Scherm';
+$TEXT['WINDOWS'] = 'Windows';
+$TEXT['WORLD_WRITEABLE_FILE_PERMISSIONS'] = 'CHMOD 777 alle bestanden';
+$TEXT['WRITE'] = 'Schrijf';
+$TEXT['WYSIWYG_EDITOR'] = 'WYSIWYG-editor';
+$TEXT['WYSIWYG_STYLE'] = 'WYSIWYG-stijl';
+$TEXT['YES'] = 'Ja';
+
+/* HEADING */
+$HEADING['ADDON_PRECHECK_FAILED'] = 'Module voldoet niet aan de eisen';
+$HEADING['ADD_CHILD_PAGE'] = 'Toevoegen subpagina';
+$HEADING['ADD_GROUP'] = 'Toevoegen groep';
+$HEADING['ADD_GROUPS'] = 'Toevoegen groepen';
+$HEADING['ADD_HEADING'] = 'Toevoegen titel';
+$HEADING['ADD_PAGE'] = 'Toevoegen nieuwe pagina';
+$HEADING['ADD_USER'] = 'Toevoegen gebruiker';
+$HEADING['ADMINISTRATION_TOOLS'] = 'Beheerfuncties';
+$HEADING['BROWSE_MEDIA'] = 'Bladeren door Media-map';
+$HEADING['CREATE_FOLDER'] = 'Toevoegen nieuwe map';
+$HEADING['DEFAULT_SETTINGS'] = 'Standaardinstellingen';
+$HEADING['DELETED_PAGES'] = 'Verwijderde pagina&rsquo;s';
+$HEADING['FILESYSTEM_SETTINGS'] = 'Bestandssysteeminstellingen';
+$HEADING['GENERAL_SETTINGS'] = 'Algemene instellingen';
+$HEADING['INSTALL_LANGUAGE'] = 'Toevoegen taalbestand';
+$HEADING['INSTALL_MODULE'] = 'Toevoegen module';
+$HEADING['INSTALL_TEMPLATE'] = 'Toevoegen template';
+$HEADING['INVOKE_LANGUAGE_FILES'] = 'Taal-bestanden handmatig inschakelen';
+$HEADING['INVOKE_MODULE_FILES'] = 'Handmatige module-installatie';
+$HEADING['INVOKE_TEMPLATE_FILES'] = 'Template-bestanden handmatig inschakelen';
+$HEADING['LANGUAGE_DETAILS'] = 'Taalbestandgegevens';
+$HEADING['MANAGE_SECTIONS'] = 'Sectiebeheer';
+$HEADING['MODIFY_ADVANCED_PAGE_SETTINGS'] = 'Geavanceerde pagina-instellingen';
+$HEADING['MODIFY_DELETE_GROUP'] = 'Beheren groep';
+$HEADING['MODIFY_DELETE_PAGE'] = 'Beheren bestaande pagina&rsquo;s';
+$HEADING['MODIFY_DELETE_USER'] = 'Beheren gebruikers';
+$HEADING['MODIFY_GROUP'] = 'Groepsgegevens';
+$HEADING['MODIFY_GROUPS'] = 'Modify Groups';
+$HEADING['MODIFY_INTRO_PAGE'] = 'Wijzigen introductiepagina';
+$HEADING['MODIFY_PAGE'] = 'Aanpassen pagina';
+$HEADING['MODIFY_PAGE_SETTINGS'] = 'Pagina-instellingen';
+$HEADING['MODIFY_USER'] = 'Gebruikersgegevens';
+$HEADING['MODULE_DETAILS'] = 'Modulegegevens';
+$HEADING['MY_EMAIL'] = 'Mijn e-mailadres';
+$HEADING['MY_PASSWORD'] = 'Mijn wachtwoord';
+$HEADING['MY_SETTINGS'] = 'Mijn gegevens';
+$HEADING['SEARCH_SETTINGS'] = 'Zoekinstellingen';
+$HEADING['SERVER_SETTINGS'] = 'Serverinstellingen';
+$HEADING['TEMPLATE_DETAILS'] = 'Templategegevens';
+$HEADING['UNINSTALL_LANGUAGE'] = 'Verwijderen taalbestand';
+$HEADING['UNINSTALL_MODULE'] = 'Verwijderen module';
+$HEADING['UNINSTALL_TEMPLATE'] = 'Verwijderen template';
+$HEADING['UPGRADE_LANGUAGE'] = 'Upgraden/inschakelen taalbestand';
+$HEADING['UPLOAD_FILES'] = 'Uploaden bestanden';
+$HEADING['WBMAILER_SETTINGS'] = 'Mailer-instellingen';
+
+/* MESSAGE */
+$MESSAGE['ADDON_ERROR_RELOAD'] = 'Fout tijdens het updaten van de add-onbestanden.';
+$MESSAGE['ADDON_LANGUAGES_RELOADED'] = 'Taalbestanden succesvol herladen';
+$MESSAGE['ADDON_MANUAL_FTP_LANGUAGE'] = '<strong>ATTENTIE!</strong> Om veiligheidsredenen dient u de taalbestanden in de folder /languages/ via FTP te uploaden en vervolgens de Upgrade-functie te gebruiken om ze aan het systeem toe te voegen.';
+$MESSAGE['ADDON_MANUAL_FTP_WARNING'] = 'Waarschuwing: bestaande module database-informatie zal verloren gaan! ';
+$MESSAGE['ADDON_MANUAL_INSTALLATION'] = 'When modules are uploaded via FTP (not recommended), the module installation functions <tt>install</tt>, <tt>upgrade</tt> or <tt>uninstall</tt> will not be executed automatically. Those modules may not work correct or do not uninstall properly.<br /><br />You can execute the module functions manually for modules uploaded via FTP below.';
+$MESSAGE['ADDON_MANUAL_INSTALLATION_WARNING'] = 'Waarschuwing: de bestaande module database-informatie zal verloren gaan! Gebruik deze optie alleen indien u ervaring heeft met modules die zijn geupload via FTP.';
+$MESSAGE['ADDON_MANUAL_RELOAD_WARNING'] = 'Waarschuwing: de bestaande module database-informatie zal verloren gaan! ';
+$MESSAGE['ADDON_MODULES_RELOADED'] = 'Modules succesvol herladen';
+$MESSAGE['ADDON_OVERWRITE_NEWER_FILES'] = 'Nieuwere bestanden overschrijven';
+$MESSAGE['ADDON_PRECHECK_FAILED'] = 'Add-on installatie mislukt. Uw systeem voldoet niet aan de eisen van deze add-on. Om deze situatie te veranderen kunt u de informatie hieronder toepassen.';
+$MESSAGE['ADDON_RELOAD'] = 'Update database met informatie uit de add-on bestanden (bijvoorbeeld na FTP-upload).';
+$MESSAGE['ADDON_TEMPLATES_RELOADED'] = 'Templates succesvol herladen';
+$MESSAGE['ADMIN_INSUFFICIENT_PRIVELLIGES'] = 'Onvoldoende rechten om hier te zijn';
+$MESSAGE['FORGOT_PASS_ALREADY_RESET'] = 'Sorry, het wachtwoord kan maximaal eens per uur worden aangepast.';
+$MESSAGE['FORGOT_PASS_CANNOT_EMAIL'] = 'Het is niet mogelijk uw wachtwoord per e-mail te versturen. Neem contact op met de beheerder';
+$MESSAGE['FORGOT_PASS_EMAIL_NOT_FOUND'] = 'Het door u opgegeven e-mailadres is niet gevonden in onze database';
+$MESSAGE['FORGOT_PASS_NO_DATA'] = 'Vult u alstublieft uw e-mailadres hieronder in';
+$MESSAGE['FORGOT_PASS_PASSWORD_RESET'] = 'Uw gebruikersnaam en wachtwoord zijn verzonden naar het opgegeven e-mailadres';
+$MESSAGE['FRONTEND_SORRY_NO_ACTIVE_SECTIONS'] = 'Sorry, er is niets om af te beelden';
+$MESSAGE['FRONTEND_SORRY_NO_VIEWING_PERMISSIONS'] = 'Sorry, u heeft geen bevoegdheden om deze pagina te bekijken';
+$MESSAGE['GENERIC_ALREADY_INSTALLED'] = 'Is al ge&iuml;nstalleerd';
+$MESSAGE['GENERIC_BAD_PERMISSIONS'] = 'Kan niet schrijven naar doelmap';
+$MESSAGE['GENERIC_BE_PATIENT'] = 'Please be patient.';
+$MESSAGE['GENERIC_CANNOT_UNINSTALL'] = 'Kan niet de&iuml;nstalleren';
+$MESSAGE['GENERIC_CANNOT_UNINSTALL_IN_USE'] = 'Kan niet de&iuml;nstalleren: het geselecteerde bestand is in gebruik';
+$MESSAGE['GENERIC_CANNOT_UNINSTALL_IN_USE_TMPL'] = '<br /><br />De {{type}} <b>{{type_name}}</b> kan niet verwijderd worden omdat het in gebruik is op {{pages}}:<br /><br />';
+$MESSAGE['GENERIC_CANNOT_UNINSTALL_IN_USE_TMPL_PAGES'] = 'volgende pagina;volgende pagina\'s';
+$MESSAGE['GENERIC_CANNOT_UNINSTALL_IS_DEFAULT_TEMPLATE'] = 'De template <b>{{name}}</b> kan niet verwijderd worden omdat het de standaard-template is.';
+$MESSAGE['GENERIC_CANNOT_UNINSTALL_IS_DEFAULT_THEME'] = 'Het is niet mogelijk de template <b>{{name}}</b> te verwijderen omdat het het standaard admin-thema is.';
+$MESSAGE['GENERIC_CANNOT_UNZIP'] = 'Kan het bestand niet uitpakken';
+$MESSAGE['GENERIC_CANNOT_UPLOAD'] = 'Kan niet uploaden';
+$MESSAGE['GENERIC_COMPARE'] = ' succesvol';
+$MESSAGE['GENERIC_ERROR_OPENING_FILE'] = 'Kan bestand niet openen.';
+$MESSAGE['GENERIC_FAILED_COMPARE'] = ' mislukt';
+$MESSAGE['GENERIC_FILE_TYPE'] = 'Let op: het bestand moet het volgende formaat hebben:';
+$MESSAGE['GENERIC_FILE_TYPES'] = 'Let op: de bestanden moeten het volgende formaat hebben:';
+$MESSAGE['GENERIC_FILL_IN_ALL'] = 'Niet alle velden zijn ingevuld. Probeert u het nog eens';
+$MESSAGE['GENERIC_FORGOT_OPTIONS'] = 'U heeft niets geselecteerd!';
+$MESSAGE['GENERIC_INSTALLED'] = 'Installatie voltooid';
+$MESSAGE['GENERIC_INVALID'] = 'Ongeldig bestand';
+$MESSAGE['GENERIC_INVALID_ADDON_FILE'] = 'Ongeldig WebsiteBaker installatiebestand. Controleer het *.zip bestand.';
+$MESSAGE['GENERIC_INVALID_LANGUAGE_FILE'] = 'Ongeldig WebsiteBaker taalbestand. Controleer het tekstbestand.';
+$MESSAGE['GENERIC_INVALID_MODULE_FILE'] = 'Ongeldig WebsiteBaker modulebestand. Controleer het tekstbestand';
+$MESSAGE['GENERIC_INVALID_TEMPLATE_FILE'] = 'Ongeldig WebsiteBaker template-bestand. Controleer het tekstbestand';
+$MESSAGE['GENERIC_IN_USE'] = ' gebruikt in ';
+$MESSAGE['GENERIC_MISSING_ARCHIVE_FILE'] = 'Ontbrekend archiefbestand!';
+$MESSAGE['GENERIC_MODULE_VERSION_ERROR'] = 'De module is niet juist ge&iuml;nstalleerd!';
+$MESSAGE['GENERIC_NOT_COMPARE'] = ' niet mogelijk';
+$MESSAGE['GENERIC_NOT_INSTALLED'] = 'Niet ge&iuml;nstalleerd';
+$MESSAGE['GENERIC_NOT_UPGRADED'] = 'Actualisatie niet mogelijk';
+$MESSAGE['GENERIC_PLEASE_BE_PATIENT'] = 'Even geduld aub, dit kan even duren.';
+$MESSAGE['GENERIC_PLEASE_CHECK_BACK_SOON'] = 'Probeert u het a.u.b. binnenkort nog eens.';
+$MESSAGE['GENERIC_SECURITY_ACCESS'] = 'Veiligheidsrisico! Toegang geweigerd!';
+$MESSAGE['GENERIC_SECURITY_OFFENSE'] = 'Veiligheidsrisico! Data-opslag geweigerd!';
+$MESSAGE['GENERIC_UNINSTALLED'] = 'De&iuml;nstallatie voltooid';
+$MESSAGE['GENERIC_UPGRADED'] = 'Upgrade voltooid';
+$MESSAGE['GENERIC_VERSION_COMPARE'] = 'Versievergelijking';
+$MESSAGE['GENERIC_VERSION_GT'] = 'Upgrade noodzakelijk!';
+$MESSAGE['GENERIC_VERSION_LT'] = 'Downgrade';
+$MESSAGE['GENERIC_WEBSITE_LOCKED'] = 'Deze site is tijdelijk offline wegens onderhoud.';
+$MESSAGE['GENERIC_WEBSITE_UNDER_CONSTRUCTION'] = 'Website in bewerking';
+$MESSAGE['GROUPS_ADDED'] = 'Groep toegevoegd';
+$MESSAGE['GROUPS_CONFIRM_DELETE'] = 'Weet u zeker dat u de geselecteerde groep wilt verwijderen (en alle daarbij behorende gebruikers)?';
+$MESSAGE['GROUPS_DELETED'] = 'Groep verwijderd';
+$MESSAGE['GROUPS_GROUP_NAME_BLANK'] = 'Groepsnaam is niet ingevuld';
+$MESSAGE['GROUPS_GROUP_NAME_EXISTS'] = 'Groepnaam is reeds in gebruik';
+$MESSAGE['GROUPS_NO_GROUPS_FOUND'] = 'Geen groep gevonden';
+$MESSAGE['GROUPS_SAVED'] = 'Groep opgeslagen';
+$MESSAGE['LOGIN_AUTHENTICATION_FAILED'] = 'Gebruikersnaam en/of wachtwoord incorrect';
+$MESSAGE['LOGIN_BOTH_BLANK'] = 'Vul uw gebruikersnaam en wachtwoord in:';
+$MESSAGE['LOGIN_PASSWORD_BLANK'] = 'Vul uw wachtwoord in';
+$MESSAGE['LOGIN_PASSWORD_TOO_LONG'] = 'Dit wachtwoord is te lang';
+$MESSAGE['LOGIN_PASSWORD_TOO_SHORT'] = 'Dit wachtwoord is te kort';
+$MESSAGE['LOGIN_USERNAME_BLANK'] = 'Vul uw gebruikersnaam in';
+$MESSAGE['LOGIN_USERNAME_TOO_LONG'] = 'Deze gebruikersnaam is te lang';
+$MESSAGE['LOGIN_USERNAME_TOO_SHORT'] = 'Deze gebruikersnaam is te kort';
+$MESSAGE['MEDIA_BLANK_EXTENSION'] = 'U heeft geen bestandsextensie opgegeven';
+$MESSAGE['MEDIA_BLANK_NAME'] = 'U heeft geen nieuwe naam opgegeven';
+$MESSAGE['MEDIA_CANNOT_DELETE_DIR'] = 'Kan geselecteerde map niet verwijderen';
+$MESSAGE['MEDIA_CANNOT_DELETE_FILE'] = 'Kan geselecteerde bestand niet verwijderen';
+$MESSAGE['MEDIA_CANNOT_RENAME'] = 'Hernoemen niet gelukt';
+$MESSAGE['MEDIA_CONFIRM_DELETE'] = 'Weet u zeker dat u het volgende bestand of map wilt verwijderen?';
+$MESSAGE['MEDIA_DELETED_DIR'] = 'Map verwijderd';
+$MESSAGE['MEDIA_DELETED_FILE'] = 'Bestand verwijderd';
+$MESSAGE['MEDIA_DIR_ACCESS_DENIED'] = 'Specified directory does not exist or is not allowed.';
+$MESSAGE['MEDIA_DIR_DOES_NOT_EXIST'] = 'Map bestaat niet';
+$MESSAGE['MEDIA_DIR_DOT_DOT_SLASH'] = 'Gebruik van ../ in de mapnaam is niet toegestaan';
+$MESSAGE['MEDIA_DIR_EXISTS'] = 'Opgegeven naam van de map bestaat al';
+$MESSAGE['MEDIA_DIR_MADE'] = 'Map aangemaakt';
+$MESSAGE['MEDIA_DIR_NOT_MADE'] = 'Aanmaken map mislukt';
+$MESSAGE['MEDIA_FILE_EXISTS'] = 'Opgegeven bestandsnaam bestaat al';
+$MESSAGE['MEDIA_FILE_NOT_FOUND'] = 'Bestand niet gevonden';
+$MESSAGE['MEDIA_NAME_DOT_DOT_SLASH'] = 'Gebruik van ../ in de naam is niet toegestaan';
+$MESSAGE['MEDIA_NAME_INDEX_PHP'] = 'index.php als naam is niet toegestaan';
+$MESSAGE['MEDIA_NONE_FOUND'] = 'Geen mediabestanden gevonden in de huidige map';
+$MESSAGE['MEDIA_NO_FILE_UPLOADED'] = 'geen bestand(en) ontvangen';
+$MESSAGE['MEDIA_RENAMED'] = 'Hernoemen geslaagd';
+$MESSAGE['MEDIA_SINGLE_UPLOADED'] = ' geupload';
+$MESSAGE['MEDIA_TARGET_DOT_DOT_SLASH'] = 'Gebruik van ../ in de map is niet toegestaan';
+$MESSAGE['MEDIA_UPLOADED'] = ' geupload';
+$MESSAGE['MOD_FORM_EXCESS_SUBMISSIONS'] = 'Dit formulier is te vaak verstuurd binnen dit uur. Probeert u het over een uur nog eens.';
+$MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'] = 'Het verificatienummer (ook wel Captcha genoemd) dat u hebt ingevoerd is incorrect. Als u de Captcha niet goed kunt lezen, stuur dan een e-mail naar: SERVER_EMAIL';
+$MESSAGE['MOD_FORM_REQUIRED_FIELDS'] = 'De volgende velden zijn verplicht';
+$MESSAGE['PAGES_ADDED'] = 'Pagina toegevoegd';
+$MESSAGE['PAGES_ADDED_HEADING'] = 'Paginatitel opgeslagen';
+$MESSAGE['PAGES_BLANK_MENU_TITLE'] = 'Vul a.u.b. een menutitel in';
+$MESSAGE['PAGES_BLANK_PAGE_TITLE'] = 'Vul a.u.b. een paginatitel in';
+$MESSAGE['PAGES_CANNOT_CREATE_ACCESS_FILE'] = 'Kan geen bestanden opslaan in de /pages-map (onvoldoende rechten)';
+$MESSAGE['PAGES_CANNOT_DELETE_ACCESS_FILE'] = 'Kan geen bestanden verwijderen uit de /pages-map (onvoldoende rechten)';
+$MESSAGE['PAGES_CANNOT_REORDER'] = 'Fout bij herordenen pagina';
+$MESSAGE['PAGES_DELETED'] = 'Pagina verwijderd';
+$MESSAGE['PAGES_DELETE_CONFIRM'] = 'Weet u zeker dat u deze pagina wilt verwijderen (en al zijn subpagina&rsquo;s)';
+$MESSAGE['PAGES_INSUFFICIENT_PERMISSIONS'] = 'U heeft niet de rechten om deze pagina aan te passen';
+$MESSAGE['PAGES_INTRO_LINK'] = 'Klik hier om de introductiepagina aan te passen';
+$MESSAGE['PAGES_INTRO_NOT_WRITABLE'] = 'Kan instellingen niet opslaan in het bestand /pages/intro.php (onvoldoende rechten)';
+$MESSAGE['PAGES_INTRO_SAVED'] = 'Introductiepagina opgeslagen';
+$MESSAGE['PAGES_LAST_MODIFIED'] = 'Als laatste aangepast door';
+$MESSAGE['PAGES_NOT_FOUND'] = 'Pagina niet gevonden';
+$MESSAGE['PAGES_NOT_SAVED'] = 'Fout tijdens opslaan pagina';
+$MESSAGE['PAGES_PAGE_EXISTS'] = 'Een pagina met dezelfde naam bestaat al';
+$MESSAGE['PAGES_REORDERED'] = 'Pagina herordend';
+$MESSAGE['PAGES_RESTORED'] = 'Pagina teruggehaald';
+$MESSAGE['PAGES_RETURN_TO_PAGES'] = 'Keer terug naar pagina&rsquo;s';
+$MESSAGE['PAGES_SAVED'] = 'Pagina opgeslagen';
+$MESSAGE['PAGES_SAVED_SETTINGS'] = 'Pagina-instellingen opgeslagen';
+$MESSAGE['PAGES_SECTIONS_PROPERTIES_SAVED'] = 'Sectie-instellingen opgeslagen';
+$MESSAGE['PREFERENCES_CURRENT_PASSWORD_INCORRECT'] = 'Het (huidige) ingevoerde wachtwoord is niet correct';
+$MESSAGE['PREFERENCES_DETAILS_SAVED'] = 'Details opgeslagen';
+$MESSAGE['PREFERENCES_EMAIL_UPDATED'] = 'E-mail gewijzigd';
+$MESSAGE['PREFERENCES_INVALID_CHARS'] = 'Ongeldige wachtwoordtekens gebruikt';
+$MESSAGE['PREFERENCES_PASSWORD_CHANGED'] = 'Wachtwoord gewijzigd';
+$MESSAGE['RECORD_MODIFIED_FAILED'] = 'De aanpassing is mislukt.';
+$MESSAGE['RECORD_MODIFIED_SAVED'] = 'De aanpassing is opgeslagen.';
+$MESSAGE['RECORD_NEW_FAILED'] = 'De toevoeging is mislukt.';
+$MESSAGE['RECORD_NEW_SAVED'] = 'De toevoeging is opgeslagen';
+$MESSAGE['SETTINGS_MODE_SWITCH_WARNING'] = 'Opgelet: sla eerst de wijzigingen op die u eventueel zojuist heeft aangebracht!';
+$MESSAGE['SETTINGS_SAVED'] = 'Instellingen opgeslagen';
+$MESSAGE['SETTINGS_UNABLE_OPEN_CONFIG'] = 'Het configuratiebestand kan niet worden geopend';
+$MESSAGE['SETTINGS_UNABLE_WRITE_CONFIG'] = 'Het configuratiebestand kan niet worden opgeslagen';
+$MESSAGE['SETTINGS_WORLD_WRITEABLE_WARNING'] = 'Opgelet: dit is alleen bedoeld voor testdoeleinden!';
+$MESSAGE['SIGNUP2_ADMIN_INFO'] = '
+Een nieuwe gebruiker heeft zich aangemeld.
+
+Gebruikersnaam: {LOGIN_NAME}
+Gebruiker Id: {LOGIN_ID}
+E-mail: {LOGIN_EMAIL}
+IP-adres: {LOGIN_IP}
+Registratiedatum: {SIGNUP_DATE}
+----------------------------------------
+Dit bericht is automatisch aangemaakt!
+
+';
+$MESSAGE['SIGNUP2_BODY_LOGIN_FORGOT'] = '
+Beste {LOGIN_DISPLAY_NAME},
+
+deze mail is aan u verzonden omdat u de \'wachtwoord vergeten\' functie heeft gebruikt.
+
+Uw nieuwe \'{LOGIN_WEBSITE_TITLE}\' inloggegevens zijn:
+
+Gebruikersnaam: {LOGIN_NAME}
+Wachtwoord: {LOGIN_PASSWORD}
+
+Let op: dit is een automatisch aangemaakt nieuw wachtwoord. Uw oude wachtwoord is niet meer geldig!
+Heeft u vragen of opmerkingen, neem dan contact op met de websitebeheerder.
+
+Het is aan te raden om uw browser-cache te legen voordat u het nieuwe wachtwoord gebruikt.
+
+Vriendelijke groet
+
+------------------------------------
+Dit bericht is automatisch aangemaakt!
+
+';
+$MESSAGE['SIGNUP2_BODY_LOGIN_INFO'] = '
+Beste {LOGIN_DISPLAY_NAME},
+
+Welkom bij \'{LOGIN_WEBSITE_TITLE}\'.
+
+Uw \'{LOGIN_WEBSITE_TITLE}\' inloggegevens zijn:
+Gebruikersnaam: {LOGIN_NAME}
+Wachtwoord: {LOGIN_PASSWORD}
+
+Vriendelijke groet
+
+-------------------------------------
+Dit bericht is automatisch aangemaakt!
+';
+$MESSAGE['SIGNUP2_SUBJECT_LOGIN_INFO'] = 'Uw inloggegevens...';
+$MESSAGE['SIGNUP_NO_EMAIL'] = 'U moet een e-mailadres invullen';
+$MESSAGE['START_CURRENT_USER'] = 'U bent ingelogd als';
+$MESSAGE['START_INSTALL_DIR_EXISTS'] = 'Waarschuwing, de installatiemap bestaat nog steeds. U dient deze te verwijderen om veiligheidsrisico&rsquo;s te vermijden!';
+$MESSAGE['START_WELCOME_MESSAGE'] = 'Welkom bij het websitebeheer';
+$MESSAGE['TEMPLATES_CHANGE_TEMPLATE_NOTICE'] = 'Attentie: om de template aan te passen moet u naar de instellingensectie';
+$MESSAGE['USERS_ADDED'] = 'Gebruiker toegevoegd';
+$MESSAGE['USERS_CANT_SELFDELETE'] = 'Functie geweigerd. U kunt zichzelf niet verwijderen!';
+$MESSAGE['USERS_CHANGING_PASSWORD'] = 'Attentie: vul alleen de bovenstaande velden in wanneer u het wachtwoord van de gebruiker wilt veranderen';
+$MESSAGE['USERS_CONFIRM_DELETE'] = 'Weet u zeker dat u de geselecteerde gebruiker wilt verwijderen?';
+$MESSAGE['USERS_DELETED'] = 'Gebruiker verwijderd';
+$MESSAGE['USERS_EMAIL_TAKEN'] = 'Het ingevoerde e-mailadres is al in gebruik';
+$MESSAGE['USERS_INVALID_EMAIL'] = 'Het ingevoerde e-mailadres is niet correct';
+$MESSAGE['USERS_NAME_INVALID_CHARS'] = 'Ongeldige tekens voor de gebruikersnaam ingevoerd';
+$MESSAGE['USERS_NO_GROUP'] = 'Geen groep geselecteerd';
+$MESSAGE['USERS_PASSWORD_MISMATCH'] = 'De ingevoerde wachtwoorden komen niet overeen';
+$MESSAGE['USERS_PASSWORD_TOO_SHORT'] = 'Het ingevoerde wachtwoord is te kort';
+$MESSAGE['USERS_SAVED'] = 'Gebruiker opgeslagen';
+$MESSAGE['USERS_USERNAME_TAKEN'] = 'De ingevoerde gebruikersnaam is al in gebruik';
+$MESSAGE['USERS_USERNAME_TOO_SHORT'] = 'De ingevoerde  gebruikersnaam is te kort';
+
+/* OVERVIEW */
+$OVERVIEW['ADMINTOOLS'] = 'Diverse extra beheerinstellingen.';
+$OVERVIEW['GROUPS'] = 'Beheren van de gebruikersgroepen en hun rechten.';
+$OVERVIEW['HELP'] = 'Uitgebreide hulp voor het gebruik van dit systeem.';
+$OVERVIEW['LANGUAGES'] = 'Beheren van de aanwezige taalbestanden.';
+$OVERVIEW['MEDIA'] = 'Beheren van bestanden in de Media-map.';
+$OVERVIEW['MODULES'] = 'Beheren van modules die extra functies toevoegen aan uw site.';
+$OVERVIEW['PAGES'] = 'Aanmaken en beheren van de sitestructuur en pagina&rsquo;s.';
+$OVERVIEW['PREFERENCES'] = 'Beheren van uw persoonlijk profiel.';
+$OVERVIEW['SETTINGS'] = 'Beheren van de technische website-instellingen.';
+$OVERVIEW['START'] = 'Websitebeheer';
+$OVERVIEW['TEMPLATES'] = 'Beheren van de templates die u kunt toepassen.';
+$OVERVIEW['USERS'] = 'Beheren van de gebruikers van uw website.';
+$OVERVIEW['VIEW'] = 'Bekijk uw website zoals deze voor bezoekers te zien is (in een afzonderlijk venster).';
+
+/* include old languages format */
+if(file_exists(WB_PATH.'/languages/old.format.inc.php'))
+{
+	include(WB_PATH.'/languages/old.format.inc.php');
+}
+

Property changes on: branches/2.8.x/wb/languages/NL.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1,4 +1 ##
-Id
-Revision
-HeadURL
-Date
\ No newline at end of property
+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/languages/PL.php
===================================================================
--- branches/2.8.x/wb/languages/PL.php	(revision 1456)
+++ branches/2.8.x/wb/languages/PL.php	(revision 1457)
@@ -1,670 +1,670 @@
-<?php
-/**
- *
- * @category        framework
- * @package         language
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
- * @copyright       2009-2011, Website Baker Org. e.V.
- * @link			http://www.websitebaker2.org/
- * @license         http://www.gnu.org/licenses/gpl.html
- * @platform        WebsiteBaker 2.8.x
- * @requirements    PHP 5.2.2 and higher
- * @version         $Id$
- * @filesource		$HeadURL$
- * @lastmodified    $Date$
- *
- */
-
-// Must include code to stop this file being access directly
-if(defined('WB_PATH') == false) { exit("Cannot access this file directly"); }
-
-// Define that this file is loaded
-if(!defined('LANGUAGE_LOADED')) {
-define('LANGUAGE_LOADED', true);
-}
-
-// Set the language information
-$language_code = 'PL';
-$language_name = 'Polski';
-$language_version = '2.8';
-$language_platform = '2.8.x';
-$language_author = 'Marek Stępień;';
-$language_license = 'GNU General Public License';
-
-/* MENU */
-$MENU['ACCESS'] = 'Dostęp';
-$MENU['ADDON'] = 'Dodatek';
-$MENU['ADDONS'] = 'Dodatki';
-$MENU['ADMINTOOLS'] = 'Narzędzia admina';
-$MENU['BREADCRUMB'] = 'JesteÅ› tu: ';
-$MENU['FORGOT'] = 'Odzyskaj dane logowania';
-$MENU['GROUP'] = 'Groupa';
-$MENU['GROUPS'] = 'Grupy';
-$MENU['HELP'] = 'Pomoc';
-$MENU['LANGUAGES'] = 'Języki';
-$MENU['LOGIN'] = 'Zaloguj siÄ™';
-$MENU['LOGOUT'] = 'Wyloguj';
-$MENU['MEDIA'] = 'Media';
-$MENU['MODULES'] = 'Moduły';
-$MENU['PAGES'] = 'Strony';
-$MENU['PREFERENCES'] = 'Preferencje';
-$MENU['SETTINGS'] = 'Ustawienia';
-$MENU['START'] = 'PoczÄ…tek';
-$MENU['TEMPLATES'] = 'Szablony';
-$MENU['USERS'] = 'Użytkownicy';
-$MENU['VIEW'] = 'PodglÄ…d';
-
-/* TEXT */
-$TEXT['ACCOUNT_SIGNUP'] = 'Nowe konto';
-$TEXT['ACTIONS'] = 'Czynności';
-$TEXT['ACTIVE'] = 'Aktywne';
-$TEXT['ADD'] = 'Dodaj';
-$TEXT['ADDON'] = 'Dodatek';
-$TEXT['ADD_SECTION'] = 'Dodaj sekcji;';
-$TEXT['ADMIN'] = 'Administrator';
-$TEXT['ADMINISTRATION'] = 'Administracja';
-$TEXT['ADMINISTRATION_TOOL'] = 'Narzędzie administracyjne';
-$TEXT['ADMINISTRATOR'] = 'Administrator';
-$TEXT['ADMINISTRATORS'] = 'Administratorzy';
-$TEXT['ADVANCED'] = 'Zaawansowane';
-$TEXT['ALLOWED_FILETYPES_ON_UPLOAD'] = 'Dozwolone pliki do uploadu';
-$TEXT['ALLOWED_VIEWERS'] = 'Dozwoleni obserwatorzy';
-$TEXT['ALLOW_MULTIPLE_SELECTIONS'] = 'Pozwól na wielokrotne wybory';
-$TEXT['ALL_WORDS'] = 'Wszystkie słowa';
-$TEXT['ANCHOR'] = 'Kotwica';
-$TEXT['ANONYMOUS'] = 'Anonimowy';
-$TEXT['ANY_WORDS'] = 'Dowolne ze słów';
-$TEXT['APP_NAME'] = 'Nazwa aplikacji';
-$TEXT['ARE_YOU_SURE'] = 'Czy aby na pewno?';
-$TEXT['AUTHOR'] = 'Autor';
-$TEXT['BACK'] = 'Wstecz';
-$TEXT['BACKUP'] = 'Kopia zapasowa';
-$TEXT['BACKUP_ALL_TABLES'] = 'Backup all tables in database';
-$TEXT['BACKUP_DATABASE'] = 'Kopia zapasowa bazy danych';
-$TEXT['BACKUP_MEDIA'] = 'Kopia zapasowa mediów';
-$TEXT['BACKUP_WB_SPECIFIC'] = 'Kopia zapasowa tylko tabel WB_';
-$TEXT['BASIC'] = 'Podstawowe';
-$TEXT['BLOCK'] = 'Blokuj';
-$TEXT['CALENDAR'] = 'Calentarz';
-$TEXT['CANCEL'] = 'Anuluj';
-$TEXT['CAN_DELETE_HIMSELF'] = 'Can delete himself';
-$TEXT['CAPTCHA_VERIFICATION'] = 'Weryfikacja Captcha';
-$TEXT['CAP_EDIT_CSS'] = 'Edytuj CSS';
-$TEXT['CHANGE'] = 'Zmień;';
-$TEXT['CHANGES'] = 'Zmiany';
-$TEXT['CHANGE_SETTINGS'] = 'Zmień ustawienia';
-$TEXT['CHARSET'] = 'Kodowanie znaków';
-$TEXT['CHECKBOX_GROUP'] = 'Grupa pól zaznaczanych';
-$TEXT['CLOSE'] = 'Zamknij';
-$TEXT['CODE'] = 'Kod';
-$TEXT['CODE_SNIPPET'] = 'Kod snippeta';
-$TEXT['COLLAPSE'] = 'Zwiń;';
-$TEXT['COMMENT'] = 'Komentarz';
-$TEXT['COMMENTING'] = 'Komentowanie';
-$TEXT['COMMENTS'] = 'Komentarze';
-$TEXT['CREATE_FOLDER'] = 'Utwórz folder';
-$TEXT['CURRENT'] = 'Bieżący';
-$TEXT['CURRENT_FOLDER'] = 'Bieżący folder';
-$TEXT['CURRENT_PAGE'] = 'Bieżąca strona';
-$TEXT['CURRENT_PASSWORD'] = 'Bieżące hasło';
-$TEXT['CUSTOM'] = 'WÅ‚asny';
-$TEXT['DATABASE'] = 'Baza danych';
-$TEXT['DATE'] = 'Data';
-$TEXT['DATE_FORMAT'] = 'Format daty';
-$TEXT['DEFAULT'] = 'Domyślne';
-$TEXT['DEFAULT_CHARSET'] = 'Domyślne kodowanie znaków';
-$TEXT['DEFAULT_TEXT'] = 'Domyślny tekst';
-$TEXT['DELETE'] = 'Usuń;';
-$TEXT['DELETED'] = 'Usunięte';
-$TEXT['DELETE_DATE'] = 'Usuń datę';
-$TEXT['DELETE_ZIP'] = 'Usuń archiwum zip po rozpakowaniu';
-$TEXT['DESCRIPTION'] = 'Opis';
-$TEXT['DESIGNED_FOR'] = 'Zaprojektowane dla';
-$TEXT['DIRECTORIES'] = 'Katalogi';
-$TEXT['DIRECTORY_MODE'] = 'Tryb katalogów';
-$TEXT['DISABLED'] = 'Wyłączone';
-$TEXT['DISPLAY_NAME'] = 'Nazwa';
-$TEXT['EMAIL'] = 'E-mail';
-$TEXT['EMAIL_ADDRESS'] = 'Adres e-mail';
-$TEXT['EMPTY_TRASH'] = 'Opróżnij śmietnik';
-$TEXT['ENABLED'] = 'WÅ‚Ä…czone';
-$TEXT['END'] = 'Koniec';
-$TEXT['ERROR'] = 'BÅ‚Ä…d';
-$TEXT['EXACT_MATCH'] = 'Dopasowanie dokładne';
-$TEXT['EXECUTE'] = 'Wykonaj';
-$TEXT['EXPAND'] = 'Rozwiń';
-$TEXT['EXTENSION'] = 'Rozszerzenie';
-$TEXT['FIELD'] = 'Pole';
-$TEXT['FILE'] = 'plik';
-$TEXT['FILES'] = 'pliki';
-$TEXT['FILESYSTEM_PERMISSIONS'] = 'Uprawnienia systemu plików';
-$TEXT['FILE_MODE'] = 'Tryb plikw';
-$TEXT['FINISH_PUBLISHING'] = 'Zakoncz publikowanie';
-$TEXT['FOLDER'] = 'folder';
-$TEXT['FOLDERS'] = 'foldery';
-$TEXT['FOOTER'] = 'Stopka';
-$TEXT['FORGOTTEN_DETAILS'] = 'Zapomniałeś(-aś) hasła?';
-$TEXT['FORGOT_DETAILS'] = 'Zapomniałeś(-aś) szczegółów?';
-$TEXT['FROM'] = 'Od';
-$TEXT['FRONTEND'] = 'Panel przedni';
-$TEXT['FULL_NAME'] = 'ImiÄ™ i nazwisko';
-$TEXT['FUNCTION'] = 'Funkcja';
-$TEXT['GROUP'] = 'Grupa';
-$TEXT['HEADER'] = 'Nagłówek';
-$TEXT['HEADING'] = 'Nagłówek';
-$TEXT['HEADING_CSS_FILE'] = 'Aktualny plik modułu: ';
-$TEXT['HEIGHT'] = 'Wysokość;';
-$TEXT['HIDDEN'] = 'Ukryty';
-$TEXT['HIDE'] = 'Schowaj';
-$TEXT['HIDE_ADVANCED'] = 'Schowaj opcje zaawansowane';
-$TEXT['HOME'] = 'Strona domowa';
-$TEXT['HOMEPAGE_REDIRECTION'] = 'Przekierowanie strony domowej';
-$TEXT['HOME_FOLDER'] = 'Osobisty Folder';
-$TEXT['HOME_FOLDERS'] = 'Osobiste Foldery';
-$TEXT['HOST'] = 'Host';
-$TEXT['ICON'] = 'Ikona';
-$TEXT['IMAGE'] = 'Obrazek';
-$TEXT['INLINE'] = 'Inline';
-$TEXT['INSTALL'] = 'Zainstaluj';
-$TEXT['INSTALLATION'] = 'Instalacja';
-$TEXT['INSTALLATION_PATH'] = 'Ścieżka instalacji';
-$TEXT['INSTALLATION_URL'] = 'URL instalacji';
-$TEXT['INSTALLED'] = 'zainstalowano';
-$TEXT['INTRO'] = 'Intro';
-$TEXT['INTRO_PAGE'] = 'Strona wprowadzajÄ…ca';
-$TEXT['INVALID_SIGNS'] = 'musi zaczynać się od litery bądź niedozwolonych znaków';
-$TEXT['KEYWORDS'] = 'słow kluczowe';
-$TEXT['LANGUAGE'] = 'Język';
-$TEXT['LAST_UPDATED_BY'] = 'Ostatnio zmienione przez';
-$TEXT['LENGTH'] = 'Długość';
-$TEXT['LEVEL'] = 'Poziom';
-$TEXT['LINK'] = 'Odnośnik';
-$TEXT['LINUX_UNIX_BASED'] = 'oparty na Linux/Unix';
-$TEXT['LIST_OPTIONS'] = 'Listuj opcje';
-$TEXT['LOGGED_IN'] = 'Zalogowany';
-$TEXT['LOGIN'] = 'Zaloguj';
-$TEXT['LONG'] = 'DÅ‚ugi';
-$TEXT['LONG_TEXT'] = 'DÅ‚ugi tekst';
-$TEXT['LOOP'] = 'Pętla';
-$TEXT['MAIN'] = 'Główny';
-$TEXT['MAINTENANCE_OFF'] = 'Maintenance off';
-$TEXT['MAINTENANCE_ON'] = 'Maintenance on';
-$TEXT['MANAGE'] = 'ZarzÄ…dzaj';
-$TEXT['MANAGE_GROUPS'] = 'ZarzÄ…dzaj grupami';
-$TEXT['MANAGE_USERS'] = 'Zarządzaj użytkownikami';
-$TEXT['MATCH'] = 'Dopasuj';
-$TEXT['MATCHING'] = 'PasujÄ…ce';
-$TEXT['MAX_EXCERPT'] = 'Maksymalny fragment linii';
-$TEXT['MAX_SUBMISSIONS_PER_HOUR'] = 'Maks. zgłoszeń na godzinę';
-$TEXT['MEDIA_DIRECTORY'] = 'Katalog mediów';
-$TEXT['MENU'] = 'Menu';
-$TEXT['MENU_ICON_0'] = 'Menu-Icon normal';
-$TEXT['MENU_ICON_1'] = 'Menu-Icon hover';
-$TEXT['MENU_TITLE'] = 'Tytuł menu';
-$TEXT['MESSAGE'] = 'Wiadomość';
-$TEXT['MODIFY'] = 'Zmień';
-$TEXT['MODIFY_CONTENT'] = 'Zmień zawartość';
-$TEXT['MODIFY_SETTINGS'] = 'Zmień ustawienia';
-$TEXT['MODULE_ORDER'] = 'Moduł- kolejność wyszukiwania';
-$TEXT['MODULE_PERMISSIONS'] = 'Uprawnienia do modułów';
-$TEXT['MORE'] = 'Więcej';
-$TEXT['MOVE_DOWN'] = 'W dół';
-$TEXT['MOVE_UP'] = 'Do góry';
-$TEXT['MULTIPLE_MENUS'] = 'Wielokrotne menu';
-$TEXT['MULTISELECT'] = 'Wybór wielokrotny';
-$TEXT['NAME'] = 'Nazwa';
-$TEXT['NEED_CURRENT_PASSWORD'] = 'potwierdź obecne hasło';
-$TEXT['NEED_TO_LOGIN'] = 'Potrzebujesz się zalogować?';
-$TEXT['NEW_PASSWORD'] = 'Nowe hasło';
-$TEXT['NEW_WINDOW'] = 'Nowe okno';
-$TEXT['NEXT'] = 'Następny';
-$TEXT['NEXT_PAGE'] = 'Następna strona';
-$TEXT['NO'] = 'Nie';
-$TEXT['NONE'] = 'Brak';
-$TEXT['NONE_FOUND'] = 'Nie odnaleziono';
-$TEXT['NOT_FOUND'] = 'Nie odnaleziono';
-$TEXT['NOT_INSTALLED'] = 'nie zainstalowano';
-$TEXT['NO_IMAGE_SELECTED'] = 'nie wybrano obrazu';
-$TEXT['NO_RESULTS'] = 'Brak wyników';
-$TEXT['OF'] = 'z';
-$TEXT['ON'] = 'dnia';
-$TEXT['OPEN'] = 'Otwórz';
-$TEXT['OPTION'] = 'Opcja';
-$TEXT['OTHERS'] = 'Inni';
-$TEXT['OUT_OF'] = 'z poza';
-$TEXT['OVERWRITE_EXISTING'] = 'Nadpisz istniejÄ…cy(-e)';
-$TEXT['PAGE'] = 'Strona';
-$TEXT['PAGES_DIRECTORY'] = 'Katalog stron';
-$TEXT['PAGES_PERMISSION'] = 'Prawa do strony';
-$TEXT['PAGES_PERMISSIONS'] = 'Prawa do stron';
-$TEXT['PAGE_EXTENSION'] = 'Rozszerzenie strony';
-$TEXT['PAGE_ICON'] = 'Obrazek strony';
-$TEXT['PAGE_ICON_DIR'] = 'Ścieżka stron/obrazki menu';
-$TEXT['PAGE_LANGUAGES'] = 'Języki stron';
-$TEXT['PAGE_LEVEL_LIMIT'] = 'Limit poziomów stron';
-$TEXT['PAGE_SPACER'] = 'Odstęp strony';
-$TEXT['PAGE_TITLE'] = 'Tytuł strony';
-$TEXT['PAGE_TRASH'] = 'Åšmietnik stron';
-$TEXT['PARENT'] = 'Nadrzędny';
-$TEXT['PASSWORD'] = 'Hasło';
-$TEXT['PATH'] = 'Ścieżka';
-$TEXT['PHP_ERROR_LEVEL'] = 'Poziom raportowania błędów PHP';
-$TEXT['PLEASE_LOGIN'] = 'Podaj login';
-$TEXT['PLEASE_SELECT'] = 'Proszę wybrać';
-$TEXT['POST'] = 'Wiadomość';
-$TEXT['POSTS_PER_PAGE'] = 'Wiadomości na stronę';
-$TEXT['POST_FOOTER'] = 'Stopka wiadomości';
-$TEXT['POST_HEADER'] = 'Nagłówek wiadomości';
-$TEXT['PREVIOUS'] = 'Poprzedni';
-$TEXT['PREVIOUS_PAGE'] = 'Poprzednia strona';
-$TEXT['PRIVATE'] = 'Prywatna';
-$TEXT['PRIVATE_VIEWERS'] = 'Prywatni obserwatorzy';
-$TEXT['PROFILES_EDIT'] = 'Zmień profil';
-$TEXT['PUBLIC'] = 'Publiczna';
-$TEXT['PUBL_END_DATE'] = 'Data zakończenia';
-$TEXT['PUBL_START_DATE'] = 'Data rozpoczęcia';
-$TEXT['RADIO_BUTTON_GROUP'] = 'Grupa pól przełączanych';
-$TEXT['READ'] = 'Odczytaj';
-$TEXT['READ_MORE'] = 'Czytaj dalej';
-$TEXT['REDIRECT_AFTER'] = 'Przekierowanie po';
-$TEXT['REGISTERED'] = 'Zarejestrowany';
-$TEXT['REGISTERED_VIEWERS'] = 'Zarejestrowani obserwatorzy';
-$TEXT['RELOAD'] = 'Przeładuj, odśwież';
-$TEXT['REMEMBER_ME'] = 'Zapamiętaj mnie';
-$TEXT['RENAME'] = 'Zmień nazwę';
-$TEXT['RENAME_FILES_ON_UPLOAD'] = 'Zmień nazwy plików przy załadowywaniu';
-$TEXT['REQUIRED'] = 'Wymagany';
-$TEXT['REQUIREMENT'] = 'Wymagania';
-$TEXT['RESET'] = 'Resetuj';
-$TEXT['RESIZE'] = 'Zmień rozmiar';
-$TEXT['RESIZE_IMAGE_TO'] = 'Zmień rozmiar obrazków na';
-$TEXT['RESTORE'] = 'Przywróć';
-$TEXT['RESTORE_DATABASE'] = 'Przywróć bazę danych';
-$TEXT['RESTORE_MEDIA'] = 'Przywróć media';
-$TEXT['RESULTS'] = 'Wyniki';
-$TEXT['RESULTS_FOOTER'] = 'Stopka wyników';
-$TEXT['RESULTS_FOR'] = 'Wyniki dla';
-$TEXT['RESULTS_HEADER'] = 'Nagłówek wyników';
-$TEXT['RESULTS_LOOP'] = 'Pętla wyników';
-$TEXT['RETYPE_NEW_PASSWORD'] = 'Powtórz nowe hasło';
-$TEXT['RETYPE_PASSWORD'] = 'Powtórz hasło';
-$TEXT['SAME_WINDOW'] = 'To samo okno';
-$TEXT['SAVE'] = 'Zapisz';
-$TEXT['SEARCH'] = 'Szukaj';
-$TEXT['SEARCHING'] = 'Wyszukiwanie';
-$TEXT['SECTION'] = 'Sekcja';
-$TEXT['SECTION_BLOCKS'] = 'Bloki sekcji';
-$TEXT['SEC_ANCHOR'] = 'Przedrostek tabeli (prefix)';
-$TEXT['SELECT_BOX'] = 'Pole wyboru';
-$TEXT['SEND_DETAILS'] = 'Wyślij szczegóły';
-$TEXT['SEPARATE'] = 'Osobno';
-$TEXT['SEPERATOR'] = 'Separator';
-$TEXT['SERVER_EMAIL'] = 'E-mail serwera';
-$TEXT['SERVER_OPERATING_SYSTEM'] = 'System operacyjny serwera';
-$TEXT['SESSION_IDENTIFIER'] = 'Identyfikator sesji';
-$TEXT['SETTINGS'] = 'Ustawienia';
-$TEXT['SHORT'] = 'Krótki';
-$TEXT['SHORT_TEXT'] = 'Krótki tekst';
-$TEXT['SHOW'] = 'Wyświetl';
-$TEXT['SHOW_ADVANCED'] = 'Wyświetl opcje zaawansowane';
-$TEXT['SIGNUP'] = 'Zapisz siÄ™';
-$TEXT['SIZE'] = 'Rozmiar';
-$TEXT['SMART_LOGIN'] = 'Inteligentne logowanie';
-$TEXT['START'] = 'Start';
-$TEXT['START_PUBLISHING'] = 'Rozpocznij publikowanie';
-$TEXT['SUBJECT'] = 'Temat';
-$TEXT['SUBMISSIONS'] = 'Zgłoszenia';
-$TEXT['SUBMISSIONS_STORED_IN_DATABASE'] = 'Zgłoszenia przechowywane w bazie danych';
-$TEXT['SUBMISSION_ID'] = 'ID zgłoszenia';
-$TEXT['SUBMITTED'] = 'Zgłoszone';
-$TEXT['SUCCESS'] = 'Sukces';
-$TEXT['SYSTEM_DEFAULT'] = 'Domyślne ustawienia systemu';
-$TEXT['SYSTEM_PERMISSIONS'] = 'Uprawnienia systemowe';
-$TEXT['TABLE_PREFIX'] = 'Przedrostek tabeli';
-$TEXT['TARGET'] = 'Cel';
-$TEXT['TARGET_FOLDER'] = 'Folder docelowy';
-$TEXT['TEMPLATE'] = 'Szablon';
-$TEXT['TEMPLATE_PERMISSIONS'] = 'Uprawnienia szablonów';
-$TEXT['TEXT'] = 'Tekst';
-$TEXT['TEXTAREA'] = 'Obszar tekstowy';
-$TEXT['TEXTFIELD'] = 'Pole tekstowe';
-$TEXT['THEME'] = 'Szablon panelu administracji';
-$TEXT['TIME'] = 'Czas';
-$TEXT['TIMEZONE'] = 'Strefa czasowa';
-$TEXT['TIME_FORMAT'] = 'Format czasu';
-$TEXT['TIME_LIMIT'] = 'Maksymalny czas potrzebny na fragment modułu';
-$TEXT['TITLE'] = 'Tytuł';
-$TEXT['TO'] = 'Do';
-$TEXT['TOP_FRAME'] = 'Główna ramka';
-$TEXT['TRASH_EMPTIED'] = 'Śmietnik opróniony';
-$TEXT['TXT_EDIT_CSS_FILE'] = 'Edycja CSS w polu tekstowym poniżej.';
-$TEXT['TYPE'] = 'Rodzaj';
-$TEXT['UNDER_CONSTRUCTION'] = 'W trakcie tworzenia';
-$TEXT['UNINSTALL'] = 'Odinstaluj';
-$TEXT['UNKNOWN'] = 'Nieznany';
-$TEXT['UNLIMITED'] = 'Nieograniczony';
-$TEXT['UNZIP_FILE'] = 'Wrzuć i rozpakuj archiwum';
-$TEXT['UP'] = 'Góra';
-$TEXT['UPGRADE'] = 'Aktualizuj';
-$TEXT['UPLOAD_FILES'] = 'Załaduj plik(i)';
-$TEXT['URL'] = 'URL';
-$TEXT['USER'] = 'Użytkownik';
-$TEXT['USERNAME'] = 'Nazwa użytkownika';
-$TEXT['USERS_ACTIVE'] = 'Aktywni użytkownicy';
-$TEXT['USERS_CAN_SELFDELETE'] = 'Użytkownik może usunąć się sam';
-$TEXT['USERS_CHANGE_SETTINGS'] = 'Użytkownik może zmienić swoje ustawienia';
-$TEXT['USERS_DELETED'] = 'Użytkownicy usunięci';
-$TEXT['USERS_FLAGS'] = 'Flagi użytkowników';
-$TEXT['USERS_PROFILE_ALLOWED'] = 'Użytkownik może tworzyć profil rozszerzony';
-$TEXT['VERIFICATION'] = 'Weryfikacja';
-$TEXT['VERSION'] = 'Wersja';
-$TEXT['VIEW'] = 'Widok';
-$TEXT['VIEW_DELETED_PAGES'] = 'Wyświetl usunięte strony';
-$TEXT['VIEW_DETAILS'] = 'Pokaż szczegóły';
-$TEXT['VISIBILITY'] = 'Widoczność';
-$TEXT['WBMAILER_DEFAULT_SENDER_MAIL'] = 'Domyślny mail nadawcy';
-$TEXT['WBMAILER_DEFAULT_SENDER_NAME'] = 'Domyślna nazwa nadawcy';
-$TEXT['WBMAILER_DEFAULT_SETTINGS_NOTICE'] = 'Określ domyślny adres odbiorcy "FROM" i nadawcy "SENDER". Zaleca się stosowanie ODBIORCY tak jak na przykładzie: <strong>admin@yourdomain.com</strong>. Niektórzy dostawcy maili (np. <em>mail.com</em>) mogą odrzucic maile od ODBIORCY adresu takiego jak np <em>name@mail.com</em> ze względu na potraktowanie tego jako spam.<br /><br /> Wartości domyślne są używane tylko wtedy inne wartości są określone przez WebsiteBakera. Jeśli twój serwer obsługuje <acronym title="Prosty protokół przesyłania poczty">SMTP</acronym>, możesz skorzystać z tej funkcji.';
-$TEXT['WBMAILER_FUNCTION'] = 'Funkcja maila';
-$TEXT['WBMAILER_NOTICE'] = '<strong>Ustawienia poczty SMTP:</strong><br />The settings below are only required if you want to send mails via <acronym title="Simple mail transfer protocol">SMTP</acronym>. If you do not know your SMTP host or you are not sure about the required settings, simply stay with the default mail routine: PHP MAIL.';
-$TEXT['WBMAILER_PHP'] = 'mail PHP';
-$TEXT['WBMAILER_SMTP'] = 'SMTP';
-$TEXT['WBMAILER_SMTP_AUTH'] = 'Weryfikacja SMTP';
-$TEXT['WBMAILER_SMTP_AUTH_NOTICE'] = 'Aktywuj tylko jeśli serwer wymaga uwierzytelnienia SMTP';
-$TEXT['WBMAILER_SMTP_HOST'] = ' Host SMTP';
-$TEXT['WBMAILER_SMTP_PASSWORD'] = 'Hasło poczty SMTP';
-$TEXT['WBMAILER_SMTP_USERNAME'] = 'Użytkownik poczty SMTP';
-$TEXT['WEBSITE'] = 'Witryna';
-$TEXT['WEBSITE_DESCRIPTION'] = 'Opis witryny';
-$TEXT['WEBSITE_FOOTER'] = 'Stopka witryny';
-$TEXT['WEBSITE_HEADER'] = 'Nagłówek witryny';
-$TEXT['WEBSITE_KEYWORDS'] = 'SÅ‚owa kluczowe witryny';
-$TEXT['WEBSITE_TITLE'] = 'Tytuł witryny';
-$TEXT['WELCOME_BACK'] = 'Witamy ponownie';
-$TEXT['WIDTH'] = 'Szerokość';
-$TEXT['WINDOW'] = 'Okno';
-$TEXT['WINDOWS'] = 'Okna';
-$TEXT['WORLD_WRITEABLE_FILE_PERMISSIONS'] = 'Uprawnienia zapisywania plików przez wszystkich';
-$TEXT['WRITE'] = 'Zapisz';
-$TEXT['WYSIWYG_EDITOR'] = 'Edytor WYSIWYG';
-$TEXT['WYSIWYG_STYLE'] = 'Styl WYSIWYG';
-$TEXT['YES'] = 'Tak';
-
-/* HEADING */
-$HEADING['ADDON_PRECHECK_FAILED'] = 'Wymagania dodatku nie zostały spełnione';
-$HEADING['ADD_CHILD_PAGE'] = 'Dodaj stronÄ™ dziecko"';
-$HEADING['ADD_GROUP'] = 'Dodaj grupÄ™';
-$HEADING['ADD_GROUPS'] = 'Dodak grupy';
-$HEADING['ADD_HEADING'] = 'Dodaj nagłówek';
-$HEADING['ADD_PAGE'] = 'Dodaj stronÄ™';
-$HEADING['ADD_USER'] = 'Dodaj użytkownika';
-$HEADING['ADMINISTRATION_TOOLS'] = 'Narzędzia administracyjne';
-$HEADING['BROWSE_MEDIA'] = 'PrzeglÄ…daj media';
-$HEADING['CREATE_FOLDER'] = 'Utwórz folder';
-$HEADING['DEFAULT_SETTINGS'] = 'Ustawienia domyślne';
-$HEADING['DELETED_PAGES'] = 'Usunięte strony';
-$HEADING['FILESYSTEM_SETTINGS'] = 'Ustawienia systemu plików';
-$HEADING['GENERAL_SETTINGS'] = 'Ustawienia ogólne';
-$HEADING['INSTALL_LANGUAGE'] = 'Zainstaluj język';
-$HEADING['INSTALL_MODULE'] = 'Zainstaluj moduół';
-$HEADING['INSTALL_TEMPLATE'] = 'Zainstaluj szablon';
-$HEADING['INVOKE_LANGUAGE_FILES'] = 'Uaktywnij pliki językowe ręcznie';
-$HEADING['INVOKE_MODULE_FILES'] = 'Uaktywnij pliki modułów ręcznie';
-$HEADING['INVOKE_TEMPLATE_FILES'] = 'Uaktywnij pliki szablonów ręcznie';
-$HEADING['LANGUAGE_DETAILS'] = 'Szczegóły języka';
-$HEADING['MANAGE_SECTIONS'] = 'ZarzÄ…dzaj sekcjami';
-$HEADING['MODIFY_ADVANCED_PAGE_SETTINGS'] = 'Zmień zaawansowane ustawienia strony';
-$HEADING['MODIFY_DELETE_GROUP'] = 'Zmień/usuń grupę';
-$HEADING['MODIFY_DELETE_PAGE'] = 'Zmień/Usuń stronę';
-$HEADING['MODIFY_DELETE_USER'] = 'Zmień/usuń użytkownika';
-$HEADING['MODIFY_GROUP'] = 'Zmień grupę';
-$HEADING['MODIFY_GROUPS'] = 'Zmień grupy';
-$HEADING['MODIFY_INTRO_PAGE'] = 'Zmień stronę początkową';
-$HEADING['MODIFY_PAGE'] = 'Zmień stronę';
-$HEADING['MODIFY_PAGE_SETTINGS'] = 'Zmień ustawienia strony';
-$HEADING['MODIFY_USER'] = 'Zmień użytkownika';
-$HEADING['MODULE_DETAILS'] = 'Szczegóły modułu';
-$HEADING['MY_EMAIL'] = 'Mój e-mail';
-$HEADING['MY_PASSWORD'] = 'Moje hasło';
-$HEADING['MY_SETTINGS'] = 'Moje ustawienia';
-$HEADING['SEARCH_SETTINGS'] = 'Ustawienia wyszukiwania';
-$HEADING['SERVER_SETTINGS'] = 'Ustawienia serwera';
-$HEADING['TEMPLATE_DETAILS'] = 'Szczegóły szablonu';
-$HEADING['UNINSTALL_LANGUAGE'] = 'Odinstaluj język';
-$HEADING['UNINSTALL_MODULE'] = 'Odinstaluj moduł';
-$HEADING['UNINSTALL_TEMPLATE'] = 'Odinstaluj szablon';
-$HEADING['UPGRADE_LANGUAGE'] = 'Language register/upgrading';
-$HEADING['UPLOAD_FILES'] = 'Załaduj plik(i)';
-$HEADING['WBMAILER_SETTINGS'] = 'Ustawienia rozsyłania maili';
-
-/* MESSAGE */
-$MESSAGE['ADDON_ERROR_RELOAD'] = 'BÅ‚Ä…d podczas aktualizacji dodatku.';
-$MESSAGE['ADDON_LANGUAGES_RELOADED'] = 'Pomyślnie zainstalowano ponownie pliki językowe';
-$MESSAGE['ADDON_MANUAL_FTP_LANGUAGE'] = '<strong>UWAGA!</strong> Ze względów bezpieczeństwa przesłanie plików językowych do folderu /languages/ powinno odbyć się tylko przez FTP.';
-$MESSAGE['ADDON_MANUAL_FTP_WARNING'] = 'Uwaga istniejące wpisy modułu mogą zostać utracone w bazie danych.';
-$MESSAGE['ADDON_MANUAL_INSTALLATION'] = 'Jeśli moduły są przesyłane za pomocą protokołu FTP (nie polecane), to funkcje takie jak <tt>instalacja</tt>, <tt>aktualizacja</tt> lub <tt>odinstalowanie</tt> mogą nie działać prawidłowo. <br /><br />';
-$MESSAGE['ADDON_MANUAL_INSTALLATION_WARNING'] = 'Uwaga istniejące wpisy modułu mogą zostać utracone w bazie danych. Użyj tej opcji tylko wtedy gdy masz problemy z przesłaniem przez FTP.';
-$MESSAGE['ADDON_MANUAL_RELOAD_WARNING'] = 'Uwaga istniejące wpisy modułu mogą zostać utracone w bazie danych.';
-$MESSAGE['ADDON_MODULES_RELOADED'] = 'Pomyślnie zainstalowano ponownie moduły';
-$MESSAGE['ADDON_OVERWRITE_NEWER_FILES'] = 'ZastÄ…p nowsze pliki';
-$MESSAGE['ADDON_PRECHECK_FAILED'] = 'Instalacja dodatku. Twój system nie spełnia wymogów niniejszego dodatku. Aby system pracował z tym dodatkiem należy rozwiązać kwestie przedstawione poniżej.';
-$MESSAGE['ADDON_RELOAD'] = 'Aktualizacja bazy danych z informacjami dodatków (np. po FTP).';
-$MESSAGE['ADDON_TEMPLATES_RELOADED'] = 'Szablony zostały pomyślnie załadowane ponownie';
-$MESSAGE['ADMIN_INSUFFICIENT_PRIVELLIGES'] = 'NiewystarczajÄ…ce uprawnienia do oglÄ…dania tej strony.';
-$MESSAGE['FORGOT_PASS_ALREADY_RESET'] = 'Hasło można resetować tylko raz na godzinę';
-$MESSAGE['FORGOT_PASS_CANNOT_EMAIL'] = 'Nie udało się wysłać hasła, proszę się skontaktować z administratorem';
-$MESSAGE['FORGOT_PASS_EMAIL_NOT_FOUND'] = 'Wprowadzonego adresu e-mail nie ma w bazie danych';
-$MESSAGE['FORGOT_PASS_NO_DATA'] = 'Proszę wprowadzić poniżej swój adres e-mail';
-$MESSAGE['FORGOT_PASS_PASSWORD_RESET'] = 'Twoja nazwa użytkownika i hasło zostały wysłane na Twój adres e-mail';
-$MESSAGE['FRONTEND_SORRY_NO_ACTIVE_SECTIONS'] = 'Niestety, nie ma aktywnej zawartości do wyświetlenia';
-$MESSAGE['FRONTEND_SORRY_NO_VIEWING_PERMISSIONS'] = 'Niestety, nie masz uprawnień do oglądania tej strony.';
-$MESSAGE['GENERIC_ALREADY_INSTALLED'] = 'Już zainstalowany';
-$MESSAGE['GENERIC_BAD_PERMISSIONS'] = 'Nie moża zapisać do katalogu docelowego';
-$MESSAGE['GENERIC_BE_PATIENT'] = 'Prosimy o cierpliwość';
-$MESSAGE['GENERIC_CANNOT_UNINSTALL'] = 'Nie można odinstalować';
-$MESSAGE['GENERIC_CANNOT_UNINSTALL_IN_USE'] = 'Nie można odinstalować: wybrany plik jest obecnie używany';
-$MESSAGE['GENERIC_CANNOT_UNINSTALL_IN_USE_TMPL'] = '<br /><br />{{type}} <b>{{type_name}}</b> nie może być odinstalowany, ponieważ jest używany przez {{pages}}:<br /><br />';
-$MESSAGE['GENERIC_CANNOT_UNINSTALL_IN_USE_TMPL_PAGES'] = 'następującą stronę;następujące strony';
-$MESSAGE['GENERIC_CANNOT_UNINSTALL_IS_DEFAULT_TEMPLATE'] = 'Szablon <b>{{name}}</b> nie może być odinstalowany, ponieważ jest ustawiony jako szablon domyślny!';
-$MESSAGE['GENERIC_CANNOT_UNINSTALL_IS_DEFAULT_THEME'] = 'Nie można odinstalować szablonu <b>{{name}}</b>, ponieważ jest ustawiony jako domyślny!';
-$MESSAGE['GENERIC_CANNOT_UNZIP'] = 'Nie można rozpakować pliku';
-$MESSAGE['GENERIC_CANNOT_UPLOAD'] = 'Nie można załadować pliku';
-$MESSAGE['GENERIC_COMPARE'] = ' pomyślnie';
-$MESSAGE['GENERIC_ERROR_OPENING_FILE'] = 'BÅ‚Ä…d podczas otwierania pliku.';
-$MESSAGE['GENERIC_FAILED_COMPARE'] = ' niepomyślnie';
-$MESSAGE['GENERIC_FILE_TYPE'] = 'Proszę zwrócić uwagę, że ładowany plik musi być w formacie:';
-$MESSAGE['GENERIC_FILE_TYPES'] = 'Proszę zwrócić uwagę, że ładowany plik musi być w jednym z formatów:';
-$MESSAGE['GENERIC_FILL_IN_ALL'] = 'Proszę się cofnąć i wypełnić wszystkie pola';
-$MESSAGE['GENERIC_FORGOT_OPTIONS'] = 'Nie dokonano żadnego wyboru!';
-$MESSAGE['GENERIC_INSTALLED'] = 'Zainstalowano pomyślnie';
-$MESSAGE['GENERIC_INVALID'] = 'Załadowany plik jest nieprawidłowy';
-$MESSAGE['GENERIC_INVALID_ADDON_FILE'] = 'Nieprawidłowy plik instalacyjny Websidebakera. Sprawdź format *.zip.';
-$MESSAGE['GENERIC_INVALID_LANGUAGE_FILE'] = 'Nieprawidłowy plik językowy Websidebakera. Proszę sprawdzić w pliku tekstowym.';
-$MESSAGE['GENERIC_INVALID_MODULE_FILE'] = 'Nieprawidłowy plik modułu Websidebakera. Proszę sprawdzić w pliku tekstowym.';
-$MESSAGE['GENERIC_INVALID_TEMPLATE_FILE'] = 'Nieprawidłowy plik szablonu Websidebakera. Proszę sprawdzić w pliku tekstowym.';
-$MESSAGE['GENERIC_IN_USE'] = ' może być użyte w ';
-$MESSAGE['GENERIC_MISSING_ARCHIVE_FILE'] = 'Brak archiwum pliku!';
-$MESSAGE['GENERIC_MODULE_VERSION_ERROR'] = 'Moduł nie jest poprawnie zainstalowany! Błędna wersja!';
-$MESSAGE['GENERIC_NOT_COMPARE'] = 'nie jest możliwe';
-$MESSAGE['GENERIC_NOT_INSTALLED'] = 'Niezainstalowano';
-$MESSAGE['GENERIC_NOT_UPGRADED'] = 'Aktualizacja nie może nastąpić';
-$MESSAGE['GENERIC_PLEASE_BE_PATIENT'] = 'Prosimy o cierpliwość, to może trochę potrwać.';
-$MESSAGE['GENERIC_PLEASE_CHECK_BACK_SOON'] = 'Zapraszamy wkrótce...';
-$MESSAGE['GENERIC_SECURITY_ACCESS'] = 'Naruszenie bezpieczeństwa!! Odmowa dostępu!';
-$MESSAGE['GENERIC_SECURITY_OFFENSE'] = 'Naruszenia bezpieczeństwa! Przechowywanie danych zostało odrzucone!';
-$MESSAGE['GENERIC_UNINSTALLED'] = 'Odinstalowano pomyślnie';
-$MESSAGE['GENERIC_UPGRADED'] = 'Zaktualizowano pomyślnie';
-$MESSAGE['GENERIC_VERSION_COMPARE'] = 'Porównyanie wersji';
-$MESSAGE['GENERIC_VERSION_GT'] = 'Wymagana aktualizacja!';
-$MESSAGE['GENERIC_VERSION_LT'] = 'Aktualizacja do niższej wersji';
-$MESSAGE['GENERIC_WEBSITE_LOCKED'] = 'Ta strona jest chwilowo niedostępna';
-$MESSAGE['GENERIC_WEBSITE_UNDER_CONSTRUCTION'] = 'Witryna w trakcie tworzenia';
-$MESSAGE['GROUPS_ADDED'] = 'Grupa została dodana';
-$MESSAGE['GROUPS_CONFIRM_DELETE'] = 'Czy aby na pewno usunąć wybraną grupę (i wszystkich użytkowników, którzy do niej należą)?';
-$MESSAGE['GROUPS_DELETED'] = 'Grupa została usunięta';
-$MESSAGE['GROUPS_GROUP_NAME_BLANK'] = 'Nazwa grupy jest pusta';
-$MESSAGE['GROUPS_GROUP_NAME_EXISTS'] = 'Grupa o takiej nazwie już istnieje';
-$MESSAGE['GROUPS_NO_GROUPS_FOUND'] = 'Nie odnaleziono żadnych grup';
-$MESSAGE['GROUPS_SAVED'] = 'Grupa została zapisana';
-$MESSAGE['LOGIN_AUTHENTICATION_FAILED'] = 'Nieprawidłowa nazwa użytkownika lub hasło';
-$MESSAGE['LOGIN_BOTH_BLANK'] = 'Proszę wprowadzić poniżej swoją nazwę użytkownika i hasło';
-$MESSAGE['LOGIN_PASSWORD_BLANK'] = 'Proszę wprowadzić hasło';
-$MESSAGE['LOGIN_PASSWORD_TOO_LONG'] = 'Wprowadzone hasło jest zbyt krótkie';
-$MESSAGE['LOGIN_PASSWORD_TOO_SHORT'] = 'Wprowadzone hasło jest zbyt krótkie';
-$MESSAGE['LOGIN_USERNAME_BLANK'] = 'Proszę wprowadzić nazwę użytkownika';
-$MESSAGE['LOGIN_USERNAME_TOO_LONG'] = 'Wprowadzona nazwa użytkownika jest zbyt długa';
-$MESSAGE['LOGIN_USERNAME_TOO_SHORT'] = 'Wprowadzona nawa użytkownika jest zbyt krótka';
-$MESSAGE['MEDIA_BLANK_EXTENSION'] = 'Nie wprowadzono rozszerzenia pliku';
-$MESSAGE['MEDIA_BLANK_NAME'] = 'Nie wprowadzono nazwy użytkownika';
-$MESSAGE['MEDIA_CANNOT_DELETE_DIR'] = 'Nie można usunąć wybranego folderu';
-$MESSAGE['MEDIA_CANNOT_DELETE_FILE'] = 'Nie można usunąć wybranego pliku';
-$MESSAGE['MEDIA_CANNOT_RENAME'] = 'Nie udało się zmienić nazwy';
-$MESSAGE['MEDIA_CONFIRM_DELETE'] = 'Czy aby na pewno usunąć następujące pliki lub foldery?';
-$MESSAGE['MEDIA_DELETED_DIR'] = 'Folder został usunięty';
-$MESSAGE['MEDIA_DELETED_FILE'] = 'Plik został usunięty';
-$MESSAGE['MEDIA_DIR_ACCESS_DENIED'] = 'Określony katalog nie istnieje lub nie jest dozwolony.';
-$MESSAGE['MEDIA_DIR_DOES_NOT_EXIST'] = 'Katalog nie istnieje';
-$MESSAGE['MEDIA_DIR_DOT_DOT_SLASH'] = 'Nazwa folderu nie może zawierać ../';
-$MESSAGE['MEDIA_DIR_EXISTS'] = 'Folder pasujący do wprowadzonej nazwy już istnieje';
-$MESSAGE['MEDIA_DIR_MADE'] = 'Folder został utworzony';
-$MESSAGE['MEDIA_DIR_NOT_MADE'] = 'Nie udało się utworzyć folderu';
-$MESSAGE['MEDIA_FILE_EXISTS'] = 'Plik pasujący do wprowadzonej nazwy już istnieje';
-$MESSAGE['MEDIA_FILE_NOT_FOUND'] = 'Plik nieodnaleziony';
-$MESSAGE['MEDIA_NAME_DOT_DOT_SLASH'] = 'Nazwa nie może zawierać ../';
-$MESSAGE['MEDIA_NAME_INDEX_PHP'] = 'Nie można użyć index.php jako nazwy';
-$MESSAGE['MEDIA_NONE_FOUND'] = 'Nie odnaleziono żadnych mediów w bieżącym folderze';
-$MESSAGE['MEDIA_NO_FILE_UPLOADED'] = 'Nie przyjęto pliku';
-$MESSAGE['MEDIA_RENAMED'] = 'Nazwa została zmieniona';
-$MESSAGE['MEDIA_SINGLE_UPLOADED'] = ' plik został pomyślnie załadowany';
-$MESSAGE['MEDIA_TARGET_DOT_DOT_SLASH'] = 'Folder docelowy nie może zawierać ../';
-$MESSAGE['MEDIA_UPLOADED'] = ' pliki zostały pomyślnie załadowane';
-$MESSAGE['MOD_FORM_EXCESS_SUBMISSIONS'] = 'Niestety, ten formularz został wysłany zbyt wiele razy w ciągu tej godziny. Prosimy spróbować ponownie za godzinę.';
-$MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'] = 'Wprowadzony numer weryfikacyjny (tzw. Captcha) jest nieprawidłowy. Jeśli masz problemy z odczytaniem Captcha, napisz do: SERVER_EMAIL';
-$MESSAGE['MOD_FORM_REQUIRED_FIELDS'] = 'Należy wprowadzić szczegóły dla następujących pól';
-$MESSAGE['PAGES_ADDED'] = 'Strona została dodana';
-$MESSAGE['PAGES_ADDED_HEADING'] = 'Nagłówek strony został dodany';
-$MESSAGE['PAGES_BLANK_MENU_TITLE'] = 'Proszę wprowadzić tytuł menu';
-$MESSAGE['PAGES_BLANK_PAGE_TITLE'] = 'Proszę wprowadzić tytuł strony';
-$MESSAGE['PAGES_CANNOT_CREATE_ACCESS_FILE'] = 'Błąd podczas tworzenia pliku dostępowego w katalogu /pages (niewystarczające uprawnienia)';
-$MESSAGE['PAGES_CANNOT_DELETE_ACCESS_FILE'] = 'Błąd podczas usuwania pliku dostępowego w katalogu /pages (niewystarczające uprawnienia)';
-$MESSAGE['PAGES_CANNOT_REORDER'] = 'Błąd podczas zmieniania kolejności stron';
-$MESSAGE['PAGES_DELETED'] = 'Strona została usunięta';
-$MESSAGE['PAGES_DELETE_CONFIRM'] = 'Czy aby na pewno usunąć wybraną stronę (i wszystkie jej podstrony)';
-$MESSAGE['PAGES_INSUFFICIENT_PERMISSIONS'] = 'Nie masz uprawnień do modyfikowania tej strony';
-$MESSAGE['PAGES_INTRO_LINK'] = 'Kliknij TUTAJ by zmienić stronę wprowadzającą';
-$MESSAGE['PAGES_INTRO_NOT_WRITABLE'] = 'Nie można zapisać pliku /pages/intro.php (niewystarczające uprawnienia)';
-$MESSAGE['PAGES_INTRO_SAVED'] = 'Strona wprowadzająca zostałą zapisana';
-$MESSAGE['PAGES_LAST_MODIFIED'] = 'Ostatnio zmodyfikowane przez';
-$MESSAGE['PAGES_NOT_FOUND'] = 'Strona nie znaleziona';
-$MESSAGE['PAGES_NOT_SAVED'] = 'BÅ‚Ä…d podczas zapisywania strony';
-$MESSAGE['PAGES_PAGE_EXISTS'] = 'Strona o tym lub podobnym tytule już istnieje';
-$MESSAGE['PAGES_REORDERED'] = 'Zmieniono kolejność stron';
-$MESSAGE['PAGES_RESTORED'] = 'Strona została przywrócona';
-$MESSAGE['PAGES_RETURN_TO_PAGES'] = 'Powrót do stron';
-$MESSAGE['PAGES_SAVED'] = 'Strona została zapisana';
-$MESSAGE['PAGES_SAVED_SETTINGS'] = 'Ustawienia strony zostały zapisane';
-$MESSAGE['PAGES_SECTIONS_PROPERTIES_SAVED'] = 'Właściwości sekcji zostały zapisane';
-$MESSAGE['PREFERENCES_CURRENT_PASSWORD_INCORRECT'] = '(Bieżące) hasło jest nieprawidłowe';
-$MESSAGE['PREFERENCES_DETAILS_SAVED'] = 'Szczegóły zostały zapisane';
-$MESSAGE['PREFERENCES_EMAIL_UPDATED'] = 'E-mail został zaktualizowany';
-$MESSAGE['PREFERENCES_INVALID_CHARS'] = 'Błąd. Hasło zawiera nieprawidłowe znaki';
-$MESSAGE['PREFERENCES_PASSWORD_CHANGED'] = 'Hasło zostało zmienione';
-$MESSAGE['RECORD_MODIFIED_FAILED'] = 'Zmiana tego rekordu nie powiodła się';
-$MESSAGE['RECORD_MODIFIED_SAVED'] = 'Zmiana rekordu została zaktualizowana pomyślnie.';
-$MESSAGE['RECORD_NEW_FAILED'] = 'Dodanie nowego rekordu się nie powiodło.';
-$MESSAGE['RECORD_NEW_SAVED'] = 'Nowy rekord został dodany pomyślnie.';
-$MESSAGE['SETTINGS_MODE_SWITCH_WARNING'] = 'Uwaga: naciśnięcie tego przycisku resetuje wszystkie niezapisane zmiany';
-$MESSAGE['SETTINGS_SAVED'] = 'Ustawienia zostały zapisane';
-$MESSAGE['SETTINGS_UNABLE_OPEN_CONFIG'] = 'Nie można otworzyć pliku konfiguracyjnego';
-$MESSAGE['SETTINGS_UNABLE_WRITE_CONFIG'] = 'Nie można zapisać pliku konfiguracyjnego';
-$MESSAGE['SETTINGS_WORLD_WRITEABLE_WARNING'] = 'Uwaga: zalecane wyłącznie w środowiskach testowych';
-$MESSAGE['SIGNUP2_ADMIN_INFO'] = '
-Nowe konto użytkownika zostało utworzone.
-
-Użytkownik: {LOGIN_NAME}
-ID użytkownika: {LOGIN_ID}
-E-Mail: {LOGIN_EMAIL}
-Adres IP: {LOGIN_IP}
-Data rejestracji: {SIGNUP_DATE}
-----------------------------------------
-Ta wiadomość została wygenerowana automatycznie.
-
-';
-$MESSAGE['SIGNUP2_BODY_LOGIN_FORGOT'] = '
-Witaj {LOGIN_DISPLAY_NAME},
-
-Ten mail został wysłany ponieważ\'zapomiano hasła\' funkcja odzyskania twojego konta została uruchomiona.
-
-Szczegóły twojego nowego konta \'{LOGIN_WEBSITE_TITLE}\' poniżej:
-
-Użytkownik: {LOGIN_NAME}
-Hasło: {LOGIN_PASSWORD}
-
-Powyżej zostało podane twoje hasło.
-Oznacza to, że stare hasło nie będzie już działać!
-Jeśli masz pytania bądź problemy z nowym loginem lub hasłem skontaktuj się z administratorem \'{LOGIN_WEBSITE_TITLE}\'.
-Aby uniknąć nieoczekiwanych awarii proszę pamiętać o czyszczeniu pamięci podręcznej cache przeglądarki
-
-Pozdrawiamy
-------------------------------------
-Ta wiadomość została wygenerowana automatycznie.
-
-';
-$MESSAGE['SIGNUP2_BODY_LOGIN_INFO'] = '
-Hello {LOGIN_DISPLAY_NAME},
-
-Witamy \'{LOGIN_WEBSITE_TITLE}\'.
-
-Szczegóły konta \'{LOGIN_WEBSITE_TITLE}\' poniżej:
-Użytkownik: {LOGIN_NAME}
-Hasło: {LOGIN_PASSWORD}
-
-Pozdrawiamy
-
-Prośba:
-Jeśli otrzymałeś tę wiadomość przez pomyłkę, usuń ją niezwłocznie!
--------------------------------------
-Ta wiadomość została wygenerowana automatycznie!
-';
-$MESSAGE['SIGNUP2_SUBJECT_LOGIN_INFO'] = 'Twoje dane logowania...';
-$MESSAGE['SIGNUP_NO_EMAIL'] = 'Należy wprowadzić adres e-mail';
-$MESSAGE['START_CURRENT_USER'] = 'JesteÅ› obecnie zalogowany(-a) jako:';
-$MESSAGE['START_INSTALL_DIR_EXISTS'] = 'Uwaga: katalog instalacyjny wciąż istnieje!';
-$MESSAGE['START_WELCOME_MESSAGE'] = 'Witamy w panelu administracyjnym WebsiteBakera';
-$MESSAGE['TEMPLATES_CHANGE_TEMPLATE_NOTICE'] = 'Uwaga: aby zmienić szablon, należy przejść do sekcji Ustawienia';
-$MESSAGE['USERS_ADDED'] = 'Użytkownik został dodany';
-$MESSAGE['USERS_CANT_SELFDELETE'] = 'Zadanie odrzucone, Nie możesz usunąć sam siebie!';
-$MESSAGE['USERS_CHANGING_PASSWORD'] = 'Uwaga: Powyższe pola należy wypełnić tylko, jeśli chce się zmienić hasło tego użytkownika';
-$MESSAGE['USERS_CONFIRM_DELETE'] = 'Czy aby na pewno usunąć wybranego użytkownika?';
-$MESSAGE['USERS_DELETED'] = 'Użytkownik został usunięty';
-$MESSAGE['USERS_EMAIL_TAKEN'] = 'Wprowadzony adres e-mail jest już używany';
-$MESSAGE['USERS_INVALID_EMAIL'] = 'Wprowadzony adres e-mail jest nieprawidłowy';
-$MESSAGE['USERS_NAME_INVALID_CHARS'] = 'W nazwie użytkownika są błędne znaki';
-$MESSAGE['USERS_NO_GROUP'] = 'Nie wybrano grupy';
-$MESSAGE['USERS_PASSWORD_MISMATCH'] = 'Wprowadzone hasła nie pasują';
-$MESSAGE['USERS_PASSWORD_TOO_SHORT'] = 'Wprowadzone hasło było za krótkie';
-$MESSAGE['USERS_SAVED'] = 'Użytkownik został zapisany';
-$MESSAGE['USERS_USERNAME_TAKEN'] = 'Wprowadzona nazwa użytkownika jest już zajęta';
-$MESSAGE['USERS_USERNAME_TOO_SHORT'] = 'Wprowadzona nazwa użytkownika była za krótka';
-
-/* OVERVIEW */
-$OVERVIEW['ADMINTOOLS'] = 'Narzędzia administracji WebsiteBakera...';
-$OVERVIEW['GROUPS'] = 'Zarządzaj grupami użytkowników i ich uprawnieniami systemowymi...';
-$OVERVIEW['HELP'] = 'Masz pytania? Znajdź odpowiedzi...';
-$OVERVIEW['LANGUAGES'] = 'Zarządzaj językami WebsiteBakera...';
-$OVERVIEW['MEDIA'] = 'Zarządzaj plikami przechowywanymi w folderze mediów...';
-$OVERVIEW['MODULES'] = 'Zarządzaj modułami WebsiteBakera...';
-$OVERVIEW['PAGES'] = 'ZarzÄ…dzaj stronami...';
-$OVERVIEW['PREFERENCES'] = 'Zmień preferencje, takie jak adres e-mail, hasło itp... ';
-$OVERVIEW['SETTINGS'] = 'Zmień ustawienia WebsiteBakera...';
-$OVERVIEW['START'] = 'Panel administracyjny';
-$OVERVIEW['TEMPLATES'] = 'Zmień wygląd swojej strony za pomocą szablonów...';
-$OVERVIEW['USERS'] = 'Zarządzaj użytkownikami mogącymi logować się do WebsiteBakera...';
-$OVERVIEW['VIEW'] = 'PodglÄ…d witryny w nowym oknie...';
-
-/* include old languages format */
-if(file_exists(WB_PATH.'/languages/old.format.inc.php'))
-{
-	include(WB_PATH.'/languages/old.format.inc.php');
+<?php
+/**
+ *
+ * @category        framework
+ * @package         language
+ * @author          WebsiteBaker Project
+ * @copyright       2004-2009, Ryan Djurovich
+ * @copyright       2009-2011, Website Baker Org. e.V.
+ * @link			http://www.websitebaker2.org/
+ * @license         http://www.gnu.org/licenses/gpl.html
+ * @platform        WebsiteBaker 2.8.x
+ * @requirements    PHP 5.2.2 and higher
+ * @version         $Id$
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
+ *
+ */
+
+// Must include code to stop this file being access directly
+if(defined('WB_PATH') == false) { exit("Cannot access this file directly"); }
+
+// Define that this file is loaded
+if(!defined('LANGUAGE_LOADED')) {
+define('LANGUAGE_LOADED', true);
+}
+
+// Set the language information
+$language_code = 'PL';
+$language_name = 'Polski';
+$language_version = '2.8';
+$language_platform = '2.8.x';
+$language_author = 'Marek Stępień;';
+$language_license = 'GNU General Public License';
+
+/* MENU */
+$MENU['ACCESS'] = 'Dostęp';
+$MENU['ADDON'] = 'Dodatek';
+$MENU['ADDONS'] = 'Dodatki';
+$MENU['ADMINTOOLS'] = 'Narzędzia admina';
+$MENU['BREADCRUMB'] = 'JesteÅ› tu: ';
+$MENU['FORGOT'] = 'Odzyskaj dane logowania';
+$MENU['GROUP'] = 'Groupa';
+$MENU['GROUPS'] = 'Grupy';
+$MENU['HELP'] = 'Pomoc';
+$MENU['LANGUAGES'] = 'Języki';
+$MENU['LOGIN'] = 'Zaloguj siÄ™';
+$MENU['LOGOUT'] = 'Wyloguj';
+$MENU['MEDIA'] = 'Media';
+$MENU['MODULES'] = 'Moduły';
+$MENU['PAGES'] = 'Strony';
+$MENU['PREFERENCES'] = 'Preferencje';
+$MENU['SETTINGS'] = 'Ustawienia';
+$MENU['START'] = 'PoczÄ…tek';
+$MENU['TEMPLATES'] = 'Szablony';
+$MENU['USERS'] = 'Użytkownicy';
+$MENU['VIEW'] = 'PodglÄ…d';
+
+/* TEXT */
+$TEXT['ACCOUNT_SIGNUP'] = 'Nowe konto';
+$TEXT['ACTIONS'] = 'Czynności';
+$TEXT['ACTIVE'] = 'Aktywne';
+$TEXT['ADD'] = 'Dodaj';
+$TEXT['ADDON'] = 'Dodatek';
+$TEXT['ADD_SECTION'] = 'Dodaj sekcji;';
+$TEXT['ADMIN'] = 'Administrator';
+$TEXT['ADMINISTRATION'] = 'Administracja';
+$TEXT['ADMINISTRATION_TOOL'] = 'Narzędzie administracyjne';
+$TEXT['ADMINISTRATOR'] = 'Administrator';
+$TEXT['ADMINISTRATORS'] = 'Administratorzy';
+$TEXT['ADVANCED'] = 'Zaawansowane';
+$TEXT['ALLOWED_FILETYPES_ON_UPLOAD'] = 'Dozwolone pliki do uploadu';
+$TEXT['ALLOWED_VIEWERS'] = 'Dozwoleni obserwatorzy';
+$TEXT['ALLOW_MULTIPLE_SELECTIONS'] = 'Pozwól na wielokrotne wybory';
+$TEXT['ALL_WORDS'] = 'Wszystkie słowa';
+$TEXT['ANCHOR'] = 'Kotwica';
+$TEXT['ANONYMOUS'] = 'Anonimowy';
+$TEXT['ANY_WORDS'] = 'Dowolne ze słów';
+$TEXT['APP_NAME'] = 'Nazwa aplikacji';
+$TEXT['ARE_YOU_SURE'] = 'Czy aby na pewno?';
+$TEXT['AUTHOR'] = 'Autor';
+$TEXT['BACK'] = 'Wstecz';
+$TEXT['BACKUP'] = 'Kopia zapasowa';
+$TEXT['BACKUP_ALL_TABLES'] = 'Backup all tables in database';
+$TEXT['BACKUP_DATABASE'] = 'Kopia zapasowa bazy danych';
+$TEXT['BACKUP_MEDIA'] = 'Kopia zapasowa mediów';
+$TEXT['BACKUP_WB_SPECIFIC'] = 'Kopia zapasowa tylko tabel WB_';
+$TEXT['BASIC'] = 'Podstawowe';
+$TEXT['BLOCK'] = 'Blokuj';
+$TEXT['CALENDAR'] = 'Calentarz';
+$TEXT['CANCEL'] = 'Anuluj';
+$TEXT['CAN_DELETE_HIMSELF'] = 'Can delete himself';
+$TEXT['CAPTCHA_VERIFICATION'] = 'Weryfikacja Captcha';
+$TEXT['CAP_EDIT_CSS'] = 'Edytuj CSS';
+$TEXT['CHANGE'] = 'Zmień;';
+$TEXT['CHANGES'] = 'Zmiany';
+$TEXT['CHANGE_SETTINGS'] = 'Zmień ustawienia';
+$TEXT['CHARSET'] = 'Kodowanie znaków';
+$TEXT['CHECKBOX_GROUP'] = 'Grupa pól zaznaczanych';
+$TEXT['CLOSE'] = 'Zamknij';
+$TEXT['CODE'] = 'Kod';
+$TEXT['CODE_SNIPPET'] = 'Kod snippeta';
+$TEXT['COLLAPSE'] = 'Zwiń;';
+$TEXT['COMMENT'] = 'Komentarz';
+$TEXT['COMMENTING'] = 'Komentowanie';
+$TEXT['COMMENTS'] = 'Komentarze';
+$TEXT['CREATE_FOLDER'] = 'Utwórz folder';
+$TEXT['CURRENT'] = 'Bieżący';
+$TEXT['CURRENT_FOLDER'] = 'Bieżący folder';
+$TEXT['CURRENT_PAGE'] = 'Bieżąca strona';
+$TEXT['CURRENT_PASSWORD'] = 'Bieżące hasło';
+$TEXT['CUSTOM'] = 'WÅ‚asny';
+$TEXT['DATABASE'] = 'Baza danych';
+$TEXT['DATE'] = 'Data';
+$TEXT['DATE_FORMAT'] = 'Format daty';
+$TEXT['DEFAULT'] = 'Domyślne';
+$TEXT['DEFAULT_CHARSET'] = 'Domyślne kodowanie znaków';
+$TEXT['DEFAULT_TEXT'] = 'Domyślny tekst';
+$TEXT['DELETE'] = 'Usuń;';
+$TEXT['DELETED'] = 'Usunięte';
+$TEXT['DELETE_DATE'] = 'Usuń datę';
+$TEXT['DELETE_ZIP'] = 'Usuń archiwum zip po rozpakowaniu';
+$TEXT['DESCRIPTION'] = 'Opis';
+$TEXT['DESIGNED_FOR'] = 'Zaprojektowane dla';
+$TEXT['DIRECTORIES'] = 'Katalogi';
+$TEXT['DIRECTORY_MODE'] = 'Tryb katalogów';
+$TEXT['DISABLED'] = 'Wyłączone';
+$TEXT['DISPLAY_NAME'] = 'Nazwa';
+$TEXT['EMAIL'] = 'E-mail';
+$TEXT['EMAIL_ADDRESS'] = 'Adres e-mail';
+$TEXT['EMPTY_TRASH'] = 'Opróżnij śmietnik';
+$TEXT['ENABLED'] = 'WÅ‚Ä…czone';
+$TEXT['END'] = 'Koniec';
+$TEXT['ERROR'] = 'BÅ‚Ä…d';
+$TEXT['EXACT_MATCH'] = 'Dopasowanie dokładne';
+$TEXT['EXECUTE'] = 'Wykonaj';
+$TEXT['EXPAND'] = 'Rozwiń';
+$TEXT['EXTENSION'] = 'Rozszerzenie';
+$TEXT['FIELD'] = 'Pole';
+$TEXT['FILE'] = 'plik';
+$TEXT['FILES'] = 'pliki';
+$TEXT['FILESYSTEM_PERMISSIONS'] = 'Uprawnienia systemu plików';
+$TEXT['FILE_MODE'] = 'Tryb plikw';
+$TEXT['FINISH_PUBLISHING'] = 'Zakoncz publikowanie';
+$TEXT['FOLDER'] = 'folder';
+$TEXT['FOLDERS'] = 'foldery';
+$TEXT['FOOTER'] = 'Stopka';
+$TEXT['FORGOTTEN_DETAILS'] = 'Zapomniałeś(-aś) hasła?';
+$TEXT['FORGOT_DETAILS'] = 'Zapomniałeś(-aś) szczegółów?';
+$TEXT['FROM'] = 'Od';
+$TEXT['FRONTEND'] = 'Panel przedni';
+$TEXT['FULL_NAME'] = 'ImiÄ™ i nazwisko';
+$TEXT['FUNCTION'] = 'Funkcja';
+$TEXT['GROUP'] = 'Grupa';
+$TEXT['HEADER'] = 'Nagłówek';
+$TEXT['HEADING'] = 'Nagłówek';
+$TEXT['HEADING_CSS_FILE'] = 'Aktualny plik modułu: ';
+$TEXT['HEIGHT'] = 'Wysokość;';
+$TEXT['HIDDEN'] = 'Ukryty';
+$TEXT['HIDE'] = 'Schowaj';
+$TEXT['HIDE_ADVANCED'] = 'Schowaj opcje zaawansowane';
+$TEXT['HOME'] = 'Strona domowa';
+$TEXT['HOMEPAGE_REDIRECTION'] = 'Przekierowanie strony domowej';
+$TEXT['HOME_FOLDER'] = 'Osobisty Folder';
+$TEXT['HOME_FOLDERS'] = 'Osobiste Foldery';
+$TEXT['HOST'] = 'Host';
+$TEXT['ICON'] = 'Ikona';
+$TEXT['IMAGE'] = 'Obrazek';
+$TEXT['INLINE'] = 'Inline';
+$TEXT['INSTALL'] = 'Zainstaluj';
+$TEXT['INSTALLATION'] = 'Instalacja';
+$TEXT['INSTALLATION_PATH'] = 'Ścieżka instalacji';
+$TEXT['INSTALLATION_URL'] = 'URL instalacji';
+$TEXT['INSTALLED'] = 'zainstalowano';
+$TEXT['INTRO'] = 'Intro';
+$TEXT['INTRO_PAGE'] = 'Strona wprowadzajÄ…ca';
+$TEXT['INVALID_SIGNS'] = 'musi zaczynać się od litery bądź niedozwolonych znaków';
+$TEXT['KEYWORDS'] = 'słow kluczowe';
+$TEXT['LANGUAGE'] = 'Język';
+$TEXT['LAST_UPDATED_BY'] = 'Ostatnio zmienione przez';
+$TEXT['LENGTH'] = 'Długość';
+$TEXT['LEVEL'] = 'Poziom';
+$TEXT['LINK'] = 'Odnośnik';
+$TEXT['LINUX_UNIX_BASED'] = 'oparty na Linux/Unix';
+$TEXT['LIST_OPTIONS'] = 'Listuj opcje';
+$TEXT['LOGGED_IN'] = 'Zalogowany';
+$TEXT['LOGIN'] = 'Zaloguj';
+$TEXT['LONG'] = 'DÅ‚ugi';
+$TEXT['LONG_TEXT'] = 'DÅ‚ugi tekst';
+$TEXT['LOOP'] = 'Pętla';
+$TEXT['MAIN'] = 'Główny';
+$TEXT['MAINTENANCE_OFF'] = 'Maintenance off';
+$TEXT['MAINTENANCE_ON'] = 'Maintenance on';
+$TEXT['MANAGE'] = 'ZarzÄ…dzaj';
+$TEXT['MANAGE_GROUPS'] = 'ZarzÄ…dzaj grupami';
+$TEXT['MANAGE_USERS'] = 'Zarządzaj użytkownikami';
+$TEXT['MATCH'] = 'Dopasuj';
+$TEXT['MATCHING'] = 'PasujÄ…ce';
+$TEXT['MAX_EXCERPT'] = 'Maksymalny fragment linii';
+$TEXT['MAX_SUBMISSIONS_PER_HOUR'] = 'Maks. zgłoszeń na godzinę';
+$TEXT['MEDIA_DIRECTORY'] = 'Katalog mediów';
+$TEXT['MENU'] = 'Menu';
+$TEXT['MENU_ICON_0'] = 'Menu-Icon normal';
+$TEXT['MENU_ICON_1'] = 'Menu-Icon hover';
+$TEXT['MENU_TITLE'] = 'Tytuł menu';
+$TEXT['MESSAGE'] = 'Wiadomość';
+$TEXT['MODIFY'] = 'Zmień';
+$TEXT['MODIFY_CONTENT'] = 'Zmień zawartość';
+$TEXT['MODIFY_SETTINGS'] = 'Zmień ustawienia';
+$TEXT['MODULE_ORDER'] = 'Moduł- kolejność wyszukiwania';
+$TEXT['MODULE_PERMISSIONS'] = 'Uprawnienia do modułów';
+$TEXT['MORE'] = 'Więcej';
+$TEXT['MOVE_DOWN'] = 'W dół';
+$TEXT['MOVE_UP'] = 'Do góry';
+$TEXT['MULTIPLE_MENUS'] = 'Wielokrotne menu';
+$TEXT['MULTISELECT'] = 'Wybór wielokrotny';
+$TEXT['NAME'] = 'Nazwa';
+$TEXT['NEED_CURRENT_PASSWORD'] = 'potwierdź obecne hasło';
+$TEXT['NEED_TO_LOGIN'] = 'Potrzebujesz się zalogować?';
+$TEXT['NEW_PASSWORD'] = 'Nowe hasło';
+$TEXT['NEW_WINDOW'] = 'Nowe okno';
+$TEXT['NEXT'] = 'Następny';
+$TEXT['NEXT_PAGE'] = 'Następna strona';
+$TEXT['NO'] = 'Nie';
+$TEXT['NONE'] = 'Brak';
+$TEXT['NONE_FOUND'] = 'Nie odnaleziono';
+$TEXT['NOT_FOUND'] = 'Nie odnaleziono';
+$TEXT['NOT_INSTALLED'] = 'nie zainstalowano';
+$TEXT['NO_IMAGE_SELECTED'] = 'nie wybrano obrazu';
+$TEXT['NO_RESULTS'] = 'Brak wyników';
+$TEXT['OF'] = 'z';
+$TEXT['ON'] = 'dnia';
+$TEXT['OPEN'] = 'Otwórz';
+$TEXT['OPTION'] = 'Opcja';
+$TEXT['OTHERS'] = 'Inni';
+$TEXT['OUT_OF'] = 'z poza';
+$TEXT['OVERWRITE_EXISTING'] = 'Nadpisz istniejÄ…cy(-e)';
+$TEXT['PAGE'] = 'Strona';
+$TEXT['PAGES_DIRECTORY'] = 'Katalog stron';
+$TEXT['PAGES_PERMISSION'] = 'Prawa do strony';
+$TEXT['PAGES_PERMISSIONS'] = 'Prawa do stron';
+$TEXT['PAGE_EXTENSION'] = 'Rozszerzenie strony';
+$TEXT['PAGE_ICON'] = 'Obrazek strony';
+$TEXT['PAGE_ICON_DIR'] = 'Ścieżka stron/obrazki menu';
+$TEXT['PAGE_LANGUAGES'] = 'Języki stron';
+$TEXT['PAGE_LEVEL_LIMIT'] = 'Limit poziomów stron';
+$TEXT['PAGE_SPACER'] = 'Odstęp strony';
+$TEXT['PAGE_TITLE'] = 'Tytuł strony';
+$TEXT['PAGE_TRASH'] = 'Åšmietnik stron';
+$TEXT['PARENT'] = 'Nadrzędny';
+$TEXT['PASSWORD'] = 'Hasło';
+$TEXT['PATH'] = 'Ścieżka';
+$TEXT['PHP_ERROR_LEVEL'] = 'Poziom raportowania błędów PHP';
+$TEXT['PLEASE_LOGIN'] = 'Podaj login';
+$TEXT['PLEASE_SELECT'] = 'Proszę wybrać';
+$TEXT['POST'] = 'Wiadomość';
+$TEXT['POSTS_PER_PAGE'] = 'Wiadomości na stronę';
+$TEXT['POST_FOOTER'] = 'Stopka wiadomości';
+$TEXT['POST_HEADER'] = 'Nagłówek wiadomości';
+$TEXT['PREVIOUS'] = 'Poprzedni';
+$TEXT['PREVIOUS_PAGE'] = 'Poprzednia strona';
+$TEXT['PRIVATE'] = 'Prywatna';
+$TEXT['PRIVATE_VIEWERS'] = 'Prywatni obserwatorzy';
+$TEXT['PROFILES_EDIT'] = 'Zmień profil';
+$TEXT['PUBLIC'] = 'Publiczna';
+$TEXT['PUBL_END_DATE'] = 'Data zakończenia';
+$TEXT['PUBL_START_DATE'] = 'Data rozpoczęcia';
+$TEXT['RADIO_BUTTON_GROUP'] = 'Grupa pól przełączanych';
+$TEXT['READ'] = 'Odczytaj';
+$TEXT['READ_MORE'] = 'Czytaj dalej';
+$TEXT['REDIRECT_AFTER'] = 'Przekierowanie po';
+$TEXT['REGISTERED'] = 'Zarejestrowany';
+$TEXT['REGISTERED_VIEWERS'] = 'Zarejestrowani obserwatorzy';
+$TEXT['RELOAD'] = 'Przeładuj, odśwież';
+$TEXT['REMEMBER_ME'] = 'Zapamiętaj mnie';
+$TEXT['RENAME'] = 'Zmień nazwę';
+$TEXT['RENAME_FILES_ON_UPLOAD'] = 'Zmień nazwy plików przy załadowywaniu';
+$TEXT['REQUIRED'] = 'Wymagany';
+$TEXT['REQUIREMENT'] = 'Wymagania';
+$TEXT['RESET'] = 'Resetuj';
+$TEXT['RESIZE'] = 'Zmień rozmiar';
+$TEXT['RESIZE_IMAGE_TO'] = 'Zmień rozmiar obrazków na';
+$TEXT['RESTORE'] = 'Przywróć';
+$TEXT['RESTORE_DATABASE'] = 'Przywróć bazę danych';
+$TEXT['RESTORE_MEDIA'] = 'Przywróć media';
+$TEXT['RESULTS'] = 'Wyniki';
+$TEXT['RESULTS_FOOTER'] = 'Stopka wyników';
+$TEXT['RESULTS_FOR'] = 'Wyniki dla';
+$TEXT['RESULTS_HEADER'] = 'Nagłówek wyników';
+$TEXT['RESULTS_LOOP'] = 'Pętla wyników';
+$TEXT['RETYPE_NEW_PASSWORD'] = 'Powtórz nowe hasło';
+$TEXT['RETYPE_PASSWORD'] = 'Powtórz hasło';
+$TEXT['SAME_WINDOW'] = 'To samo okno';
+$TEXT['SAVE'] = 'Zapisz';
+$TEXT['SEARCH'] = 'Szukaj';
+$TEXT['SEARCHING'] = 'Wyszukiwanie';
+$TEXT['SECTION'] = 'Sekcja';
+$TEXT['SECTION_BLOCKS'] = 'Bloki sekcji';
+$TEXT['SEC_ANCHOR'] = 'Przedrostek tabeli (prefix)';
+$TEXT['SELECT_BOX'] = 'Pole wyboru';
+$TEXT['SEND_DETAILS'] = 'Wyślij szczegóły';
+$TEXT['SEPARATE'] = 'Osobno';
+$TEXT['SEPERATOR'] = 'Separator';
+$TEXT['SERVER_EMAIL'] = 'E-mail serwera';
+$TEXT['SERVER_OPERATING_SYSTEM'] = 'System operacyjny serwera';
+$TEXT['SESSION_IDENTIFIER'] = 'Identyfikator sesji';
+$TEXT['SETTINGS'] = 'Ustawienia';
+$TEXT['SHORT'] = 'Krótki';
+$TEXT['SHORT_TEXT'] = 'Krótki tekst';
+$TEXT['SHOW'] = 'Wyświetl';
+$TEXT['SHOW_ADVANCED'] = 'Wyświetl opcje zaawansowane';
+$TEXT['SIGNUP'] = 'Zapisz siÄ™';
+$TEXT['SIZE'] = 'Rozmiar';
+$TEXT['SMART_LOGIN'] = 'Inteligentne logowanie';
+$TEXT['START'] = 'Start';
+$TEXT['START_PUBLISHING'] = 'Rozpocznij publikowanie';
+$TEXT['SUBJECT'] = 'Temat';
+$TEXT['SUBMISSIONS'] = 'Zgłoszenia';
+$TEXT['SUBMISSIONS_STORED_IN_DATABASE'] = 'Zgłoszenia przechowywane w bazie danych';
+$TEXT['SUBMISSION_ID'] = 'ID zgłoszenia';
+$TEXT['SUBMITTED'] = 'Zgłoszone';
+$TEXT['SUCCESS'] = 'Sukces';
+$TEXT['SYSTEM_DEFAULT'] = 'Domyślne ustawienia systemu';
+$TEXT['SYSTEM_PERMISSIONS'] = 'Uprawnienia systemowe';
+$TEXT['TABLE_PREFIX'] = 'Przedrostek tabeli';
+$TEXT['TARGET'] = 'Cel';
+$TEXT['TARGET_FOLDER'] = 'Folder docelowy';
+$TEXT['TEMPLATE'] = 'Szablon';
+$TEXT['TEMPLATE_PERMISSIONS'] = 'Uprawnienia szablonów';
+$TEXT['TEXT'] = 'Tekst';
+$TEXT['TEXTAREA'] = 'Obszar tekstowy';
+$TEXT['TEXTFIELD'] = 'Pole tekstowe';
+$TEXT['THEME'] = 'Szablon panelu administracji';
+$TEXT['TIME'] = 'Czas';
+$TEXT['TIMEZONE'] = 'Strefa czasowa';
+$TEXT['TIME_FORMAT'] = 'Format czasu';
+$TEXT['TIME_LIMIT'] = 'Maksymalny czas potrzebny na fragment modułu';
+$TEXT['TITLE'] = 'Tytuł';
+$TEXT['TO'] = 'Do';
+$TEXT['TOP_FRAME'] = 'Główna ramka';
+$TEXT['TRASH_EMPTIED'] = 'Śmietnik opróniony';
+$TEXT['TXT_EDIT_CSS_FILE'] = 'Edycja CSS w polu tekstowym poniżej.';
+$TEXT['TYPE'] = 'Rodzaj';
+$TEXT['UNDER_CONSTRUCTION'] = 'W trakcie tworzenia';
+$TEXT['UNINSTALL'] = 'Odinstaluj';
+$TEXT['UNKNOWN'] = 'Nieznany';
+$TEXT['UNLIMITED'] = 'Nieograniczony';
+$TEXT['UNZIP_FILE'] = 'Wrzuć i rozpakuj archiwum';
+$TEXT['UP'] = 'Góra';
+$TEXT['UPGRADE'] = 'Aktualizuj';
+$TEXT['UPLOAD_FILES'] = 'Załaduj plik(i)';
+$TEXT['URL'] = 'URL';
+$TEXT['USER'] = 'Użytkownik';
+$TEXT['USERNAME'] = 'Nazwa użytkownika';
+$TEXT['USERS_ACTIVE'] = 'Aktywni użytkownicy';
+$TEXT['USERS_CAN_SELFDELETE'] = 'Użytkownik może usunąć się sam';
+$TEXT['USERS_CHANGE_SETTINGS'] = 'Użytkownik może zmienić swoje ustawienia';
+$TEXT['USERS_DELETED'] = 'Użytkownicy usunięci';
+$TEXT['USERS_FLAGS'] = 'Flagi użytkowników';
+$TEXT['USERS_PROFILE_ALLOWED'] = 'Użytkownik może tworzyć profil rozszerzony';
+$TEXT['VERIFICATION'] = 'Weryfikacja';
+$TEXT['VERSION'] = 'Wersja';
+$TEXT['VIEW'] = 'Widok';
+$TEXT['VIEW_DELETED_PAGES'] = 'Wyświetl usunięte strony';
+$TEXT['VIEW_DETAILS'] = 'Pokaż szczegóły';
+$TEXT['VISIBILITY'] = 'Widoczność';
+$TEXT['WBMAILER_DEFAULT_SENDER_MAIL'] = 'Domyślny mail nadawcy';
+$TEXT['WBMAILER_DEFAULT_SENDER_NAME'] = 'Domyślna nazwa nadawcy';
+$TEXT['WBMAILER_DEFAULT_SETTINGS_NOTICE'] = 'Określ domyślny adres odbiorcy "FROM" i nadawcy "SENDER". Zaleca się stosowanie ODBIORCY tak jak na przykładzie: <strong>admin@yourdomain.com</strong>. Niektórzy dostawcy maili (np. <em>mail.com</em>) mogą odrzucic maile od ODBIORCY adresu takiego jak np <em>name@mail.com</em> ze względu na potraktowanie tego jako spam.<br /><br /> Wartości domyślne są używane tylko wtedy inne wartości są określone przez WebsiteBakera. Jeśli twój serwer obsługuje <acronym title="Prosty protokół przesyłania poczty">SMTP</acronym>, możesz skorzystać z tej funkcji.';
+$TEXT['WBMAILER_FUNCTION'] = 'Funkcja maila';
+$TEXT['WBMAILER_NOTICE'] = '<strong>Ustawienia poczty SMTP:</strong><br />The settings below are only required if you want to send mails via <acronym title="Simple mail transfer protocol">SMTP</acronym>. If you do not know your SMTP host or you are not sure about the required settings, simply stay with the default mail routine: PHP MAIL.';
+$TEXT['WBMAILER_PHP'] = 'mail PHP';
+$TEXT['WBMAILER_SMTP'] = 'SMTP';
+$TEXT['WBMAILER_SMTP_AUTH'] = 'Weryfikacja SMTP';
+$TEXT['WBMAILER_SMTP_AUTH_NOTICE'] = 'Aktywuj tylko jeśli serwer wymaga uwierzytelnienia SMTP';
+$TEXT['WBMAILER_SMTP_HOST'] = ' Host SMTP';
+$TEXT['WBMAILER_SMTP_PASSWORD'] = 'Hasło poczty SMTP';
+$TEXT['WBMAILER_SMTP_USERNAME'] = 'Użytkownik poczty SMTP';
+$TEXT['WEBSITE'] = 'Witryna';
+$TEXT['WEBSITE_DESCRIPTION'] = 'Opis witryny';
+$TEXT['WEBSITE_FOOTER'] = 'Stopka witryny';
+$TEXT['WEBSITE_HEADER'] = 'Nagłówek witryny';
+$TEXT['WEBSITE_KEYWORDS'] = 'SÅ‚owa kluczowe witryny';
+$TEXT['WEBSITE_TITLE'] = 'Tytuł witryny';
+$TEXT['WELCOME_BACK'] = 'Witamy ponownie';
+$TEXT['WIDTH'] = 'Szerokość';
+$TEXT['WINDOW'] = 'Okno';
+$TEXT['WINDOWS'] = 'Okna';
+$TEXT['WORLD_WRITEABLE_FILE_PERMISSIONS'] = 'Uprawnienia zapisywania plików przez wszystkich';
+$TEXT['WRITE'] = 'Zapisz';
+$TEXT['WYSIWYG_EDITOR'] = 'Edytor WYSIWYG';
+$TEXT['WYSIWYG_STYLE'] = 'Styl WYSIWYG';
+$TEXT['YES'] = 'Tak';
+
+/* HEADING */
+$HEADING['ADDON_PRECHECK_FAILED'] = 'Wymagania dodatku nie zostały spełnione';
+$HEADING['ADD_CHILD_PAGE'] = 'Dodaj stronÄ™ dziecko"';
+$HEADING['ADD_GROUP'] = 'Dodaj grupÄ™';
+$HEADING['ADD_GROUPS'] = 'Dodak grupy';
+$HEADING['ADD_HEADING'] = 'Dodaj nagłówek';
+$HEADING['ADD_PAGE'] = 'Dodaj stronÄ™';
+$HEADING['ADD_USER'] = 'Dodaj użytkownika';
+$HEADING['ADMINISTRATION_TOOLS'] = 'Narzędzia administracyjne';
+$HEADING['BROWSE_MEDIA'] = 'PrzeglÄ…daj media';
+$HEADING['CREATE_FOLDER'] = 'Utwórz folder';
+$HEADING['DEFAULT_SETTINGS'] = 'Ustawienia domyślne';
+$HEADING['DELETED_PAGES'] = 'Usunięte strony';
+$HEADING['FILESYSTEM_SETTINGS'] = 'Ustawienia systemu plików';
+$HEADING['GENERAL_SETTINGS'] = 'Ustawienia ogólne';
+$HEADING['INSTALL_LANGUAGE'] = 'Zainstaluj język';
+$HEADING['INSTALL_MODULE'] = 'Zainstaluj moduół';
+$HEADING['INSTALL_TEMPLATE'] = 'Zainstaluj szablon';
+$HEADING['INVOKE_LANGUAGE_FILES'] = 'Uaktywnij pliki językowe ręcznie';
+$HEADING['INVOKE_MODULE_FILES'] = 'Uaktywnij pliki modułów ręcznie';
+$HEADING['INVOKE_TEMPLATE_FILES'] = 'Uaktywnij pliki szablonów ręcznie';
+$HEADING['LANGUAGE_DETAILS'] = 'Szczegóły języka';
+$HEADING['MANAGE_SECTIONS'] = 'ZarzÄ…dzaj sekcjami';
+$HEADING['MODIFY_ADVANCED_PAGE_SETTINGS'] = 'Zmień zaawansowane ustawienia strony';
+$HEADING['MODIFY_DELETE_GROUP'] = 'Zmień/usuń grupę';
+$HEADING['MODIFY_DELETE_PAGE'] = 'Zmień/Usuń stronę';
+$HEADING['MODIFY_DELETE_USER'] = 'Zmień/usuń użytkownika';
+$HEADING['MODIFY_GROUP'] = 'Zmień grupę';
+$HEADING['MODIFY_GROUPS'] = 'Zmień grupy';
+$HEADING['MODIFY_INTRO_PAGE'] = 'Zmień stronę początkową';
+$HEADING['MODIFY_PAGE'] = 'Zmień stronę';
+$HEADING['MODIFY_PAGE_SETTINGS'] = 'Zmień ustawienia strony';
+$HEADING['MODIFY_USER'] = 'Zmień użytkownika';
+$HEADING['MODULE_DETAILS'] = 'Szczegóły modułu';
+$HEADING['MY_EMAIL'] = 'Mój e-mail';
+$HEADING['MY_PASSWORD'] = 'Moje hasło';
+$HEADING['MY_SETTINGS'] = 'Moje ustawienia';
+$HEADING['SEARCH_SETTINGS'] = 'Ustawienia wyszukiwania';
+$HEADING['SERVER_SETTINGS'] = 'Ustawienia serwera';
+$HEADING['TEMPLATE_DETAILS'] = 'Szczegóły szablonu';
+$HEADING['UNINSTALL_LANGUAGE'] = 'Odinstaluj język';
+$HEADING['UNINSTALL_MODULE'] = 'Odinstaluj moduł';
+$HEADING['UNINSTALL_TEMPLATE'] = 'Odinstaluj szablon';
+$HEADING['UPGRADE_LANGUAGE'] = 'Language register/upgrading';
+$HEADING['UPLOAD_FILES'] = 'Załaduj plik(i)';
+$HEADING['WBMAILER_SETTINGS'] = 'Ustawienia rozsyłania maili';
+
+/* MESSAGE */
+$MESSAGE['ADDON_ERROR_RELOAD'] = 'BÅ‚Ä…d podczas aktualizacji dodatku.';
+$MESSAGE['ADDON_LANGUAGES_RELOADED'] = 'Pomyślnie zainstalowano ponownie pliki językowe';
+$MESSAGE['ADDON_MANUAL_FTP_LANGUAGE'] = '<strong>UWAGA!</strong> Ze względów bezpieczeństwa przesłanie plików językowych do folderu /languages/ powinno odbyć się tylko przez FTP.';
+$MESSAGE['ADDON_MANUAL_FTP_WARNING'] = 'Uwaga istniejące wpisy modułu mogą zostać utracone w bazie danych.';
+$MESSAGE['ADDON_MANUAL_INSTALLATION'] = 'Jeśli moduły są przesyłane za pomocą protokołu FTP (nie polecane), to funkcje takie jak <tt>instalacja</tt>, <tt>aktualizacja</tt> lub <tt>odinstalowanie</tt> mogą nie działać prawidłowo. <br /><br />';
+$MESSAGE['ADDON_MANUAL_INSTALLATION_WARNING'] = 'Uwaga istniejące wpisy modułu mogą zostać utracone w bazie danych. Użyj tej opcji tylko wtedy gdy masz problemy z przesłaniem przez FTP.';
+$MESSAGE['ADDON_MANUAL_RELOAD_WARNING'] = 'Uwaga istniejące wpisy modułu mogą zostać utracone w bazie danych.';
+$MESSAGE['ADDON_MODULES_RELOADED'] = 'Pomyślnie zainstalowano ponownie moduły';
+$MESSAGE['ADDON_OVERWRITE_NEWER_FILES'] = 'ZastÄ…p nowsze pliki';
+$MESSAGE['ADDON_PRECHECK_FAILED'] = 'Instalacja dodatku. Twój system nie spełnia wymogów niniejszego dodatku. Aby system pracował z tym dodatkiem należy rozwiązać kwestie przedstawione poniżej.';
+$MESSAGE['ADDON_RELOAD'] = 'Aktualizacja bazy danych z informacjami dodatków (np. po FTP).';
+$MESSAGE['ADDON_TEMPLATES_RELOADED'] = 'Szablony zostały pomyślnie załadowane ponownie';
+$MESSAGE['ADMIN_INSUFFICIENT_PRIVELLIGES'] = 'NiewystarczajÄ…ce uprawnienia do oglÄ…dania tej strony.';
+$MESSAGE['FORGOT_PASS_ALREADY_RESET'] = 'Hasło można resetować tylko raz na godzinę';
+$MESSAGE['FORGOT_PASS_CANNOT_EMAIL'] = 'Nie udało się wysłać hasła, proszę się skontaktować z administratorem';
+$MESSAGE['FORGOT_PASS_EMAIL_NOT_FOUND'] = 'Wprowadzonego adresu e-mail nie ma w bazie danych';
+$MESSAGE['FORGOT_PASS_NO_DATA'] = 'Proszę wprowadzić poniżej swój adres e-mail';
+$MESSAGE['FORGOT_PASS_PASSWORD_RESET'] = 'Twoja nazwa użytkownika i hasło zostały wysłane na Twój adres e-mail';
+$MESSAGE['FRONTEND_SORRY_NO_ACTIVE_SECTIONS'] = 'Niestety, nie ma aktywnej zawartości do wyświetlenia';
+$MESSAGE['FRONTEND_SORRY_NO_VIEWING_PERMISSIONS'] = 'Niestety, nie masz uprawnień do oglądania tej strony.';
+$MESSAGE['GENERIC_ALREADY_INSTALLED'] = 'Już zainstalowany';
+$MESSAGE['GENERIC_BAD_PERMISSIONS'] = 'Nie moża zapisać do katalogu docelowego';
+$MESSAGE['GENERIC_BE_PATIENT'] = 'Prosimy o cierpliwość';
+$MESSAGE['GENERIC_CANNOT_UNINSTALL'] = 'Nie można odinstalować';
+$MESSAGE['GENERIC_CANNOT_UNINSTALL_IN_USE'] = 'Nie można odinstalować: wybrany plik jest obecnie używany';
+$MESSAGE['GENERIC_CANNOT_UNINSTALL_IN_USE_TMPL'] = '<br /><br />{{type}} <b>{{type_name}}</b> nie może być odinstalowany, ponieważ jest używany przez {{pages}}:<br /><br />';
+$MESSAGE['GENERIC_CANNOT_UNINSTALL_IN_USE_TMPL_PAGES'] = 'następującą stronę;następujące strony';
+$MESSAGE['GENERIC_CANNOT_UNINSTALL_IS_DEFAULT_TEMPLATE'] = 'Szablon <b>{{name}}</b> nie może być odinstalowany, ponieważ jest ustawiony jako szablon domyślny!';
+$MESSAGE['GENERIC_CANNOT_UNINSTALL_IS_DEFAULT_THEME'] = 'Nie można odinstalować szablonu <b>{{name}}</b>, ponieważ jest ustawiony jako domyślny!';
+$MESSAGE['GENERIC_CANNOT_UNZIP'] = 'Nie można rozpakować pliku';
+$MESSAGE['GENERIC_CANNOT_UPLOAD'] = 'Nie można załadować pliku';
+$MESSAGE['GENERIC_COMPARE'] = ' pomyślnie';
+$MESSAGE['GENERIC_ERROR_OPENING_FILE'] = 'BÅ‚Ä…d podczas otwierania pliku.';
+$MESSAGE['GENERIC_FAILED_COMPARE'] = ' niepomyślnie';
+$MESSAGE['GENERIC_FILE_TYPE'] = 'Proszę zwrócić uwagę, że ładowany plik musi być w formacie:';
+$MESSAGE['GENERIC_FILE_TYPES'] = 'Proszę zwrócić uwagę, że ładowany plik musi być w jednym z formatów:';
+$MESSAGE['GENERIC_FILL_IN_ALL'] = 'Proszę się cofnąć i wypełnić wszystkie pola';
+$MESSAGE['GENERIC_FORGOT_OPTIONS'] = 'Nie dokonano żadnego wyboru!';
+$MESSAGE['GENERIC_INSTALLED'] = 'Zainstalowano pomyślnie';
+$MESSAGE['GENERIC_INVALID'] = 'Załadowany plik jest nieprawidłowy';
+$MESSAGE['GENERIC_INVALID_ADDON_FILE'] = 'Nieprawidłowy plik instalacyjny Websidebakera. Sprawdź format *.zip.';
+$MESSAGE['GENERIC_INVALID_LANGUAGE_FILE'] = 'Nieprawidłowy plik językowy Websidebakera. Proszę sprawdzić w pliku tekstowym.';
+$MESSAGE['GENERIC_INVALID_MODULE_FILE'] = 'Nieprawidłowy plik modułu Websidebakera. Proszę sprawdzić w pliku tekstowym.';
+$MESSAGE['GENERIC_INVALID_TEMPLATE_FILE'] = 'Nieprawidłowy plik szablonu Websidebakera. Proszę sprawdzić w pliku tekstowym.';
+$MESSAGE['GENERIC_IN_USE'] = ' może być użyte w ';
+$MESSAGE['GENERIC_MISSING_ARCHIVE_FILE'] = 'Brak archiwum pliku!';
+$MESSAGE['GENERIC_MODULE_VERSION_ERROR'] = 'Moduł nie jest poprawnie zainstalowany! Błędna wersja!';
+$MESSAGE['GENERIC_NOT_COMPARE'] = 'nie jest możliwe';
+$MESSAGE['GENERIC_NOT_INSTALLED'] = 'Niezainstalowano';
+$MESSAGE['GENERIC_NOT_UPGRADED'] = 'Aktualizacja nie może nastąpić';
+$MESSAGE['GENERIC_PLEASE_BE_PATIENT'] = 'Prosimy o cierpliwość, to może trochę potrwać.';
+$MESSAGE['GENERIC_PLEASE_CHECK_BACK_SOON'] = 'Zapraszamy wkrótce...';
+$MESSAGE['GENERIC_SECURITY_ACCESS'] = 'Naruszenie bezpieczeństwa!! Odmowa dostępu!';
+$MESSAGE['GENERIC_SECURITY_OFFENSE'] = 'Naruszenia bezpieczeństwa! Przechowywanie danych zostało odrzucone!';
+$MESSAGE['GENERIC_UNINSTALLED'] = 'Odinstalowano pomyślnie';
+$MESSAGE['GENERIC_UPGRADED'] = 'Zaktualizowano pomyślnie';
+$MESSAGE['GENERIC_VERSION_COMPARE'] = 'Porównyanie wersji';
+$MESSAGE['GENERIC_VERSION_GT'] = 'Wymagana aktualizacja!';
+$MESSAGE['GENERIC_VERSION_LT'] = 'Aktualizacja do niższej wersji';
+$MESSAGE['GENERIC_WEBSITE_LOCKED'] = 'Ta strona jest chwilowo niedostępna';
+$MESSAGE['GENERIC_WEBSITE_UNDER_CONSTRUCTION'] = 'Witryna w trakcie tworzenia';
+$MESSAGE['GROUPS_ADDED'] = 'Grupa została dodana';
+$MESSAGE['GROUPS_CONFIRM_DELETE'] = 'Czy aby na pewno usunąć wybraną grupę (i wszystkich użytkowników, którzy do niej należą)?';
+$MESSAGE['GROUPS_DELETED'] = 'Grupa została usunięta';
+$MESSAGE['GROUPS_GROUP_NAME_BLANK'] = 'Nazwa grupy jest pusta';
+$MESSAGE['GROUPS_GROUP_NAME_EXISTS'] = 'Grupa o takiej nazwie już istnieje';
+$MESSAGE['GROUPS_NO_GROUPS_FOUND'] = 'Nie odnaleziono żadnych grup';
+$MESSAGE['GROUPS_SAVED'] = 'Grupa została zapisana';
+$MESSAGE['LOGIN_AUTHENTICATION_FAILED'] = 'Nieprawidłowa nazwa użytkownika lub hasło';
+$MESSAGE['LOGIN_BOTH_BLANK'] = 'Proszę wprowadzić poniżej swoją nazwę użytkownika i hasło';
+$MESSAGE['LOGIN_PASSWORD_BLANK'] = 'Proszę wprowadzić hasło';
+$MESSAGE['LOGIN_PASSWORD_TOO_LONG'] = 'Wprowadzone hasło jest zbyt krótkie';
+$MESSAGE['LOGIN_PASSWORD_TOO_SHORT'] = 'Wprowadzone hasło jest zbyt krótkie';
+$MESSAGE['LOGIN_USERNAME_BLANK'] = 'Proszę wprowadzić nazwę użytkownika';
+$MESSAGE['LOGIN_USERNAME_TOO_LONG'] = 'Wprowadzona nazwa użytkownika jest zbyt długa';
+$MESSAGE['LOGIN_USERNAME_TOO_SHORT'] = 'Wprowadzona nawa użytkownika jest zbyt krótka';
+$MESSAGE['MEDIA_BLANK_EXTENSION'] = 'Nie wprowadzono rozszerzenia pliku';
+$MESSAGE['MEDIA_BLANK_NAME'] = 'Nie wprowadzono nazwy użytkownika';
+$MESSAGE['MEDIA_CANNOT_DELETE_DIR'] = 'Nie można usunąć wybranego folderu';
+$MESSAGE['MEDIA_CANNOT_DELETE_FILE'] = 'Nie można usunąć wybranego pliku';
+$MESSAGE['MEDIA_CANNOT_RENAME'] = 'Nie udało się zmienić nazwy';
+$MESSAGE['MEDIA_CONFIRM_DELETE'] = 'Czy aby na pewno usunąć następujące pliki lub foldery?';
+$MESSAGE['MEDIA_DELETED_DIR'] = 'Folder został usunięty';
+$MESSAGE['MEDIA_DELETED_FILE'] = 'Plik został usunięty';
+$MESSAGE['MEDIA_DIR_ACCESS_DENIED'] = 'Określony katalog nie istnieje lub nie jest dozwolony.';
+$MESSAGE['MEDIA_DIR_DOES_NOT_EXIST'] = 'Katalog nie istnieje';
+$MESSAGE['MEDIA_DIR_DOT_DOT_SLASH'] = 'Nazwa folderu nie może zawierać ../';
+$MESSAGE['MEDIA_DIR_EXISTS'] = 'Folder pasujący do wprowadzonej nazwy już istnieje';
+$MESSAGE['MEDIA_DIR_MADE'] = 'Folder został utworzony';
+$MESSAGE['MEDIA_DIR_NOT_MADE'] = 'Nie udało się utworzyć folderu';
+$MESSAGE['MEDIA_FILE_EXISTS'] = 'Plik pasujący do wprowadzonej nazwy już istnieje';
+$MESSAGE['MEDIA_FILE_NOT_FOUND'] = 'Plik nieodnaleziony';
+$MESSAGE['MEDIA_NAME_DOT_DOT_SLASH'] = 'Nazwa nie może zawierać ../';
+$MESSAGE['MEDIA_NAME_INDEX_PHP'] = 'Nie można użyć index.php jako nazwy';
+$MESSAGE['MEDIA_NONE_FOUND'] = 'Nie odnaleziono żadnych mediów w bieżącym folderze';
+$MESSAGE['MEDIA_NO_FILE_UPLOADED'] = 'Nie przyjęto pliku';
+$MESSAGE['MEDIA_RENAMED'] = 'Nazwa została zmieniona';
+$MESSAGE['MEDIA_SINGLE_UPLOADED'] = ' plik został pomyślnie załadowany';
+$MESSAGE['MEDIA_TARGET_DOT_DOT_SLASH'] = 'Folder docelowy nie może zawierać ../';
+$MESSAGE['MEDIA_UPLOADED'] = ' pliki zostały pomyślnie załadowane';
+$MESSAGE['MOD_FORM_EXCESS_SUBMISSIONS'] = 'Niestety, ten formularz został wysłany zbyt wiele razy w ciągu tej godziny. Prosimy spróbować ponownie za godzinę.';
+$MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'] = 'Wprowadzony numer weryfikacyjny (tzw. Captcha) jest nieprawidłowy. Jeśli masz problemy z odczytaniem Captcha, napisz do: SERVER_EMAIL';
+$MESSAGE['MOD_FORM_REQUIRED_FIELDS'] = 'Należy wprowadzić szczegóły dla następujących pól';
+$MESSAGE['PAGES_ADDED'] = 'Strona została dodana';
+$MESSAGE['PAGES_ADDED_HEADING'] = 'Nagłówek strony został dodany';
+$MESSAGE['PAGES_BLANK_MENU_TITLE'] = 'Proszę wprowadzić tytuł menu';
+$MESSAGE['PAGES_BLANK_PAGE_TITLE'] = 'Proszę wprowadzić tytuł strony';
+$MESSAGE['PAGES_CANNOT_CREATE_ACCESS_FILE'] = 'Błąd podczas tworzenia pliku dostępowego w katalogu /pages (niewystarczające uprawnienia)';
+$MESSAGE['PAGES_CANNOT_DELETE_ACCESS_FILE'] = 'Błąd podczas usuwania pliku dostępowego w katalogu /pages (niewystarczające uprawnienia)';
+$MESSAGE['PAGES_CANNOT_REORDER'] = 'Błąd podczas zmieniania kolejności stron';
+$MESSAGE['PAGES_DELETED'] = 'Strona została usunięta';
+$MESSAGE['PAGES_DELETE_CONFIRM'] = 'Czy aby na pewno usunąć wybraną stronę (i wszystkie jej podstrony)';
+$MESSAGE['PAGES_INSUFFICIENT_PERMISSIONS'] = 'Nie masz uprawnień do modyfikowania tej strony';
+$MESSAGE['PAGES_INTRO_LINK'] = 'Kliknij TUTAJ by zmienić stronę wprowadzającą';
+$MESSAGE['PAGES_INTRO_NOT_WRITABLE'] = 'Nie można zapisać pliku /pages/intro.php (niewystarczające uprawnienia)';
+$MESSAGE['PAGES_INTRO_SAVED'] = 'Strona wprowadzająca zostałą zapisana';
+$MESSAGE['PAGES_LAST_MODIFIED'] = 'Ostatnio zmodyfikowane przez';
+$MESSAGE['PAGES_NOT_FOUND'] = 'Strona nie znaleziona';
+$MESSAGE['PAGES_NOT_SAVED'] = 'BÅ‚Ä…d podczas zapisywania strony';
+$MESSAGE['PAGES_PAGE_EXISTS'] = 'Strona o tym lub podobnym tytule już istnieje';
+$MESSAGE['PAGES_REORDERED'] = 'Zmieniono kolejność stron';
+$MESSAGE['PAGES_RESTORED'] = 'Strona została przywrócona';
+$MESSAGE['PAGES_RETURN_TO_PAGES'] = 'Powrót do stron';
+$MESSAGE['PAGES_SAVED'] = 'Strona została zapisana';
+$MESSAGE['PAGES_SAVED_SETTINGS'] = 'Ustawienia strony zostały zapisane';
+$MESSAGE['PAGES_SECTIONS_PROPERTIES_SAVED'] = 'Właściwości sekcji zostały zapisane';
+$MESSAGE['PREFERENCES_CURRENT_PASSWORD_INCORRECT'] = '(Bieżące) hasło jest nieprawidłowe';
+$MESSAGE['PREFERENCES_DETAILS_SAVED'] = 'Szczegóły zostały zapisane';
+$MESSAGE['PREFERENCES_EMAIL_UPDATED'] = 'E-mail został zaktualizowany';
+$MESSAGE['PREFERENCES_INVALID_CHARS'] = 'Błąd. Hasło zawiera nieprawidłowe znaki';
+$MESSAGE['PREFERENCES_PASSWORD_CHANGED'] = 'Hasło zostało zmienione';
+$MESSAGE['RECORD_MODIFIED_FAILED'] = 'Zmiana tego rekordu nie powiodła się';
+$MESSAGE['RECORD_MODIFIED_SAVED'] = 'Zmiana rekordu została zaktualizowana pomyślnie.';
+$MESSAGE['RECORD_NEW_FAILED'] = 'Dodanie nowego rekordu się nie powiodło.';
+$MESSAGE['RECORD_NEW_SAVED'] = 'Nowy rekord został dodany pomyślnie.';
+$MESSAGE['SETTINGS_MODE_SWITCH_WARNING'] = 'Uwaga: naciśnięcie tego przycisku resetuje wszystkie niezapisane zmiany';
+$MESSAGE['SETTINGS_SAVED'] = 'Ustawienia zostały zapisane';
+$MESSAGE['SETTINGS_UNABLE_OPEN_CONFIG'] = 'Nie można otworzyć pliku konfiguracyjnego';
+$MESSAGE['SETTINGS_UNABLE_WRITE_CONFIG'] = 'Nie można zapisać pliku konfiguracyjnego';
+$MESSAGE['SETTINGS_WORLD_WRITEABLE_WARNING'] = 'Uwaga: zalecane wyłącznie w środowiskach testowych';
+$MESSAGE['SIGNUP2_ADMIN_INFO'] = '
+Nowe konto użytkownika zostało utworzone.
+
+Użytkownik: {LOGIN_NAME}
+ID użytkownika: {LOGIN_ID}
+E-Mail: {LOGIN_EMAIL}
+Adres IP: {LOGIN_IP}
+Data rejestracji: {SIGNUP_DATE}
+----------------------------------------
+Ta wiadomość została wygenerowana automatycznie.
+
+';
+$MESSAGE['SIGNUP2_BODY_LOGIN_FORGOT'] = '
+Witaj {LOGIN_DISPLAY_NAME},
+
+Ten mail został wysłany ponieważ\'zapomiano hasła\' funkcja odzyskania twojego konta została uruchomiona.
+
+Szczegóły twojego nowego konta \'{LOGIN_WEBSITE_TITLE}\' poniżej:
+
+Użytkownik: {LOGIN_NAME}
+Hasło: {LOGIN_PASSWORD}
+
+Powyżej zostało podane twoje hasło.
+Oznacza to, że stare hasło nie będzie już działać!
+Jeśli masz pytania bądź problemy z nowym loginem lub hasłem skontaktuj się z administratorem \'{LOGIN_WEBSITE_TITLE}\'.
+Aby uniknąć nieoczekiwanych awarii proszę pamiętać o czyszczeniu pamięci podręcznej cache przeglądarki
+
+Pozdrawiamy
+------------------------------------
+Ta wiadomość została wygenerowana automatycznie.
+
+';
+$MESSAGE['SIGNUP2_BODY_LOGIN_INFO'] = '
+Hello {LOGIN_DISPLAY_NAME},
+
+Witamy \'{LOGIN_WEBSITE_TITLE}\'.
+
+Szczegóły konta \'{LOGIN_WEBSITE_TITLE}\' poniżej:
+Użytkownik: {LOGIN_NAME}
+Hasło: {LOGIN_PASSWORD}
+
+Pozdrawiamy
+
+Prośba:
+Jeśli otrzymałeś tę wiadomość przez pomyłkę, usuń ją niezwłocznie!
+-------------------------------------
+Ta wiadomość została wygenerowana automatycznie!
+';
+$MESSAGE['SIGNUP2_SUBJECT_LOGIN_INFO'] = 'Twoje dane logowania...';
+$MESSAGE['SIGNUP_NO_EMAIL'] = 'Należy wprowadzić adres e-mail';
+$MESSAGE['START_CURRENT_USER'] = 'JesteÅ› obecnie zalogowany(-a) jako:';
+$MESSAGE['START_INSTALL_DIR_EXISTS'] = 'Uwaga: katalog instalacyjny wciąż istnieje!';
+$MESSAGE['START_WELCOME_MESSAGE'] = 'Witamy w panelu administracyjnym WebsiteBakera';
+$MESSAGE['TEMPLATES_CHANGE_TEMPLATE_NOTICE'] = 'Uwaga: aby zmienić szablon, należy przejść do sekcji Ustawienia';
+$MESSAGE['USERS_ADDED'] = 'Użytkownik został dodany';
+$MESSAGE['USERS_CANT_SELFDELETE'] = 'Zadanie odrzucone, Nie możesz usunąć sam siebie!';
+$MESSAGE['USERS_CHANGING_PASSWORD'] = 'Uwaga: Powyższe pola należy wypełnić tylko, jeśli chce się zmienić hasło tego użytkownika';
+$MESSAGE['USERS_CONFIRM_DELETE'] = 'Czy aby na pewno usunąć wybranego użytkownika?';
+$MESSAGE['USERS_DELETED'] = 'Użytkownik został usunięty';
+$MESSAGE['USERS_EMAIL_TAKEN'] = 'Wprowadzony adres e-mail jest już używany';
+$MESSAGE['USERS_INVALID_EMAIL'] = 'Wprowadzony adres e-mail jest nieprawidłowy';
+$MESSAGE['USERS_NAME_INVALID_CHARS'] = 'W nazwie użytkownika są błędne znaki';
+$MESSAGE['USERS_NO_GROUP'] = 'Nie wybrano grupy';
+$MESSAGE['USERS_PASSWORD_MISMATCH'] = 'Wprowadzone hasła nie pasują';
+$MESSAGE['USERS_PASSWORD_TOO_SHORT'] = 'Wprowadzone hasło było za krótkie';
+$MESSAGE['USERS_SAVED'] = 'Użytkownik został zapisany';
+$MESSAGE['USERS_USERNAME_TAKEN'] = 'Wprowadzona nazwa użytkownika jest już zajęta';
+$MESSAGE['USERS_USERNAME_TOO_SHORT'] = 'Wprowadzona nazwa użytkownika była za krótka';
+
+/* OVERVIEW */
+$OVERVIEW['ADMINTOOLS'] = 'Narzędzia administracji WebsiteBakera...';
+$OVERVIEW['GROUPS'] = 'Zarządzaj grupami użytkowników i ich uprawnieniami systemowymi...';
+$OVERVIEW['HELP'] = 'Masz pytania? Znajdź odpowiedzi...';
+$OVERVIEW['LANGUAGES'] = 'Zarządzaj językami WebsiteBakera...';
+$OVERVIEW['MEDIA'] = 'Zarządzaj plikami przechowywanymi w folderze mediów...';
+$OVERVIEW['MODULES'] = 'Zarządzaj modułami WebsiteBakera...';
+$OVERVIEW['PAGES'] = 'ZarzÄ…dzaj stronami...';
+$OVERVIEW['PREFERENCES'] = 'Zmień preferencje, takie jak adres e-mail, hasło itp... ';
+$OVERVIEW['SETTINGS'] = 'Zmień ustawienia WebsiteBakera...';
+$OVERVIEW['START'] = 'Panel administracyjny';
+$OVERVIEW['TEMPLATES'] = 'Zmień wygląd swojej strony za pomocą szablonów...';
+$OVERVIEW['USERS'] = 'Zarządzaj użytkownikami mogącymi logować się do WebsiteBakera...';
+$OVERVIEW['VIEW'] = 'PodglÄ…d witryny w nowym oknie...';
+
+/* include old languages format */
+if(file_exists(WB_PATH.'/languages/old.format.inc.php'))
+{
+	include(WB_PATH.'/languages/old.format.inc.php');
 }
\ No newline at end of file

Property changes on: branches/2.8.x/wb/languages/PL.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1,4 +1 ##
-Id
-Revision
-HeadURL
-Date
\ No newline at end of property
+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/languages/HU.php
===================================================================
--- branches/2.8.x/wb/languages/HU.php	(revision 1456)
+++ branches/2.8.x/wb/languages/HU.php	(revision 1457)

Property changes on: branches/2.8.x/wb/languages/HU.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1,4 +1 ##
-Id
-Revision
-HeadURL
-Date
\ No newline at end of property
+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/languages/IT.php
===================================================================
--- branches/2.8.x/wb/languages/IT.php	(revision 1456)
+++ branches/2.8.x/wb/languages/IT.php	(revision 1457)

Property changes on: branches/2.8.x/wb/languages/IT.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1,4 +1 ##
-Id
-Revision
-HeadURL
-Date
\ No newline at end of property
+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/languages/NO.php
===================================================================
--- branches/2.8.x/wb/languages/NO.php	(revision 1456)
+++ branches/2.8.x/wb/languages/NO.php	(revision 1457)

Property changes on: branches/2.8.x/wb/languages/NO.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1,4 +1 ##
-Id
-Revision
-HeadURL
-Date
\ No newline at end of property
+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/languages/SK.php
===================================================================
--- branches/2.8.x/wb/languages/SK.php	(revision 1456)
+++ branches/2.8.x/wb/languages/SK.php	(revision 1457)

Property changes on: branches/2.8.x/wb/languages/SK.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1,4 +1 ##
-Id
-Revision
-HeadURL
-Date
\ No newline at end of property
+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/languages/LV.php
===================================================================
--- branches/2.8.x/wb/languages/LV.php	(revision 1456)
+++ branches/2.8.x/wb/languages/LV.php	(revision 1457)

Property changes on: branches/2.8.x/wb/languages/LV.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1,4 +1 ##
-Id
-Revision
-HeadURL
-Date
\ No newline at end of property
+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/languages/CA.php
===================================================================
--- branches/2.8.x/wb/languages/CA.php	(revision 1456)
+++ branches/2.8.x/wb/languages/CA.php	(revision 1457)

Property changes on: branches/2.8.x/wb/languages/CA.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1,4 +1 ##
-Id
-Revision
-HeadURL
-Date
\ No newline at end of property
+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/languages/PT.php
===================================================================
--- branches/2.8.x/wb/languages/PT.php	(revision 1456)
+++ branches/2.8.x/wb/languages/PT.php	(revision 1457)

Property changes on: branches/2.8.x/wb/languages/PT.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1,4 +1 ##
-Id
-Revision
-HeadURL
-Date
\ No newline at end of property
+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/languages/DA.php
===================================================================
--- branches/2.8.x/wb/languages/DA.php	(revision 1456)
+++ branches/2.8.x/wb/languages/DA.php	(revision 1457)

Property changes on: branches/2.8.x/wb/languages/DA.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1,4 +1 ##
-Id
-Revision
-HeadURL
-Date
\ No newline at end of property
+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/languages/TR.php
===================================================================
--- branches/2.8.x/wb/languages/TR.php	(revision 1456)
+++ branches/2.8.x/wb/languages/TR.php	(revision 1457)

Property changes on: branches/2.8.x/wb/languages/TR.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1,4 +1 ##
-Id
-Revision
-HeadURL
-Date
\ No newline at end of property
+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/languages/RU.php
===================================================================
--- branches/2.8.x/wb/languages/RU.php	(revision 1456)
+++ branches/2.8.x/wb/languages/RU.php	(revision 1457)

Property changes on: branches/2.8.x/wb/languages/RU.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1,4 +1 ##
-Id
-Revision
-HeadURL
-Date
\ No newline at end of property
+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/languages/DE.php
===================================================================
--- branches/2.8.x/wb/languages/DE.php	(revision 1456)
+++ branches/2.8.x/wb/languages/DE.php	(revision 1457)
@@ -580,50 +580,50 @@
 $MESSAGE['SETTINGS_UNABLE_OPEN_CONFIG'] = 'Konfigurationsdatei konnte nicht ge&ouml;ffnet werden';
 $MESSAGE['SETTINGS_UNABLE_WRITE_CONFIG'] = 'Die Konfigurationsdatei konnte nicht geschrieben werden';
 $MESSAGE['SETTINGS_WORLD_WRITEABLE_WARNING'] = 'Bitte beachten Sie: Dies wird nur zu Testzwecken empfohlen';
-$MESSAGE['SIGNUP2_ADMIN_INFO'] = '
-Es wurde ein neuer User regisriert.
-
-Username: {LOGIN_NAME}
-UserId: {LOGIN_ID}
-E-Mail: {LOGIN_EMAIL}
-IP-Adresse: {LOGIN_IP}
-Anmeldedatum: {SIGNUP_DATE}
-----------------------------------------
-Diese E-Mail wurde automatisch erstellt!
-
+$MESSAGE['SIGNUP2_ADMIN_INFO'] = '
+Es wurde ein neuer User regisriert.
+
+Username: {LOGIN_NAME}
+UserId: {LOGIN_ID}
+E-Mail: {LOGIN_EMAIL}
+IP-Adresse: {LOGIN_IP}
+Anmeldedatum: {SIGNUP_DATE}
+----------------------------------------
+Diese E-Mail wurde automatisch erstellt!
+
 ';
-$MESSAGE['SIGNUP2_BODY_LOGIN_FORGOT'] = '
-Hallo {LOGIN_DISPLAY_NAME},
-
-Sie erhalten diese E-Mail, weil sie ein neues Passwort angefordert haben.
-
-Ihre neuen Logindaten f&uuml;r {LOGIN_WEBSITE_TITLE} lauten:
-
-Benutzername: {LOGIN_NAME}
-Passwort: {LOGIN_PASSWORD}
-
-Das bisherige Passwort wurde durch das neue Passwort oben ersetzt.
-
-Sollten Sie kein neues Kennwort angefordert haben, l&ouml;schen Sie bitte diese E-Mail.
-
-Mit freundlichen Gr&uuml;ssen
-----------------------------------------
-Diese E-Mail wurde automatisch erstellt!
+$MESSAGE['SIGNUP2_BODY_LOGIN_FORGOT'] = '
+Hallo {LOGIN_DISPLAY_NAME},
+
+Sie erhalten diese E-Mail, weil sie ein neues Passwort angefordert haben.
+
+Ihre neuen Logindaten f&uuml;r {LOGIN_WEBSITE_TITLE} lauten:
+
+Benutzername: {LOGIN_NAME}
+Passwort: {LOGIN_PASSWORD}
+
+Das bisherige Passwort wurde durch das neue Passwort oben ersetzt.
+
+Sollten Sie kein neues Kennwort angefordert haben, l&ouml;schen Sie bitte diese E-Mail.
+
+Mit freundlichen Gr&uuml;ssen
+----------------------------------------
+Diese E-Mail wurde automatisch erstellt!
 ';
-$MESSAGE['SIGNUP2_BODY_LOGIN_INFO'] = '
-Hallo {LOGIN_DISPLAY_NAME},
-
-Herzlich willkommen bei \'{LOGIN_WEBSITE_TITLE}\'
-
-Ihre Logindaten f&uuml;r \'{LOGIN_WEBSITE_TITLE}\' lauten:
-Benutzername: {LOGIN_NAME}
-Passwort: {LOGIN_PASSWORD}
-
-Vielen Dank f&uuml;r Ihre Registrierung
-
-Wenn Sie dieses E-Mail versehentlich erhalten haben, l&ouml;schen Sie bitte diese E-Mail.
-----------------------------------------
-Diese E-Mail wurde automatisch erstellt!
+$MESSAGE['SIGNUP2_BODY_LOGIN_INFO'] = '
+Hallo {LOGIN_DISPLAY_NAME},
+
+Herzlich willkommen bei \'{LOGIN_WEBSITE_TITLE}\'
+
+Ihre Logindaten f&uuml;r \'{LOGIN_WEBSITE_TITLE}\' lauten:
+Benutzername: {LOGIN_NAME}
+Passwort: {LOGIN_PASSWORD}
+
+Vielen Dank f&uuml;r Ihre Registrierung
+
+Wenn Sie dieses E-Mail versehentlich erhalten haben, l&ouml;schen Sie bitte diese E-Mail.
+----------------------------------------
+Diese E-Mail wurde automatisch erstellt!
 ';
 $MESSAGE['SIGNUP2_SUBJECT_LOGIN_INFO'] = 'Deine WB Logindaten ...';
 $MESSAGE['SIGNUP_NO_EMAIL'] = 'Bitte geben Sie Ihre E-Mail Adresse an';

Property changes on: branches/2.8.x/wb/languages/DE.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1,4 +1 ##
-Id
-Revision
-HeadURL
-Date
\ No newline at end of property
+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/languages/BG.php
===================================================================
--- branches/2.8.x/wb/languages/BG.php	(revision 1456)
+++ branches/2.8.x/wb/languages/BG.php	(revision 1457)

Property changes on: branches/2.8.x/wb/languages/BG.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1,4 +1 ##
-Id
-Revision
-HeadURL
-Date
\ No newline at end of property
+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/modules/wrapper/view.php
===================================================================
--- branches/2.8.x/wb/modules/wrapper/view.php	(revision 1456)
+++ branches/2.8.x/wb/modules/wrapper/view.php	(revision 1457)

Property changes on: branches/2.8.x/wb/modules/wrapper/view.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/wrapper/info.php
===================================================================
--- branches/2.8.x/wb/modules/wrapper/info.php	(revision 1456)
+++ branches/2.8.x/wb/modules/wrapper/info.php	(revision 1457)

Property changes on: branches/2.8.x/wb/modules/wrapper/info.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/wrapper/save.php
===================================================================
--- branches/2.8.x/wb/modules/wrapper/save.php	(revision 1456)
+++ branches/2.8.x/wb/modules/wrapper/save.php	(revision 1457)
@@ -18,15 +18,17 @@
 
 require('../../config.php');
 
+$admin_header = false;
+// Tells script to update when this page was last updated
+$update_when_modified = true;
 // Include WB admin wrapper script
-$update_when_modified = true; // Tells script to update when this page was last updated
 require(WB_PATH.'/modules/admin.php');
-
 if (!$admin->checkFTAN())
 {
+	$admin->print_header();
 	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id);
-	exit();
 }
+$admin->print_header();
 
 // Update the mod_wrapper table with the contents
 if(isset($_POST['url'])) {
@@ -36,7 +38,7 @@
 		$height = 400;
 	}
 	$query = "UPDATE ".TABLE_PREFIX."mod_wrapper SET url = '$url', height = '$height' WHERE section_id = '$section_id'";
-	$database->query($query);	
+	$database->query($query);
 }
 
 // Check if there is a database error, otherwise say successful

Property changes on: branches/2.8.x/wb/modules/wrapper/save.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/wrapper/modify.htt
===================================================================
--- branches/2.8.x/wb/modules/wrapper/modify.htt	(revision 1456)
+++ branches/2.8.x/wb/modules/wrapper/modify.htt	(revision 1457)

Property changes on: branches/2.8.x/wb/modules/wrapper/modify.htt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/wrapper/delete.php
===================================================================
--- branches/2.8.x/wb/modules/wrapper/delete.php	(revision 1456)
+++ branches/2.8.x/wb/modules/wrapper/delete.php	(revision 1457)

Property changes on: branches/2.8.x/wb/modules/wrapper/delete.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/wrapper/install.php
===================================================================
--- branches/2.8.x/wb/modules/wrapper/install.php	(revision 1456)
+++ branches/2.8.x/wb/modules/wrapper/install.php	(revision 1457)
@@ -1,33 +1,33 @@
-<?php
-/**
- *
- * @category        modules
- * @package         wrapper
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
- * @copyright       2009-2011, Website Baker Org. e.V.
- * @link			http://www.websitebaker2.org/
- * @license         http://www.gnu.org/licenses/gpl.html
- * @platform        WebsiteBaker 2.8.x
- * @requirements    PHP 5.2.2 and higher
- * @version      	$Id$
- * @filesource		$HeadURL$
- * @lastmodified    $Date$
- *
- */
-
-if(defined('WB_URL')) {
-	
-	// Create table
-	// $database->query("DROP TABLE IF EXISTS `".TABLE_PREFIX."mod_wrapper`");
-	$mod_wrapper = 'CREATE TABLE IF NOT EXISTS `'.TABLE_PREFIX.'mod_wrapper` ('
-		. ' `section_id` INT NOT NULL DEFAULT \'0\','
-		. ' `page_id` INT NOT NULL DEFAULT \'0\','
-		. ' `url` TEXT NOT NULL,'
-		. ' `height` INT NOT NULL DEFAULT \'0\','
-		. ' PRIMARY KEY ( `section_id` ) '
-		. ' )';
-	$database->query($mod_wrapper);
-}
-
+<?php
+/**
+ *
+ * @category        modules
+ * @package         wrapper
+ * @author          WebsiteBaker Project
+ * @copyright       2004-2009, Ryan Djurovich
+ * @copyright       2009-2011, Website Baker Org. e.V.
+ * @link			http://www.websitebaker2.org/
+ * @license         http://www.gnu.org/licenses/gpl.html
+ * @platform        WebsiteBaker 2.8.x
+ * @requirements    PHP 5.2.2 and higher
+ * @version      	$Id$
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
+ *
+ */
+
+if(defined('WB_URL')) {
+	
+	// Create table
+	// $database->query("DROP TABLE IF EXISTS `".TABLE_PREFIX."mod_wrapper`");
+	$mod_wrapper = 'CREATE TABLE IF NOT EXISTS `'.TABLE_PREFIX.'mod_wrapper` ('
+		. ' `section_id` INT NOT NULL DEFAULT \'0\','
+		. ' `page_id` INT NOT NULL DEFAULT \'0\','
+		. ' `url` TEXT NOT NULL,'
+		. ' `height` INT NOT NULL DEFAULT \'0\','
+		. ' PRIMARY KEY ( `section_id` ) '
+		. ' )';
+	$database->query($mod_wrapper);
+}
+
 ?>
\ No newline at end of file

Property changes on: branches/2.8.x/wb/modules/wrapper/install.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/wrapper/index.php
===================================================================
--- branches/2.8.x/wb/modules/wrapper/index.php	(revision 1456)
+++ branches/2.8.x/wb/modules/wrapper/index.php	(revision 1457)

Property changes on: branches/2.8.x/wb/modules/wrapper/index.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/wrapper/modify.php
===================================================================
--- branches/2.8.x/wb/modules/wrapper/modify.php	(revision 1456)
+++ branches/2.8.x/wb/modules/wrapper/modify.php	(revision 1457)
@@ -33,18 +33,18 @@
 
 // Insert vars
 $template->set_var(array(
-								'PAGE_ID' => $page_id,
-								'SECTION_ID' => $section_id,
-								'WB_URL' => WB_URL,
-								'URL' => $url,
-								'HEIGHT' => $height,
-								'TEXT_URL' => $TEXT['URL'],
-								'TEXT_HEIGHT' => $TEXT['HEIGHT'],
-								'TEXT_SAVE' => $TEXT['SAVE'],
-								'TEXT_CANCEL' => $TEXT['CANCEL'],
-								'FTAN' => $admin->getFTAN()
-								)
-						);
+					'PAGE_ID' => $page_id,
+					'SECTION_ID' => $section_id,
+					'WB_URL' => WB_URL,
+					'URL' => $url,
+					'HEIGHT' => $height,
+					'TEXT_URL' => $TEXT['URL'],
+					'TEXT_HEIGHT' => $TEXT['HEIGHT'],
+					'TEXT_SAVE' => $TEXT['SAVE'],
+					'TEXT_CANCEL' => $TEXT['CANCEL'],
+					'FTAN' => $admin->getFTAN()
+				)
+			);
 
 // Parse template object
 $template->parse('main', 'main_block', false);

Property changes on: branches/2.8.x/wb/modules/wrapper/modify.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/wrapper/add.php
===================================================================
--- branches/2.8.x/wb/modules/wrapper/add.php	(revision 1456)
+++ branches/2.8.x/wb/modules/wrapper/add.php	(revision 1457)

Property changes on: branches/2.8.x/wb/modules/wrapper/add.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/menu_link/save.php
===================================================================
--- branches/2.8.x/wb/modules/menu_link/save.php	(revision 1456)
+++ branches/2.8.x/wb/modules/menu_link/save.php	(revision 1457)
@@ -18,15 +18,17 @@
 
 require_once('../../config.php');
 
+$admin_header = false;
+// Tells script to update when this page was last updated
+$update_when_modified = true;
 // Include WB admin wrapper script
-$update_when_modified = true; // Tells script to update when this page was last updated
 require(WB_PATH.'/modules/admin.php');
-
 if (!$admin->checkFTAN())
 {
-	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']);
-	exit();
+	$admin->print_header();
+	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'] );
 }
+$admin->print_header();
 
 // Update id, anchor and target
 if(isset($_POST['menu_link'])) {
Index: branches/2.8.x/wb/modules/menu_link/modify.php
===================================================================
--- branches/2.8.x/wb/modules/menu_link/modify.php	(revision 1456)
+++ branches/2.8.x/wb/modules/menu_link/modify.php	(revision 1457)
@@ -1,230 +1,230 @@
-<?php
-/**
- *
- * @category        modules
- * @package         menu_link
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
- * @copyright       2009-2011, Website Baker Org. e.V.
- * @link			http://www.websitebaker2.org/
- * @license         http://www.gnu.org/licenses/gpl.html
- * @platform        WebsiteBaker 2.8.x
- * @requirements    PHP 5.2.2 and higher
- * @version         $Id$
- * @filesource		$HeadURL$
- * @lastmodified    $Date$
- *
-*/
-
-// Must include code to stop this file being accessed directly
-if(defined('WB_PATH') == false) { exit("Cannot access this file directly"); }
-
-// check if module language file exists for the language set by the user (e.g. DE, EN)
-if(!file_exists(WB_PATH .'/modules/menu_link/languages/'.LANGUAGE .'.php')) {
-	// no module language file exists for the language set by the user, include default module language file EN.php
-	require_once(WB_PATH .'/modules/menu_link/languages/EN.php');
-} else {
-	// a module language file exists for the language defined by the user, load it
-	require_once(WB_PATH .'/modules/menu_link/languages/'.LANGUAGE .'.php');
-}
-
-// get target page_id
-$table = TABLE_PREFIX.'mod_menu_link';
-$sql_result = $database->query("SELECT * FROM $table WHERE section_id = '$section_id'");
-$sql_row = $sql_result->fetchRow();
-$target_page_id = $sql_row['target_page_id'];
-$r_type = $sql_row['redirect_type'];
-$extern = $sql_row['extern'];
-$anchor = $sql_row['anchor'];
-$sel = ' selected="selected"';
-
-// Get list of all visible pages and build a page-tree
-
-// this function will fetch the page_tree, recursive
-if(!function_exists('menulink_make_tree')) {
-function menulink_make_tree($parent, $link_pid, $tree) {
-	global $database, $admin, $menulink_titles;
-	$table_p = TABLE_PREFIX."pages";
-	// get list of page-trails, recursive
-	if($query_page = $database->query("SELECT * FROM `$table_p` WHERE `parent`=$parent ORDER BY `position`")) {
-		while($page = $query_page->fetchRow()) {
-			if($admin->page_is_visible($page) ) {
-				$pids = explode(',', $page['page_trail']);
-				$entry = '';
-				foreach($pids as $pid)
-					$entry .= $menulink_titles[$pid].' / ';
-				$tree[$page['page_id']] = rtrim($entry, '/ ');
-				$tree = menulink_make_tree($page['page_id'], $link_pid, $tree);
-			}
-		}
-	}
-	return($tree);
-}
-}
-
-// get list of all page_ids and page_titles
-global $menulink_titles;
-$menulink_titles = array();
-$table_p = TABLE_PREFIX."pages";
-if($query_page = $database->query("SELECT `page_id`,`menu_title` FROM `$table_p`")) {
-	while($page = $query_page->fetchRow())
-		$menulink_titles[$page['page_id']] = $page['menu_title'];
-}
-// now get the tree
-$links = array();
-$links = menulink_make_tree(0, $page_id, $links);
-
-// Get list of targets (id=... or <a name ...>) from pages in $links
-$targets = array();
-$table_mw = TABLE_PREFIX."mod_wysiwyg";
-$table_s = TABLE_PREFIX."sections";
-foreach($links as $pid=>$l) {
-	if($query_section = $database->query("SELECT section_id, module FROM $table_s WHERE page_id = '$pid' ORDER BY position")) {
-		while($section = $query_section->fetchRow()) {
-			// get section-anchor
-			if(defined('SEC_ANCHOR') && SEC_ANCHOR!='') {
-				$targets[$pid][] = SEC_ANCHOR.$section['section_id'];
-			} else {
-				$targets[$pid] = array();
-			}
-			if($section['module'] == 'wysiwyg') {
-				if($query_page = $database->query("SELECT content FROM $table_mw WHERE section_id = '{$section['section_id']}' LIMIT 1")) {
-					$page = $query_page->fetchRow();
-					if(preg_match_all('/<(?:a[^>]+name|[^>]+id)\s*=\s*"([^"]+)"/i',$page['content'], $match)) {
-						foreach($match[1] AS $t) {
-							$targets[$pid][$t] = $t;
-						}
-					}
-				}
-			}
-		}
-	}
-}
-// get target-window for actual page
-$table = TABLE_PREFIX."pages";
-$query_page = $database->query("SELECT target FROM $table WHERE page_id = '$page_id'");
-$page = $query_page->fetchRow();
-$target = $page['target'];
-
-
-// script for target-select-box
-?>
-<script language="JavaScript" type="text/javascript">
-/*<![CDATA[*/
-	function populate() {
-		o=document.getElementById('menu_link');
-		d=document.getElementById('page_target');
-		e=document.getElementById('extern');
-		if(!d){return;}
-		var mitems=new Array();
-		mitems['0']=[' ','0'];
-		mitems['-1']=[' ','0'];
-		<?php
-		foreach($links AS $pid=>$link) {
-			$str="mitems['$pid']=[";
-			$str.="' ',";
-			$str.="'0',";
-			if(is_array($targets) && is_array($targets[$pid])) {
-				foreach($targets[$pid] AS $value) {
-					$str.="'#$value',";
-					$str.="'$value',";
-				}
-				$str=rtrim($str, ',');
-				$str.="];\n";
-			}
-			echo $str;
-		}
-		?>
-		d.options.length=0;
-		cur=mitems[o.options[o.selectedIndex].value];
-		if(!cur){return;}
-		d.options.length=cur.length/2;
-		j=0;
-		for(var i=0;i<cur.length;i=i+2)
-		{
-			d.options[j].text=cur[i];
-			d.options[j++].value=cur[i+1];
-		}
-
-		if(o.value=='-1') {
-			e.disabled = false;
-		} else {
-			e.disabled = true;
-		}
-	}
-
-/*]]>*/
-</script>
-<form name="menulink" action="<?php echo WB_URL ?>/modules/menu_link/save.php" method="post">
-<input type="hidden" name="page_id" value="<?php echo $page_id ?>" />
-<input type="hidden" name="section_id" value="<?php echo $section_id ?>" />
-<?php echo $admin->getFTAN(); ?>
-<table cellpadding="0" cellspacing="0" border="0" width="100%">
-<tr>
-	<td>
-		<?php echo $TEXT['LINK'].':' ?>
-	</td>
-	<td>
-		<select name="menu_link" id="menu_link" onchange="populate()" style="width:250px;" >
-			<option value="0"<?php echo $target_page_id=='0'?$sel:''?>><?php echo $TEXT['PLEASE_SELECT']; ?></option>
-			<option value="-1"<?php echo $target_page_id=='-1'?$sel:''?>><?php echo $MOD_MENU_LINK['EXTERNAL_LINK']; ?></option>
-			<?php foreach($links AS $pid=>$link) {
-				if ($pid == $page_id)  // Display current page with selection disabled
-					echo "<option value=\"$pid\" disabled=\"disabled\">$link *</option>\n";
-				else
-					echo "<option value=\"$pid\" ".($target_page_id==$pid?$sel:'').">$link</option>\n";
-			} ?>
-		</select>
-		&nbsp;
-		<input type="text" name="extern" id="extern" value="<?php echo $extern; ?>" style="width:250px;" <?php if($target_page_id!='-1') echo 'disabled="disabled"'; ?> />
-	</td>
-</tr>
-<tr>
-	<td>
-		<?php echo $TEXT['ANCHOR'].':' ?>
-	</td>
-	<td>
-		<select name="page_target" id="page_target" onfocus="populate()" style="width:250px;" >
-			<option value="<?php echo $anchor ?>" selected="selected"><?php echo $anchor=='0'?' ':'#'.$anchor ?></option>
-		</select>
-	</td>
-</tr>
-<tr>
-	<td>
-		<?php echo $TEXT['TARGET'].':' ?>
-	</td>
-	<td>
-		<select name="target" style="width:250px;" >
-			<option value="_blank"<?php if($target=='_blank') echo ' selected="selected"'; ?>><?php echo $TEXT['NEW_WINDOW'] ?></option>
-			<option value="_self"<?php if($target=='_self') echo ' selected="selected"'; ?>><?php echo $TEXT['SAME_WINDOW'] ?></option>
-			<option value="_top"<?php if($target=='_top') echo ' selected="selected"'; ?>><?php echo $TEXT['TOP_FRAME'] ?></option>
-		</select>
-	</td>
-</tr>
-<tr>
-	<td>
-		<?php echo $MOD_MENU_LINK['R_TYPE'].':' ?>
-	</td>
-	<td>
-		<select name="r_type" style="width:250px;" >
-			<option value="301"<?php if($r_type=='301') echo ' selected="selected"'; ?>>301</option>
-			<option value="302"<?php if($r_type=='302') echo ' selected="selected"'; ?>>302</option>
-		</select>
-	</td>
-</tr>
-</table>
-
-<br />
-
-<table cellpadding="0" cellspacing="0" border="0" width="100%">
-<tr>
-	<td align="left">
-		<input type="submit" value="<?php echo $TEXT['SAVE'] ?>" style="width: 100px; margin-top: 5px;" />
-	</td>
-	<td align="right">
-		<input type="button" value="<?php echo $TEXT['CANCEL'] ?>" onclick="javascript: window.location = 'index.php';" style="width: 100px; margin-top: 5px;" />
-	</td>
-</tr>
-</table>
-
-</form>
+<?php
+/**
+ *
+ * @category        modules
+ * @package         menu_link
+ * @author          WebsiteBaker Project
+ * @copyright       2004-2009, Ryan Djurovich
+ * @copyright       2009-2011, Website Baker Org. e.V.
+ * @link			http://www.websitebaker2.org/
+ * @license         http://www.gnu.org/licenses/gpl.html
+ * @platform        WebsiteBaker 2.8.x
+ * @requirements    PHP 5.2.2 and higher
+ * @version         $Id$
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
+ *
+*/
+
+// Must include code to stop this file being accessed directly
+if(defined('WB_PATH') == false) { exit("Cannot access this file directly"); }
+
+// check if module language file exists for the language set by the user (e.g. DE, EN)
+if(!file_exists(WB_PATH .'/modules/menu_link/languages/'.LANGUAGE .'.php')) {
+	// no module language file exists for the language set by the user, include default module language file EN.php
+	require_once(WB_PATH .'/modules/menu_link/languages/EN.php');
+} else {
+	// a module language file exists for the language defined by the user, load it
+	require_once(WB_PATH .'/modules/menu_link/languages/'.LANGUAGE .'.php');
+}
+
+// get target page_id
+$table = TABLE_PREFIX.'mod_menu_link';
+$sql_result = $database->query("SELECT * FROM $table WHERE section_id = '$section_id'");
+$sql_row = $sql_result->fetchRow();
+$target_page_id = $sql_row['target_page_id'];
+$r_type = $sql_row['redirect_type'];
+$extern = $sql_row['extern'];
+$anchor = $sql_row['anchor'];
+$sel = ' selected="selected"';
+
+// Get list of all visible pages and build a page-tree
+
+// this function will fetch the page_tree, recursive
+if(!function_exists('menulink_make_tree')) {
+function menulink_make_tree($parent, $link_pid, $tree) {
+	global $database, $admin, $menulink_titles;
+	$table_p = TABLE_PREFIX."pages";
+	// get list of page-trails, recursive
+	if($query_page = $database->query("SELECT * FROM `$table_p` WHERE `parent`=$parent ORDER BY `position`")) {
+		while($page = $query_page->fetchRow()) {
+			if($admin->page_is_visible($page) ) {
+				$pids = explode(',', $page['page_trail']);
+				$entry = '';
+				foreach($pids as $pid)
+					$entry .= $menulink_titles[$pid].' / ';
+				$tree[$page['page_id']] = rtrim($entry, '/ ');
+				$tree = menulink_make_tree($page['page_id'], $link_pid, $tree);
+			}
+		}
+	}
+	return($tree);
+}
+}
+
+// get list of all page_ids and page_titles
+global $menulink_titles;
+$menulink_titles = array();
+$table_p = TABLE_PREFIX."pages";
+if($query_page = $database->query("SELECT `page_id`,`menu_title` FROM `$table_p`")) {
+	while($page = $query_page->fetchRow())
+		$menulink_titles[$page['page_id']] = $page['menu_title'];
+}
+// now get the tree
+$links = array();
+$links = menulink_make_tree(0, $page_id, $links);
+
+// Get list of targets (id=... or <a name ...>) from pages in $links
+$targets = array();
+$table_mw = TABLE_PREFIX."mod_wysiwyg";
+$table_s = TABLE_PREFIX."sections";
+foreach($links as $pid=>$l) {
+	if($query_section = $database->query("SELECT section_id, module FROM $table_s WHERE page_id = '$pid' ORDER BY position")) {
+		while($section = $query_section->fetchRow()) {
+			// get section-anchor
+			if(defined('SEC_ANCHOR') && SEC_ANCHOR!='') {
+				$targets[$pid][] = SEC_ANCHOR.$section['section_id'];
+			} else {
+				$targets[$pid] = array();
+			}
+			if($section['module'] == 'wysiwyg') {
+				if($query_page = $database->query("SELECT content FROM $table_mw WHERE section_id = '{$section['section_id']}' LIMIT 1")) {
+					$page = $query_page->fetchRow();
+					if(preg_match_all('/<(?:a[^>]+name|[^>]+id)\s*=\s*"([^"]+)"/i',$page['content'], $match)) {
+						foreach($match[1] AS $t) {
+							$targets[$pid][$t] = $t;
+						}
+					}
+				}
+			}
+		}
+	}
+}
+// get target-window for actual page
+$table = TABLE_PREFIX."pages";
+$query_page = $database->query("SELECT target FROM $table WHERE page_id = '$page_id'");
+$page = $query_page->fetchRow();
+$target = $page['target'];
+
+
+// script for target-select-box
+?>
+<script language="JavaScript" type="text/javascript">
+/*<![CDATA[*/
+	function populate() {
+		o=document.getElementById('menu_link');
+		d=document.getElementById('page_target');
+		e=document.getElementById('extern');
+		if(!d){return;}
+		var mitems=new Array();
+		mitems['0']=[' ','0'];
+		mitems['-1']=[' ','0'];
+		<?php
+		foreach($links AS $pid=>$link) {
+			$str="mitems['$pid']=[";
+			$str.="' ',";
+			$str.="'0',";
+			if(is_array($targets) && is_array($targets[$pid])) {
+				foreach($targets[$pid] AS $value) {
+					$str.="'#$value',";
+					$str.="'$value',";
+				}
+				$str=rtrim($str, ',');
+				$str.="];\n";
+			}
+			echo $str;
+		}
+		?>
+		d.options.length=0;
+		cur=mitems[o.options[o.selectedIndex].value];
+		if(!cur){return;}
+		d.options.length=cur.length/2;
+		j=0;
+		for(var i=0;i<cur.length;i=i+2)
+		{
+			d.options[j].text=cur[i];
+			d.options[j++].value=cur[i+1];
+		}
+
+		if(o.value=='-1') {
+			e.disabled = false;
+		} else {
+			e.disabled = true;
+		}
+	}
+
+/*]]>*/
+</script>
+<form name="menulink" action="<?php echo WB_URL ?>/modules/menu_link/save.php" method="post">
+<input type="hidden" name="page_id" value="<?php echo $page_id ?>" />
+<input type="hidden" name="section_id" value="<?php echo $section_id ?>" />
+<?php echo $admin->getFTAN(); ?>
+<table cellpadding="0" cellspacing="0" border="0" width="100%">
+<tr>
+	<td>
+		<?php echo $TEXT['LINK'].':' ?>
+	</td>
+	<td>
+		<select name="menu_link" id="menu_link" onchange="populate()" style="width:250px;" >
+			<option value="0"<?php echo $target_page_id=='0'?$sel:''?>><?php echo $TEXT['PLEASE_SELECT']; ?></option>
+			<option value="-1"<?php echo $target_page_id=='-1'?$sel:''?>><?php echo $MOD_MENU_LINK['EXTERNAL_LINK']; ?></option>
+			<?php foreach($links AS $pid=>$link) {
+				if ($pid == $page_id)  // Display current page with selection disabled
+					echo "<option value=\"$pid\" disabled=\"disabled\">$link *</option>\n";
+				else
+					echo "<option value=\"$pid\" ".($target_page_id==$pid?$sel:'').">$link</option>\n";
+			} ?>
+		</select>
+		&nbsp;
+		<input type="text" name="extern" id="extern" value="<?php echo $extern; ?>" style="width:250px;" <?php if($target_page_id!='-1') echo 'disabled="disabled"'; ?> />
+	</td>
+</tr>
+<tr>
+	<td>
+		<?php echo $TEXT['ANCHOR'].':' ?>
+	</td>
+	<td>
+		<select name="page_target" id="page_target" onfocus="populate()" style="width:250px;" >
+			<option value="<?php echo $anchor ?>" selected="selected"><?php echo $anchor=='0'?' ':'#'.$anchor ?></option>
+		</select>
+	</td>
+</tr>
+<tr>
+	<td>
+		<?php echo $TEXT['TARGET'].':' ?>
+	</td>
+	<td>
+		<select name="target" style="width:250px;" >
+			<option value="_blank"<?php if($target=='_blank') echo ' selected="selected"'; ?>><?php echo $TEXT['NEW_WINDOW'] ?></option>
+			<option value="_self"<?php if($target=='_self') echo ' selected="selected"'; ?>><?php echo $TEXT['SAME_WINDOW'] ?></option>
+			<option value="_top"<?php if($target=='_top') echo ' selected="selected"'; ?>><?php echo $TEXT['TOP_FRAME'] ?></option>
+		</select>
+	</td>
+</tr>
+<tr>
+	<td>
+		<?php echo $MOD_MENU_LINK['R_TYPE'].':' ?>
+	</td>
+	<td>
+		<select name="r_type" style="width:250px;" >
+			<option value="301"<?php if($r_type=='301') echo ' selected="selected"'; ?>>301</option>
+			<option value="302"<?php if($r_type=='302') echo ' selected="selected"'; ?>>302</option>
+		</select>
+	</td>
+</tr>
+</table>
+
+<br />
+
+<table cellpadding="0" cellspacing="0" border="0" width="100%">
+<tr>
+	<td align="left">
+		<input type="submit" value="<?php echo $TEXT['SAVE'] ?>" style="width: 100px; margin-top: 5px;" />
+	</td>
+	<td align="right">
+		<input type="button" value="<?php echo $TEXT['CANCEL'] ?>" onclick="javascript: window.location = 'index.php';" style="width: 100px; margin-top: 5px;" />
+	</td>
+</tr>
+</table>
+
+</form>
Index: branches/2.8.x/wb/modules/menu_link/add.php
===================================================================
--- branches/2.8.x/wb/modules/menu_link/add.php	(revision 1456)
+++ branches/2.8.x/wb/modules/menu_link/add.php	(revision 1457)
@@ -24,5 +24,3 @@
 
 $table = TABLE_PREFIX ."mod_menu_link";
 $database->query("INSERT INTO `$table` (`page_id`, `section_id`, `target_page_id`, `anchor`, `extern`) VALUES ('$page_id', '$section_id', '0', '0', '')");
-
-?>
Index: branches/2.8.x/wb/modules/edit_module_files.php
===================================================================
--- branches/2.8.x/wb/modules/edit_module_files.php	(revision 1456)
+++ branches/2.8.x/wb/modules/edit_module_files.php	(revision 1457)
@@ -1,120 +1,126 @@
-<?php
-/**
- *
- * @category        backend
- * @package         modules
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
- * @copyright       2009-2011, Website Baker Org. e.V.
- * @link			http://www.websitebaker2.org/
- * @license         http://www.gnu.org/licenses/gpl.html
- * @platform        WebsiteBaker 2.8.x
- * @requirements    PHP 5.2.2 and higher
- * @version         $Id$
- * @filesource		$HeadURL$
- * @lastmodified    $Date$
- *
- */
-
-// include required libraries
-// include configuration file
-	require('../config.php');
-// include edit area wrapper script
-	require_once(WB_PATH.'/include/editarea/wb_wrapper_edit_area.php');
-// include the admin wrapper script
-	require(WB_PATH.'/modules/admin.php');
-// include functions to edit the optional module CSS files (frontend.css, backend.css)
-	require_once(WB_PATH.'/framework/module.functions.php');
-
-	$page_id = (isset($_REQUEST['page_id']) ? intval($_REQUEST['page_id']) : 0  );
-	$section_id = (isset($_POST['section_id']) ? intval($_POST['section_id']) : 0  );
-	$_action = (isset($_POST['action']) ? strtolower($_POST['action']) : '');
-	$_action = ($_action != 'save' ? 'edit' : 'save');
-	$mod_dir = (isset($_POST['mod_dir']) ? $_POST['mod_dir'] : '');
-	$_edit_file = (isset($_POST['edit_file']) ? $_POST['edit_file'] : '');
-//check if given mod_dir + edit_file is valid path/file
-	$_realpath = realpath(WB_PATH.'/modules/'.$mod_dir.'/'.$_edit_file);
-	if($_realpath){
-	// realpath is a valid path, now test if it's inside WB_PATH
-		$_realpath = str_replace('\\','/', $_realpath);
-		$_fileValid = (strpos($_realpath, (str_replace('\\','/', WB_PATH))) !== false);
-	}
-// check if all needed args are valid 
-	if(!$page_id || !$section_id || !$_realpath || !$_fileValid) {
-		die('Invalid arguments passed - script stopped.');
-	}
-
-	// echo registerEditArea('code_area', 'css');
-	echo (function_exists('registerEditArea')) ? registerEditArea('code_area', 'css') : 'none';
-// set default text output if varibles are not defined in the global WB language files
-	if(!isset($TEXT['HEADING_CSS_FILE'])) { $TEXT['HEADING_CSS_FILE'] = 'Actual module file: '; }
-	if(!isset($TEXT['TXT_EDIT_CSS_FILE'])) { $TEXT['TXT_EDIT_CSS_FILE'] = 'Edit the CSS definitions in the textarea below.'; }
-
-// check if action is: save or edit
-	if($_action == 'save') {
-	// SAVE THE UPDATED CONTENTS TO THE CSS FILE
-		$css_content = '';
-		if (isset($_POST['css_data']) && strlen($_POST['css_data']) > 0) {
-			$css_content = stripslashes($_POST['css_data']);
-		}
-		$modFileName = WB_PATH .'/modules/' .$mod_dir .'/' .$_edit_file;
-		if(($fileHandle = fopen($modFileName, 'wb'))) {
-			if(fwrite($fileHandle, $css_content)) {
-				fclose($fileHandle);
-				$admin->print_success($TEXT['SUCCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id);
-				exit;
-			}
-			fclose($fileHandle);
-		}
-		$admin->print_error($TEXT['ERROR'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id);
-		exit;
-	} else {
-	// MODIFY CONTENTS OF THE CSS FILE VIA TEXT AREA
-	// check which module file to edit (frontend.css, backend.css or '')
-		$css_file = (in_array($_edit_file, array('frontend.css', 'backend.css'))) ? $_edit_file : '';
-
-	// display output
-		if($css_file == '')	{
-		// no valid module file to edit; display error message and backlink to modify.php
-			echo "<h2>Nothing to edit</h2>";
-			echo "<p>No valid module file exists for this module.</p>";
-			$output  = "<a href=\"#\" onclick=\"javascript: window.location = '";
-			$output .= ADMIN_URL ."/pages/modify.php?page_id=" .$page_id ."'\">back</a>";
-			echo $output;
-		} else {
-		// store content of the module file in variable
-		$css_content = @file_get_contents(WB_PATH .'/modules/' .$mod_dir .'/' .$css_file);
-		// write out heading
-		echo '<h2>' .$TEXT['HEADING_CSS_FILE'] .'"' .$css_file .'"</h2>';
-		// include button to switch between frontend.css and backend.css (only shown if both files exists)
-		toggle_css_file($mod_dir, $css_file);
-		echo '<p>'.$TEXT['TXT_EDIT_CSS_FILE'].'</p>';
-
-		// output content of module file to textareas
-	  ?><form name="edit_module_file" action="<?php echo $_SERVER['SCRIPT_NAME'];?>" method="post" style="margin: 0;">
-	  	<input type="hidden" name="page_id" value="<?php echo $page_id; ?>" />
-	  	<input type="hidden" name="section_id" value="<?php echo $section_id; ?>" />
-	  	<input type="hidden" name="mod_dir" value="<?php echo $mod_dir; ?>" />
-		<input type="hidden" name="edit_file" value="<?php echo $css_file; ?>" />
-	  	<input type="hidden" name="action" value="save" />
-		<textarea id="code_area" name="css_data" cols="100" rows="25" wrap="VIRTUAL" style="margin:2px;width:100%;">
-		<?php echo htmlspecialchars($css_content); ?>
-		</textarea>
-  			<table cellpadding="0" cellspacing="0" border="0" width="100%">
-  			<tr>
-    			<td class="left">
- 				<input name="save" type="submit" value="<?php echo $TEXT['SAVE'];?>" style="width: 100px; margin-top: 5px;" />
-    			</td>
-  				<td class="right">
-      			<input type="button" value="<?php echo $TEXT['CANCEL']; ?>"
-						onclick="javascript: window.location = '<?php echo ADMIN_URL;?>/pages/modify.php?page_id=<?php echo $page_id; ?>';"
-						style="width: 100px; margin-top: 5px;" />
-  				</td>
-  			</tr>
-  			</table>
-		</form>
-<?php 
-	}
-}
-// Print admin footer
-$admin->print_footer();
+<?php
+/**
+ *
+ * @category        backend
+ * @package         modules
+ * @author          WebsiteBaker Project
+ * @copyright       2004-2009, Ryan Djurovich
+ * @copyright       2009-2011, Website Baker Org. e.V.
+ * @link			http://www.websitebaker2.org/
+ * @license         http://www.gnu.org/licenses/gpl.html
+ * @platform        WebsiteBaker 2.8.x
+ * @requirements    PHP 5.2.2 and higher
+ * @version         $Id$
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
+ *
+ */
+
+// include required libraries
+// include configuration file
+	require('../config.php');
+// include edit area wrapper script
+	require_once(WB_PATH.'/include/editarea/wb_wrapper_edit_area.php');
+// include functions to edit the optional module CSS files (frontend.css, backend.css)
+	require_once(WB_PATH.'/framework/module.functions.php');
+// $admin_header = false;
+// Tells script to update when this page was last updated
+	$update_when_modified = false;
+// show the info banner
+	$print_info_banner = true;
+// Include WB admin wrapper script
+	require(WB_PATH.'/modules/admin.php');
+/*
+	$page_id = (isset($_REQUEST['page_id']) ? intval($_REQUEST['page_id']) : 0  );
+	$section_id = (isset($_POST['section_id']) ? intval($_POST['section_id']) : 0  );
+*/
+	$_action = (isset($_POST['action']) ? strtolower($_POST['action']) : '');
+	$_action = ($_action != 'save' ? 'edit' : 'save');
+	$mod_dir = (isset($_POST['mod_dir']) ? $_POST['mod_dir'] : '');
+	$_edit_file = (isset($_POST['edit_file']) ? $_POST['edit_file'] : '');
+//check if given mod_dir + edit_file is valid path/file
+	$_realpath = realpath(WB_PATH.'/modules/'.$mod_dir.'/'.$_edit_file);
+	if($_realpath){
+	// realpath is a valid path, now test if it's inside WB_PATH
+		$_realpath = str_replace('\\','/', $_realpath);
+		$_fileValid = (strpos($_realpath, (str_replace('\\','/', WB_PATH))) !== false);
+	}
+// check if all needed args are valid 
+	if(!$page_id || !$section_id || !$_realpath || !$_fileValid) {
+		die('Invalid arguments passed - script stopped.');
+	}
+
+	// echo registerEditArea('code_area', 'css');
+	echo (function_exists('registerEditArea')) ? registerEditArea('code_area', 'css') : 'none';
+// set default text output if varibles are not defined in the global WB language files
+	if(!isset($TEXT['HEADING_CSS_FILE'])) { $TEXT['HEADING_CSS_FILE'] = 'Actual module file: '; }
+	if(!isset($TEXT['TXT_EDIT_CSS_FILE'])) { $TEXT['TXT_EDIT_CSS_FILE'] = 'Edit the CSS definitions in the textarea below.'; }
+
+// check if action is: save or edit
+	if($_action == 'save') {
+	// SAVE THE UPDATED CONTENTS TO THE CSS FILE
+		$css_content = '';
+		if (isset($_POST['css_data']) && strlen($_POST['css_data']) > 0) {
+			$css_content = stripslashes($_POST['css_data']);
+		}
+		$modFileName = WB_PATH .'/modules/' .$mod_dir .'/' .$_edit_file;
+		if(($fileHandle = fopen($modFileName, 'wb'))) {
+			if(fwrite($fileHandle, $css_content)) {
+				fclose($fileHandle);
+				$admin->print_success($TEXT['SUCCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id);
+				exit;
+			}
+			fclose($fileHandle);
+		}
+		$admin->print_error($TEXT['ERROR'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id);
+		exit;
+	} else {
+	// MODIFY CONTENTS OF THE CSS FILE VIA TEXT AREA
+	// check which module file to edit (frontend.css, backend.css or '')
+		$css_file = (in_array($_edit_file, array('frontend.css', 'backend.css'))) ? $_edit_file : '';
+
+	// display output
+		if($css_file == '')	{
+		// no valid module file to edit; display error message and backlink to modify.php
+			echo "<h2>Nothing to edit</h2>";
+			echo "<p>No valid module file exists for this module.</p>";
+			$output  = "<a href=\"#\" onclick=\"javascript: window.location = '";
+			$output .= ADMIN_URL ."/pages/modify.php?page_id=" .$page_id ."'\">back</a>";
+			echo $output;
+		} else {
+		// store content of the module file in variable
+		$css_content = @file_get_contents(WB_PATH .'/modules/' .$mod_dir .'/' .$css_file);
+		// write out heading
+		echo '<h2>' .$TEXT['HEADING_CSS_FILE'] .'"' .$css_file .'"</h2>';
+		// include button to switch between frontend.css and backend.css (only shown if both files exists)
+		toggle_css_file($mod_dir, $css_file);
+		echo '<p>'.$TEXT['TXT_EDIT_CSS_FILE'].'</p>';
+
+		// output content of module file to textareas
+	  ?><form name="edit_module_file" action="<?php echo $_SERVER['SCRIPT_NAME'];?>" method="post" style="margin: 0;">
+	  	<input type="hidden" name="page_id" value="<?php echo $page_id; ?>" />
+	  	<input type="hidden" name="section_id" value="<?php echo $section_id; ?>" />
+	  	<input type="hidden" name="mod_dir" value="<?php echo $mod_dir; ?>" />
+		<input type="hidden" name="edit_file" value="<?php echo $css_file; ?>" />
+	  	<input type="hidden" name="action" value="save" />
+		<textarea id="code_area" name="css_data" cols="100" rows="25" wrap="VIRTUAL" style="margin:2px;width:100%;">
+		<?php echo htmlspecialchars($css_content); ?>
+		</textarea>
+  			<table cellpadding="0" cellspacing="0" border="0" width="100%">
+  			<tr>
+    			<td class="left">
+ 				<input name="save" type="submit" value="<?php echo $TEXT['SAVE'];?>" style="width: 100px; margin-top: 5px;" />
+    			</td>
+  				<td class="right">
+      			<input type="button" value="<?php echo $TEXT['CANCEL']; ?>"
+						onclick="javascript: window.location = '<?php echo ADMIN_URL;?>/pages/modify.php?page_id=<?php echo $page_id; ?>';"
+						style="width: 100px; margin-top: 5px;" />
+  				</td>
+  			</tr>
+  			</table>
+		</form>
+<?php 
+	}
+}
+// Print admin footer
+$admin->print_footer();
Index: branches/2.8.x/wb/modules/wysiwyg/view.php
===================================================================
--- branches/2.8.x/wb/modules/wysiwyg/view.php	(revision 1456)
+++ branches/2.8.x/wb/modules/wysiwyg/view.php	(revision 1457)

Property changes on: branches/2.8.x/wb/modules/wysiwyg/view.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/wysiwyg/info.php
===================================================================
--- branches/2.8.x/wb/modules/wysiwyg/info.php	(revision 1456)
+++ branches/2.8.x/wb/modules/wysiwyg/info.php	(revision 1457)
@@ -1,28 +1,26 @@
-<?php
-/**
- *
- * @category        modules
- * @package         wysiwyg
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
- * @copyright       2009-2011, Website Baker Org. e.V.
- * @link			http://www.websitebaker2.org/
- * @license         http://www.gnu.org/licenses/gpl.html
- * @platform        WebsiteBaker 2.8.x
- * @requirements    PHP 5.2.2 and higher
- * @version         $Id$
- * @filesource		$HeadURL$
- * @lastmodified    $Date$
- *
- */
-
-$module_directory = 'wysiwyg';
-$module_name = 'WYSIWYG';
-$module_function = 'page';
-$module_version = '2.8';
-$module_platform = '2.7 | 2.8.x';
-$module_author = 'Ryan Djurovich';
-$module_license = 'GNU General Public License';
-$module_description = 'This module allows you to edit the contents of a page using a graphical editor';
-
-?>
\ No newline at end of file
+<?php
+/**
+ *
+ * @category        modules
+ * @package         wysiwyg
+ * @author          WebsiteBaker Project
+ * @copyright       2004-2009, Ryan Djurovich
+ * @copyright       2009-2011, Website Baker Org. e.V.
+ * @link			http://www.websitebaker2.org/
+ * @license         http://www.gnu.org/licenses/gpl.html
+ * @platform        WebsiteBaker 2.8.x
+ * @requirements    PHP 5.2.2 and higher
+ * @version         $Id$
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
+ *
+ */
+
+$module_directory = 'wysiwyg';
+$module_name = 'WYSIWYG';
+$module_function = 'page';
+$module_version = '2.8.2';
+$module_platform = '2.8.2';
+$module_author = 'Ryan Djurovich';
+$module_license = 'GNU General Public License';
+$module_description = 'This module allows you to edit the contents of a page using a graphical editor';

Property changes on: branches/2.8.x/wb/modules/wysiwyg/info.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/wysiwyg/save.php
===================================================================
--- branches/2.8.x/wb/modules/wysiwyg/save.php	(revision 1456)
+++ branches/2.8.x/wb/modules/wysiwyg/save.php	(revision 1457)
@@ -1,62 +1,65 @@
-<?php
-/**
- *
- * @category        backend
- * @package         wysiwyg
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
- * @copyright       2009-2011, Website Baker Org. e.V.
- * @link			http://www.websitebaker2.org/
- * @license         http://www.gnu.org/licenses/gpl.html
- * @platform        WebsiteBaker 2.8.x
- * @requirements    PHP 5.2.2 and higher
- * @version         $Id$
- * @filesource		$HeadURL$
- * @lastmodified    $Date$
- *
-*/
-
-require('../../config.php');
-
-// Include WB admin wrapper script
-$update_when_modified = true; // Tells script to update when this page was last updated
-require(WB_PATH.'/modules/admin.php');
-
-if (!$admin->checkFTAN())
-{
-	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id);
-	exit();
-}
-
-// Include the WB functions file
-require_once(WB_PATH.'/framework/functions.php');
-
-// Update the mod_wysiwygs table with the contents
-if(isset($_POST['content'.$section_id])) {
-	$content = $admin->add_slashes($_POST['content'.$section_id]);
-	// searching in $text will be much easier this way
-	$text = umlauts_to_entities(strip_tags($content), strtoupper(DEFAULT_CHARSET), 0);
-	$query = "UPDATE ".TABLE_PREFIX."mod_wysiwyg SET content = '$content', text = '$text' WHERE section_id = '$section_id'";
-	$database->query($query);	
-}
-
-if(defined('EDIT_ONE_SECTION') and EDIT_ONE_SECTION)
-{
-    $edit_page = ADMIN_URL.'/pages/modify.php?page_id='.$page_id.'&wysiwyg='.$section_id;
-}
-else
-{
-    $edit_page = ADMIN_URL.'/pages/modify.php?page_id='.$page_id.'#wb'.$section_id;
-}
-
-// Check if there is a database error, otherwise say successful
-if($database->is_error()) {
-	$admin->print_error($database->get_error(), $js_back);
-} else {
-	$admin->print_success($MESSAGE['PAGES']['SAVED'], $edit_page );
-}
-
-// Print admin footer
-$admin->print_footer();
-
+<?php
+/**
+ *
+ * @category        backend
+ * @package         wysiwyg
+ * @author          WebsiteBaker Project
+ * @copyright       2004-2009, Ryan Djurovich
+ * @copyright       2009-2011, Website Baker Org. e.V.
+ * @link			http://www.websitebaker2.org/
+ * @license         http://www.gnu.org/licenses/gpl.html
+ * @platform        WebsiteBaker 2.8.x
+ * @requirements    PHP 5.2.2 and higher
+ * @version         $Id$
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
+ *
+*/
+
+require('../../config.php');
+
+// suppress to print the header, so no new FTAN will be set
+$admin_header = false;
+// Tells script to update when this page was last updated
+$update_when_modified = true;
+// Include WB admin wrapper script
+require(WB_PATH.'/modules/admin.php');
+
+if (!$admin->checkFTAN())
+{
+	$admin->print_header();
+	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id);
+}
+// After check print the header
+$admin->print_header();
+
+// Include the WB functions file
+require_once(WB_PATH.'/framework/functions.php');
+
+// Update the mod_wysiwygs table with the contents
+if(isset($_POST['content'.$section_id])) {
+	$content = $admin->add_slashes($_POST['content'.$section_id]);
+	// searching in $text will be much easier this way
+	$text = umlauts_to_entities(strip_tags($content), strtoupper(DEFAULT_CHARSET), 0);
+	$query = "UPDATE ".TABLE_PREFIX."mod_wysiwyg SET content = '$content', text = '$text' WHERE section_id = '$section_id'";
+	$database->query($query);	
+}
+
+if(defined('EDIT_ONE_SECTION') and EDIT_ONE_SECTION)
+{
+    $edit_page = ADMIN_URL.'/pages/modify.php?page_id='.$page_id.'&wysiwyg='.$section_id;
+} else {
+    $edit_page = ADMIN_URL.'/pages/modify.php?page_id='.$page_id.'#wb'.$section_id;
+}
+
+// Check if there is a database error, otherwise say successful
+if($database->is_error()) {
+	$admin->print_error($database->get_error(), $js_back);
+} else {
+	$admin->print_success($MESSAGE['PAGES']['SAVED'], $edit_page );
+}
+
+// Print admin footer
+$admin->print_footer();
+
 ?>
\ No newline at end of file

Property changes on: branches/2.8.x/wb/modules/wysiwyg/save.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/wysiwyg/delete.php
===================================================================
--- branches/2.8.x/wb/modules/wysiwyg/delete.php	(revision 1456)
+++ branches/2.8.x/wb/modules/wysiwyg/delete.php	(revision 1457)

Property changes on: branches/2.8.x/wb/modules/wysiwyg/delete.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/wysiwyg/search.php
===================================================================
--- branches/2.8.x/wb/modules/wysiwyg/search.php	(revision 1456)
+++ branches/2.8.x/wb/modules/wysiwyg/search.php	(revision 1457)

Property changes on: branches/2.8.x/wb/modules/wysiwyg/search.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/wysiwyg/install.php
===================================================================
--- branches/2.8.x/wb/modules/wysiwyg/install.php	(revision 1456)
+++ branches/2.8.x/wb/modules/wysiwyg/install.php	(revision 1457)
@@ -1,66 +1,66 @@
-<?php
-/**
- *
- * @category        modules
- * @package         wysiwyg
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
- * @copyright       2009-2011, Website Baker Org. e.V.
- * @link			http://www.websitebaker2.org/
- * @license         http://www.gnu.org/licenses/gpl.html
- * @platform        WebsiteBaker 2.8.x
- * @requirements    PHP 5.2.2 and higher
- * @version      	$Id$
- * @filesource		$HeadURL$
- * @lastmodified    $Date$
- *
- */
-
-if(defined('WB_URL'))
-{
-	
-	// Create table
-	//$database->query("DROP TABLE IF EXISTS `".TABLE_PREFIX."mod_wysiwyg`");
-	$mod_wysiwyg = 'CREATE TABLE IF NOT EXISTS `'.TABLE_PREFIX.'mod_wysiwyg` ( '
-		. ' `section_id` INT NOT NULL DEFAULT \'0\','
-		. ' `page_id` INT NOT NULL DEFAULT \'0\','
-		. ' `content` LONGTEXT NOT NULL ,'
-		. ' `text` LONGTEXT NOT NULL ,'
-		. ' PRIMARY KEY ( `section_id` ) '
-		. ' )';
-	$database->query($mod_wysiwyg);
-	
-
-    $mod_search = "SELECT * FROM ".TABLE_PREFIX."search  WHERE value = 'wysiwyg'";
-    $insert_search = $database->query($mod_search);
-    if( $insert_search->numRows() == 0 )
-    {
-    	// Insert info into the search table
-    	// Module query info
-    	$field_info = array();
-    	$field_info['page_id'] = 'page_id';
-    	$field_info['title'] = 'page_title';
-    	$field_info['link'] = 'link';
-    	$field_info['description'] = 'description';
-    	$field_info['modified_when'] = 'modified_when';
-    	$field_info['modified_by'] = 'modified_by';
-    	$field_info = serialize($field_info);
-    	$database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('module', 'wysiwyg', '$field_info')");
-    	// Query start
-    	$query_start_code = "SELECT [TP]pages.page_id, [TP]pages.page_title,	[TP]pages.link, [TP]pages.description, [TP]pages.modified_when, [TP]pages.modified_by	FROM [TP]mod_wysiwyg, [TP]pages WHERE ";
-    	$database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('query_start', '$query_start_code', 'wysiwyg')");
-    	// Query body
-    	$query_body_code = " [TP]pages.page_id = [TP]mod_wysiwyg.page_id AND [TP]mod_wysiwyg.text [O] \'[W][STRING][W]\' AND [TP]pages.searching = \'1\'";
-    	$database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('query_body', '$query_body_code', 'wysiwyg')");
-    	// Query end
-    	$query_end_code = "";
-    	$database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('query_end', '$query_end_code', 'wysiwyg')");
-
-    	// Insert blank row (there needs to be at least on row for the search to work)
-    	$database->query("INSERT INTO ".TABLE_PREFIX."mod_wysiwyg (page_id,section_id) VALUES ('0','0')");
-
-
-    }
-}
-
+<?php
+/**
+ *
+ * @category        modules
+ * @package         wysiwyg
+ * @author          WebsiteBaker Project
+ * @copyright       2004-2009, Ryan Djurovich
+ * @copyright       2009-2011, Website Baker Org. e.V.
+ * @link			http://www.websitebaker2.org/
+ * @license         http://www.gnu.org/licenses/gpl.html
+ * @platform        WebsiteBaker 2.8.x
+ * @requirements    PHP 5.2.2 and higher
+ * @version      	$Id$
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
+ *
+ */
+
+if(defined('WB_URL'))
+{
+	
+	// Create table
+	//$database->query("DROP TABLE IF EXISTS `".TABLE_PREFIX."mod_wysiwyg`");
+	$mod_wysiwyg = 'CREATE TABLE IF NOT EXISTS `'.TABLE_PREFIX.'mod_wysiwyg` ( '
+		. ' `section_id` INT NOT NULL DEFAULT \'0\','
+		. ' `page_id` INT NOT NULL DEFAULT \'0\','
+		. ' `content` LONGTEXT NOT NULL ,'
+		. ' `text` LONGTEXT NOT NULL ,'
+		. ' PRIMARY KEY ( `section_id` ) '
+		. ' )';
+	$database->query($mod_wysiwyg);
+	
+
+    $mod_search = "SELECT * FROM ".TABLE_PREFIX."search  WHERE value = 'wysiwyg'";
+    $insert_search = $database->query($mod_search);
+    if( $insert_search->numRows() == 0 )
+    {
+    	// Insert info into the search table
+    	// Module query info
+    	$field_info = array();
+    	$field_info['page_id'] = 'page_id';
+    	$field_info['title'] = 'page_title';
+    	$field_info['link'] = 'link';
+    	$field_info['description'] = 'description';
+    	$field_info['modified_when'] = 'modified_when';
+    	$field_info['modified_by'] = 'modified_by';
+    	$field_info = serialize($field_info);
+    	$database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('module', 'wysiwyg', '$field_info')");
+    	// Query start
+    	$query_start_code = "SELECT [TP]pages.page_id, [TP]pages.page_title,	[TP]pages.link, [TP]pages.description, [TP]pages.modified_when, [TP]pages.modified_by	FROM [TP]mod_wysiwyg, [TP]pages WHERE ";
+    	$database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('query_start', '$query_start_code', 'wysiwyg')");
+    	// Query body
+    	$query_body_code = " [TP]pages.page_id = [TP]mod_wysiwyg.page_id AND [TP]mod_wysiwyg.text [O] \'[W][STRING][W]\' AND [TP]pages.searching = \'1\'";
+    	$database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('query_body', '$query_body_code', 'wysiwyg')");
+    	// Query end
+    	$query_end_code = "";
+    	$database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('query_end', '$query_end_code', 'wysiwyg')");
+
+    	// Insert blank row (there needs to be at least on row for the search to work)
+    	$database->query("INSERT INTO ".TABLE_PREFIX."mod_wysiwyg (page_id,section_id) VALUES ('0','0')");
+
+
+    }
+}
+
 ?>
\ No newline at end of file

Property changes on: branches/2.8.x/wb/modules/wysiwyg/install.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/wysiwyg/index.php
===================================================================
--- branches/2.8.x/wb/modules/wysiwyg/index.php	(revision 1456)
+++ branches/2.8.x/wb/modules/wysiwyg/index.php	(revision 1457)

Property changes on: branches/2.8.x/wb/modules/wysiwyg/index.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/wysiwyg/modify.php
===================================================================
--- branches/2.8.x/wb/modules/wysiwyg/modify.php	(revision 1456)
+++ branches/2.8.x/wb/modules/wysiwyg/modify.php	(revision 1457)

Property changes on: branches/2.8.x/wb/modules/wysiwyg/modify.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/wysiwyg/add.php
===================================================================
--- branches/2.8.x/wb/modules/wysiwyg/add.php	(revision 1456)
+++ branches/2.8.x/wb/modules/wysiwyg/add.php	(revision 1457)

Property changes on: branches/2.8.x/wb/modules/wysiwyg/add.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/captcha_control/uninstall.php
===================================================================
--- branches/2.8.x/wb/modules/captcha_control/uninstall.php	(revision 1456)
+++ branches/2.8.x/wb/modules/captcha_control/uninstall.php	(revision 1457)

Property changes on: branches/2.8.x/wb/modules/captcha_control/uninstall.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1 +1 ##
-Id
\ No newline at end of property
+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/modules/captcha_control/info.php
===================================================================
--- branches/2.8.x/wb/modules/captcha_control/info.php	(revision 1456)
+++ branches/2.8.x/wb/modules/captcha_control/info.php	(revision 1457)

Property changes on: branches/2.8.x/wb/modules/captcha_control/info.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1 +1 ##
-Id
\ No newline at end of property
+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/modules/captcha_control/tool.php
===================================================================
--- branches/2.8.x/wb/modules/captcha_control/tool.php	(revision 1456)
+++ branches/2.8.x/wb/modules/captcha_control/tool.php	(revision 1457)
@@ -42,8 +42,8 @@
 if(isset($_POST['save_settings'])) {
 	if (!$admin->checkFTAN())
 	{
+		$admin->print_header();
 		$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], $js_back );
-		exit();
 	}
 	
 	// get configuration settings
@@ -67,6 +67,7 @@
 	}
 	
 	// check if there is a database error, otherwise say successful
+	$admin->print_header();
 	if($database->is_error()) {
 		$admin->print_error($database->get_error(), $js_back);
 	} else {

Property changes on: branches/2.8.x/wb/modules/captcha_control/tool.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1 +1 ##
-Id
\ No newline at end of property
+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/modules/captcha_control/install.php
===================================================================
--- branches/2.8.x/wb/modules/captcha_control/install.php	(revision 1456)
+++ branches/2.8.x/wb/modules/captcha_control/install.php	(revision 1457)

Property changes on: branches/2.8.x/wb/modules/captcha_control/install.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1 +1 ##
-Id
\ No newline at end of property
+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/modules/captcha_control/index.php
===================================================================
--- branches/2.8.x/wb/modules/captcha_control/index.php	(revision 1456)
+++ branches/2.8.x/wb/modules/captcha_control/index.php	(revision 1457)

Property changes on: branches/2.8.x/wb/modules/captcha_control/index.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1 +1 ##
-Id
\ No newline at end of property
+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/modules/form/modify_field.php
===================================================================
--- branches/2.8.x/wb/modules/form/modify_field.php	(revision 1456)
+++ branches/2.8.x/wb/modules/form/modify_field.php	(revision 1457)
@@ -11,21 +11,23 @@
  * @platform        WebsiteBaker 2.8.x
  * @requirements    PHP 5.2.2 and higher
  * @version         $Id$
- * @filesource		$HeadURL:  $
- * @lastmodified    $Date:  $
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
  * @description     
  */
 
 require('../../config.php');
 
+$print_info_banner = true;
+// Tells script to update when this page was last updated
+$update_when_modified = false;
 // Include WB admin wrapper script
 require(WB_PATH.'/modules/admin.php');
-
+/* */
 // Get id
 $field_id = $admin->checkIDKEY('field_id', false, 'GET');
 if (!$field_id) {
  $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']." MF: $field_id :-(", ADMIN_URL.'/pages/modify.php?page_id='.$page_id);
- exit();
 }
 
 // Get header and footer
@@ -36,6 +38,8 @@
 	$type = 'none';
 }
 
+// set new token
+$field_id = $admin->getIDKEY($form['field_id']);
 // Set raw html <'s and >'s to be replaced by friendly html code
 $raw = array('<', '>');
 $friendly = array('&lt;', '&gt;');
@@ -42,7 +46,6 @@
 ?>
 
 <form name="modify" action="<?php echo WB_URL; ?>/modules/form/save_field.php" method="post" style="margin: 0;">
-
 <input type="hidden" name="section_id" value="<?php echo $section_id; ?>" />
 <input type="hidden" name="page_id" value="<?php echo $page_id; ?>" />
 <input type="hidden" name="field_id" value="<?php echo $field_id; ?>" />
@@ -213,5 +216,3 @@
 
 // Print admin footer
 $admin->print_footer();
-
-?>
\ No newline at end of file

Property changes on: branches/2.8.x/wb/modules/form/modify_field.php
___________________________________________________________________
Modified: svn:keywords
## -1 +1,4 ##
-Id
\ No newline at end of property
+Id
+Revision
+HeadURL
+Date
\ No newline at end of property
Index: branches/2.8.x/wb/modules/form/add_field.php
===================================================================
--- branches/2.8.x/wb/modules/form/add_field.php	(revision 1456)
+++ branches/2.8.x/wb/modules/form/add_field.php	(revision 1457)
@@ -11,8 +11,8 @@
  * @platform        WebsiteBaker 2.8.x
  * @requirements    PHP 5.2.2 and higher
  * @version         $Id$
- * @filesource		$HeadURL:  $
- * @lastmodified    $Date:  $
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
  * @description     
  */
 

Property changes on: branches/2.8.x/wb/modules/form/add_field.php
___________________________________________________________________
Modified: svn:keywords
## -1 +1,4 ##
-Id
\ No newline at end of property
+Id
+Revision
+HeadURL
+Date
\ No newline at end of property
Index: branches/2.8.x/wb/modules/form/info.php
===================================================================
--- branches/2.8.x/wb/modules/form/info.php	(revision 1456)
+++ branches/2.8.x/wb/modules/form/info.php	(revision 1457)
@@ -11,8 +11,8 @@
  * @platform        WebsiteBaker 2.8.x
  * @requirements    PHP 5.2.2 and higher
  * @version         $Id$
- * @filesource		$HeadURL:  $
- * @lastmodified    $Date:  $
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
  * @description     
  */
 

Property changes on: branches/2.8.x/wb/modules/form/info.php
___________________________________________________________________
Modified: svn:keywords
## -1 +1,4 ##
-Id
\ No newline at end of property
+Id
+Revision
+HeadURL
+Date
\ No newline at end of property
Index: branches/2.8.x/wb/modules/form/move_down.php
===================================================================
--- branches/2.8.x/wb/modules/form/move_down.php	(revision 1456)
+++ branches/2.8.x/wb/modules/form/move_down.php	(revision 1457)
@@ -11,8 +11,8 @@
  * @platform        WebsiteBaker 2.8.x
  * @requirements    PHP 5.2.2 and higher
  * @version         $Id$
- * @filesource		$HeadURL:  $
- * @lastmodified    $Date:  $
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
  * @description     
  */
 
@@ -25,7 +25,6 @@
 $field_id = $admin->checkIDKEY('field_id', false, 'GET');
 if (!$field_id) {
  $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id);
- exit();
 }
 
 // Include the ordering class
@@ -41,5 +40,3 @@
 
 // Print admin footer
 $admin->print_footer();
-
-?>
\ No newline at end of file

Property changes on: branches/2.8.x/wb/modules/form/move_down.php
___________________________________________________________________
Modified: svn:keywords
## -1 +1,4 ##
-Id
\ No newline at end of property
+Id
+Revision
+HeadURL
+Date
\ No newline at end of property
Index: branches/2.8.x/wb/modules/form/save_field.php
===================================================================
--- branches/2.8.x/wb/modules/form/save_field.php	(revision 1456)
+++ branches/2.8.x/wb/modules/form/save_field.php	(revision 1457)
@@ -11,22 +11,45 @@
  * @platform        WebsiteBaker 2.8.x
  * @requirements    PHP 5.2.2 and higher
  * @version         $Id$
- * @filesource		$HeadURL:  $
- * @lastmodified    $Date:  $
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
  * @description     
  */
 
 require('../../config.php');
+
+// suppress to print the header, so no new FTAN will be set
+$admin_header = false;
+// Tells script to update when this page was last updated
+$update_when_modified = true;
+// Include WB admin wrapper script
 require(WB_PATH.'/modules/admin.php');
+/* */
 
+// check FTAN
+if (!$admin->checkFTAN())
+{
+	$admin->print_header();
+	$admin->print_error('::'.$MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id);
+}
+// After check print the header
+$admin->print_header();
+
+
+/*  */
 // Get id
+$field_id = intval($admin->checkIDKEY('field_id', false ));
+if (!$field_id) {
+ $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'].'::', ADMIN_URL.'/pages/modify.php?page_id='.$page_id);
+}
+/*
+// Get id
 if(!isset($_POST['field_id']) OR !is_numeric($_POST['field_id'])) {
 	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id);
-	exit(0);
 } else {
-	$field_id = $_POST['field_id'];
+	$field_id = (int)$_POST['field_id'];
 }
-
+/*
 // Include WB admin wrapper script
 $update_when_modified = true; // Tells script to update when this page was last updated
 
@@ -35,7 +58,7 @@
 	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id);
 	exit();
 }
-
+*/
 // Validate all fields
 if($admin->get_post('title') == '' OR $admin->get_post('type') == '') {
 	$admin->print_error($MESSAGE['GENERIC']['FILL_IN_ALL'], WB_URL.'/modules/form/modify_field.php?page_id='.$page_id.'&section_id='.$section_id.'&field_id='.$admin->getIDKEY($field_id));
@@ -94,5 +117,3 @@
 
 // Print admin footer
 $admin->print_footer();
-
-?>
\ No newline at end of file

Property changes on: branches/2.8.x/wb/modules/form/save_field.php
___________________________________________________________________
Modified: svn:keywords
## -1 +1,4 ##
-Id
\ No newline at end of property
+Id
+Revision
+HeadURL
+Date
\ No newline at end of property
Index: branches/2.8.x/wb/modules/form/delete.php
===================================================================
--- branches/2.8.x/wb/modules/form/delete.php	(revision 1456)
+++ branches/2.8.x/wb/modules/form/delete.php	(revision 1457)
@@ -29,5 +29,3 @@
 // Delete page from mod_wysiwyg
 $database->query("DELETE FROM ".TABLE_PREFIX."mod_form_fields WHERE page_id = '$page_id' AND section_id='$section_id'");
 $database->query("DELETE FROM ".TABLE_PREFIX."mod_form_settings WHERE page_id = '$page_id' AND section_id='$section_id'");
-
-?>
\ No newline at end of file

Property changes on: branches/2.8.x/wb/modules/form/delete.php
___________________________________________________________________
Modified: svn:keywords
## -1 +1,4 ##
-Id
\ No newline at end of property
+Id
+Revision
+HeadURL
+Date
\ No newline at end of property
Index: branches/2.8.x/wb/modules/form/search.php
===================================================================
--- branches/2.8.x/wb/modules/form/search.php	(revision 1456)
+++ branches/2.8.x/wb/modules/form/search.php	(revision 1457)
@@ -11,8 +11,8 @@
  * @platform        WebsiteBaker 2.8.x
  * @requirements    PHP 5.2.2 and higher
  * @version         $Id$
- * @filesource		$HeadURL:  $
- * @lastmodified    $Date:  $
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
  * @description     
  */
 // Must include code to stop this file being access directly

Property changes on: branches/2.8.x/wb/modules/form/search.php
___________________________________________________________________
Modified: svn:keywords
## -1 +1,4 ##
-Id
\ No newline at end of property
+Id
+Revision
+HeadURL
+Date
\ No newline at end of property
Index: branches/2.8.x/wb/modules/form/delete_field.php
===================================================================
--- branches/2.8.x/wb/modules/form/delete_field.php	(revision 1456)
+++ branches/2.8.x/wb/modules/form/delete_field.php	(revision 1457)
@@ -11,8 +11,8 @@
  * @platform        WebsiteBaker 2.8.x
  * @requirements    PHP 5.2.2 and higher
  * @version         $Id$
- * @filesource		$HeadURL:  $
- * @lastmodified    $Date:  $
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
  * @description     
  */
 
@@ -26,7 +26,6 @@
 $field_id = $admin->checkIDKEY('field_id', false, 'GET');
 if (!$field_id) {
  $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id);
- exit();
 }
 
 // Delete row
@@ -46,5 +45,3 @@
 
 // Print admin footer
 $admin->print_footer();
-
-?>
\ No newline at end of file

Property changes on: branches/2.8.x/wb/modules/form/delete_field.php
___________________________________________________________________
Modified: svn:keywords
## -1 +1,4 ##
-Id
\ No newline at end of property
+Id
+Revision
+HeadURL
+Date
\ No newline at end of property
Index: branches/2.8.x/wb/modules/form/index.php
===================================================================
--- branches/2.8.x/wb/modules/form/index.php	(revision 1456)
+++ branches/2.8.x/wb/modules/form/index.php	(revision 1457)
@@ -11,8 +11,8 @@
  * @platform        WebsiteBaker 2.8.x
  * @requirements    PHP 5.2.2 and higher
  * @version         $Id$
- * @filesource		$HeadURL:  $
- * @lastmodified    $Date:  $
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
  * @description     
  */
 

Property changes on: branches/2.8.x/wb/modules/form/index.php
___________________________________________________________________
Modified: svn:keywords
## -1 +1,4 ##
-Id
\ No newline at end of property
+Id
+Revision
+HeadURL
+Date
\ No newline at end of property
Index: branches/2.8.x/wb/modules/form/modify_settings.php
===================================================================
--- branches/2.8.x/wb/modules/form/modify_settings.php	(revision 1456)
+++ branches/2.8.x/wb/modules/form/modify_settings.php	(revision 1457)
@@ -11,13 +11,16 @@
  * @platform        WebsiteBaker 2.8.x
  * @requirements    PHP 5.2.2 and higher
  * @version         $Id$
- * @filesource		$HeadURL:  $
- * @lastmodified    $Date:  $
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
  * @description     
  */
 
 require('../../config.php');
 
+$print_info_banner = true;
+// Tells script to update when this page was last updated
+$update_when_modified = false;
 // Include WB admin wrapper script
 require(WB_PATH.'/modules/admin.php');
 
@@ -24,14 +27,9 @@
 // include core functions of WB 2.7 to edit the optional module CSS files (frontend.css, backend.css)
 @include_once(WB_PATH .'/framework/module.functions.php');
 
-// check if module language file exists for the language set by the user (e.g. DE, EN)
-if(!file_exists(WB_PATH .'/modules/form/languages/'.LANGUAGE .'.php')) {
-	// no module language file exists for the language set by the user, include default module language file EN.php
-	require_once(WB_PATH .'/modules/form/languages/EN.php');
-} else {
-	// a module language file exists for the language defined by the user, load it
-	require_once(WB_PATH .'/modules/form/languages/'.LANGUAGE .'.php');
-}
+// load module language file
+$lang = (dirname(__FILE__)) . '/languages/' . LANGUAGE . '.php';
+require_once(!file_exists($lang) ? (dirname(__FILE__)) . '/languages/EN.php' : $lang );
 
 // Get header and footer
 $query_content = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_form_settings WHERE section_id = '$section_id'");
@@ -40,7 +38,7 @@
 // Set raw html <'s and >'s to be replace by friendly html code
 $raw = array('<', '>');
 $friendly = array('&lt;', '&gt;');
-
+/*
 // check if backend.css file needs to be included into the <body></body> of modify.php
 if(!method_exists($admin, 'register_backend_modfiles') && file_exists(WB_PATH ."/modules/form/backend.css")) {
 	echo '<style type="text/css">';
@@ -47,7 +45,7 @@
 	include(WB_PATH .'/modules/form/backend.css');
 	echo "\n</style>\n";
 }
-
+*/
 ?>
 <h2><?php echo $MOD_FORM['SETTINGS']; ?></h2>
 <?php
@@ -247,5 +245,3 @@
 
 // Print admin footer
 $admin->print_footer();
-
-?>
\ No newline at end of file

Property changes on: branches/2.8.x/wb/modules/form/modify_settings.php
___________________________________________________________________
Modified: svn:keywords
## -1 +1,4 ##
-Id
\ No newline at end of property
+Id
+Revision
+HeadURL
+Date
\ No newline at end of property
Index: branches/2.8.x/wb/modules/form/uninstall.php
===================================================================
--- branches/2.8.x/wb/modules/form/uninstall.php	(revision 1456)
+++ branches/2.8.x/wb/modules/form/uninstall.php	(revision 1457)
@@ -11,8 +11,8 @@
  * @platform        WebsiteBaker 2.8.x
  * @requirements    PHP 5.2.2 and higher
  * @version         $Id$
- * @filesource		$HeadURL:  $
- * @lastmodified    $Date:  $
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
  * @description     
  */
 

Property changes on: branches/2.8.x/wb/modules/form/uninstall.php
___________________________________________________________________
Modified: svn:keywords
## -1 +1,4 ##
-Id
\ No newline at end of property
+Id
+Revision
+HeadURL
+Date
\ No newline at end of property
Index: branches/2.8.x/wb/modules/form/view.php
===================================================================
--- branches/2.8.x/wb/modules/form/view.php	(revision 1456)
+++ branches/2.8.x/wb/modules/form/view.php	(revision 1457)
@@ -1,484 +1,482 @@
-<?php
-/**
- *
- * @category        module
- * @package         Form
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
- * @copyright       2009-2011, Website Baker Org. e.V.
- * @link			http://www.websitebaker2.org/
- * @license         http://www.gnu.org/licenses/gpl.html
- * @platform        WebsiteBaker 2.8.x
- * @requirements    PHP 5.2.2 and higher
- * @version         $Id$
- * @filesource		$HeadURL:  $
- * @lastmodified    $Date:  $
- * @description     
- */
-
-// Must include code to stop this file being access directly
-if(defined('WB_PATH') == false) { exit("Cannot access this file directly"); }
-
-// check if frontend.css file needs to be included into the <body></body> of view.php
-if((!function_exists('register_frontend_modfiles') || !defined('MOD_FRONTEND_CSS_REGISTERED')) &&
-	file_exists(WB_PATH .'/modules/form/frontend.css')) {
-	echo '<style type="text/css">';
-	include(WB_PATH .'/modules/form/frontend.css');
-	echo "\n</style>\n";
-} 
-
-require_once(WB_PATH.'/include/captcha/captcha.php');
-
-// obtain the settings of the output filter module
-if(file_exists(WB_PATH.'/modules/output_filter/filter-routines.php')) {
-	include_once(WB_PATH.'/modules/output_filter/filter-routines.php');
-	$filter_settings = get_output_filter_settings();
-} else {
-	// no output filter used, define default settings
-	$filter_settings['email_filter'] = 0;
-}
-
-// Function for generating an optionsfor a select field
-if (!function_exists('make_option')) {
-function make_option(&$n, $k, $values) {
-	// start option group if it exists
-	if (substr($n,0,2) == '[=') {
-	 	$n = '<optgroup label="'.substr($n,2,strlen($n)).'">';
-	} elseif ($n == ']') {
-		$n = '</optgroup>';
-	} else {
-		if(in_array($n, $values)) {
-			$n = '<option selected="selected" value="'.$n.'">'.$n.'</option>';
-		} else {
-			$n = '<option value="'.$n.'">'.$n.'</option>';
-		}
-	}
-}
-}
-// Function for generating a checkbox
-if (!function_exists('make_checkbox')) {
-function make_checkbox(&$n, $idx, $params) {
-	$field_id = $params[0][0];
-	$seperator = $params[0][1];
-	$label_id = 'wb_'.preg_replace('/[^a-z0-1]/i', '_', $n);
-	if(in_array($n, $params[1])) {
-		$n = '<input class="field_checkbox" type="checkbox" id="'.$label_id.'" name="field'.$field_id.'['.$idx.']" value="'.$n.'" checked="checked" />'.'<label for="'.$label_id.'" class="checkbox_label">'.$n.'</lable>'.$seperator;
-	} else {
-		$n = '<input class="field_checkbox" type="checkbox" id="'.$label_id.'" name="field'.$field_id.'['.$idx.']" value="'.$n.'" />'.'<label for="'.$label_id.'" class="checkbox_label">'.$n.'</label>'.$seperator;
-	}	
-}
-}
-// Function for generating a radio button
-if (!function_exists('make_radio')) {
-function make_radio(&$n, $idx, $params) {
-	$field_id = $params[0];
-	$group = $params[1];
-	$seperator = $params[2];
-	$label_id = 'wb_'.preg_replace('/[^a-z0-1]/i', '_', $n);
-	if($n == $params[3]) { 
-		$n = '<input class="field_radio" type="radio" id="'.$label_id.'" name="field'.$field_id.'" value="'.$n.'" checked="checked" />'.'<label for="'.$label_id.'" class="radio_label">'.$n.'</label>'.$seperator;
-	} else {
-		$n = '<input class="field_radio" type="radio" id="'.$label_id.'" name="field'.$field_id.'" value="'.$n.'" />'.'<label for="'.$label_id.'" class="radio_label">'.$n.'</label>'.$seperator;
-	}
-}
-}
-
-if (!function_exists("new_submission_id") ) {
-	function new_submission_id() {
-		$submission_id = '';
-		$salt = "abchefghjkmnpqrstuvwxyz0123456789";
-		srand((double)microtime()*1000000);
-		$i = 0;
-		while ($i <= 7) {
-			$num = rand() % 33;
-			$tmp = substr($salt, $num, 1);
-			$submission_id = $submission_id . $tmp;
-			$i++;
-		}
-		return $submission_id;
-	}
-}
-
-// Work-out if the form has been submitted or not
-if($_POST == array()) {
-
-// Set new submission ID in session
-$_SESSION['form_submission_id'] = new_submission_id();
-
-// Get settings
-$query_settings = $database->query("SELECT header,field_loop,footer,use_captcha FROM ".TABLE_PREFIX."mod_form_settings WHERE section_id = '$section_id'");
-if($query_settings->numRows() > 0) {
-	$fetch_settings = $query_settings->fetchRow();
-	$header = str_replace('{WB_URL}',WB_URL,$fetch_settings['header']);
-	$field_loop = $fetch_settings['field_loop'];
-	$footer = str_replace('{WB_URL}',WB_URL,$fetch_settings['footer']);
-	$use_captcha = $fetch_settings['use_captcha'];
-	$form_name = 'form';
-	$use_xhtml_strict = false;
-} else {
-	$header = '';
-	$field_loop = '';
-	$footer = '';
-	$form_name = 'form';
-	$use_xhtml_strict = false;
-}
-
-?>
-<form <?php echo ( ( (strlen($form_name) > 0) AND (false == $use_xhtml_strict) ) ? "name=\"".$form_name."\"" : ""); ?> action="<?php echo htmlspecialchars(strip_tags($_SERVER['SCRIPT_NAME'])); ?>#wb_<?PHP echo $section_id;?>" method="post">
-<div>
-<input type="hidden" name="submission_id" value="<?php echo $_SESSION['form_submission_id']; ?>" />
-<?php echo $admin->getFTAN(); ?>
-</div>
-<?php
-if(ENABLED_ASP) { // first add some honeypot-fields
-?>
-<div>
-<input type="hidden" name="submitted_when" value="<?php $t=time(); echo $t; $_SESSION['submitted_when']=$t; ?>" />
-</div>
-<p class="nixhier">
-email address:
-<label for="email">Leave this field email-address blank:</label>
-<input id="email" name="email" size="56" value="" /><br />
-Homepage:
-<label for="homepage">Leave this field homepage blank:</label>
-<input id="homepage" name="homepage" size="55" value="" /><br />
-URL:
-<label for="url">Leave this field url blank:</label>
-<input id="url" name="url" size="61" value="" /><br />
-Comment:
-<label for="comment">Leave this field comment blank:</label>
-<textarea id="comment" name="comment" cols="50" rows="10"></textarea><br />
-</p>
-
-<?php }
-
-// Print header
-echo $header;
-
-// Get list of fields
-$query_fields = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_form_fields WHERE section_id = '$section_id' ORDER BY position ASC");
-
-if($query_fields->numRows() > 0) {
-	while($field = $query_fields->fetchRow()) {
-		// Set field values
-		$field_id = $field['field_id'];
-		$value = $field['value'];
-		// Print field_loop after replacing vars with values
-		$vars = array('{TITLE}', '{REQUIRED}');
-		if (($field['type'] == "radio") || ($field['type'] == "checkbox")) {
-			$field_title = $field['title'];
-		} else {
-			$field_title = '<label for="field'.$field_id.'">'.$field['title'].'</label>';
-		}
-		$values = array($field_title);
-		if ($field['required'] == 1) {
-			$values[] = '<span class="required">*</span>';
-		} else {
-			$values[] = '';
-		}
-		if($field['type'] == 'textfield') {
-			$vars[] = '{FIELD}';
-			$max_lenght_para = (intval($field['extra']) ? ' maxlenght="'.intval($field['extra']).'"' : '');
-			$values[] = '<input type="text" name="field'.$field_id.'" id="field'.$field_id.'"'.$max_lenght_para.' value="'.(isset($_SESSION['field'.$field_id])?$_SESSION['field'.$field_id]:$value).'" class="textfield" />';
-		} elseif($field['type'] == 'textarea') {
-			$vars[] = '{FIELD}';
-			$values[] = '<textarea name="field'.$field_id.'" id="field'.$field_id.'" class="textarea" cols="25" rows="5">'.(isset($_SESSION['field'.$field_id])?$_SESSION['field'.$field_id]:$value).'</textarea>';
-		} elseif($field['type'] == 'select') {
-			$vars[] = '{FIELD}';
-			$options = explode(',', $value);
-			array_walk($options, 'make_option', (isset($_SESSION['field'.$field_id])?$_SESSION['field'.$field_id]:array()));
-			$field['extra'] = explode(',',$field['extra']);
-			$values[] = '<select name="field'.$field_id.'[]" id="field'.$field_id.'" size="'.$field['extra'][0].'" '.$field['extra'][1].' class="select">'.implode($options).'</select>';		
-		} elseif($field['type'] == 'heading') {
-			$vars[] = '{FIELD}';
-			$str = '<input type="hidden" name="field'.$field_id.'" id="field'.$field_id.'" value="===['.$field['title'].']===" />';
-			$values[] = ( true == $use_xhtml_strict) ? "<div>".$str."</div>" : $str;
-			$tmp_field_loop = $field_loop;		// temporarily modify the field loop template
-			$field_loop = $field['extra'];
-		} elseif($field['type'] == 'checkbox') {
-			$vars[] = '{FIELD}';
-			$options = explode(',', $value);
-			array_walk($options, 'make_checkbox', array(array($field_id,$field['extra']),(isset($_SESSION['field'.$field_id])?$_SESSION['field'.$field_id]:array())));
-			$options[count($options)-1]=substr($options[count($options)-1],0,strlen($options[count($options)-1])-strlen($field['extra']));
-			$values[] = implode($options);
-		} elseif($field['type'] == 'radio') {
-			$vars[] = '{FIELD}';
-			$options = explode(',', $value);
-			array_walk($options, 'make_radio', array($field_id,$field['title'],$field['extra'], (isset($_SESSION['field'.$field_id])?$_SESSION['field'.$field_id]:'')));
-			$options[count($options)-1]=substr($options[count($options)-1],0,strlen($options[count($options)-1])-strlen($field['extra']));
-			$values[] = implode($options);
-		} elseif($field['type'] == 'email') {
-			$vars[] = '{FIELD}';
-			$max_lenght_para = (intval($field['extra']) ? ' maxlenght="'.intval($field['extra']).'"' : '');
-			$values[] = '<input type="text" name="field'.$field_id.'" id="field'.$field_id.'" value="'.(isset($_SESSION['field'.$field_id])?$_SESSION['field'.$field_id]:'').'"'.$max_lenght_para.' class="email" />';
-		}
-		if(isset($_SESSION['field'.$field_id])) unset($_SESSION['field'.$field_id]);
-		if($field['type'] != '') {
-			echo str_replace($vars, $values, $field_loop);
-		}
-		if (isset($tmp_field_loop)) $field_loop = $tmp_field_loop;
-	}
-}
-
-// Captcha
-if($use_captcha) { ?>
-	<tr>
-	<td class="field_title"><?php echo $TEXT['VERIFICATION']; ?>:</td>
-	<td><?php call_captcha(); ?></td>
-	</tr>
-	<?php
-}
-
-// Print footer
-echo $footer;
-
-/**
-	NOTE: comment out the line ob_end_flush() if you indicate problems (e.g. when using ob_start in the index.php of your template)
-	With ob_end_flush(): output filter will be disabled for this page (and all sections embedded on this page)
-	Without ob_end_flush(): emails are rewritten (e.g. name@domain.com --> name(at)domain(dot)com) if output filter is enabled
-	All replacements made by the Output-Filter module will be reverted before the email is send out
-*/
-if($filter_settings['email_filter'] && !($filter_settings['at_replacement']=='@' && $filter_settings['dot_replacement']=='.')) {
-  /* 	ob_end_flush(); */
-}
-
-// Add form end code
-?>
-</form>
-<?php
-
-} else {
-
-	// Check that submission ID matches
-	if(isset($_SESSION['form_submission_id']) AND isset($_POST['submission_id']) AND $_SESSION['form_submission_id'] == $_POST['submission_id']) {
-		
-		// Set new submission ID in session
-		$_SESSION['form_submission_id'] = new_submission_id();
-		
-		if(ENABLED_ASP && ( // form faked? Check the honeypot-fields.
-			(!isset($_POST['submitted_when']) OR !isset($_SESSION['submitted_when'])) OR 
-			($_POST['submitted_when'] != $_SESSION['submitted_when']) OR
-			(!isset($_POST['email']) OR $_POST['email']) OR
-			(!isset($_POST['homepage']) OR $_POST['homepage']) OR
-			(!isset($_POST['comment']) OR $_POST['comment']) OR
-			(!isset($_POST['url']) OR $_POST['url'])
-		)) {
-			exit(header("Location: ".WB_URL.PAGES_DIRECTORY.""));
-		}
-
-		if (!$admin->checkFTAN())
-		{
-			$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']); 
-			exit();
-		}
-
-		// Submit form data
-		// First start message settings
-		$query_settings = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_form_settings WHERE section_id = '$section_id'");
-		if($query_settings->numRows() > 0) {
-			$fetch_settings = $query_settings->fetchRow();
-			$email_to = $fetch_settings['email_to'];
-			$email_from = $fetch_settings['email_from'];
-			if(substr($email_from, 0, 5) == 'field') {
-				// Set the email from field to what the user entered in the specified field
-				$email_from = htmlspecialchars($wb->add_slashes($_POST[$email_from]));
-			}
-			$email_fromname = $fetch_settings['email_fromname'];
-			$email_subject = $fetch_settings['email_subject'];
-			$success_page = $fetch_settings['success_page'];
-			$success_email_to = $fetch_settings['success_email_to'];
-			if(substr($success_email_to, 0, 5) == 'field') {
-				// Set the success_email to field to what the user entered in the specified field
-				$success_email_to = htmlspecialchars($wb->add_slashes($_POST[$success_email_to]));
-			}
-			$success_email_from = $fetch_settings['success_email_from'];
-			$success_email_fromname = $fetch_settings['success_email_fromname'];
-			$success_email_text = $fetch_settings['success_email_text'];
-			$success_email_subject = $fetch_settings['success_email_subject'];		
-			$max_submissions = $fetch_settings['max_submissions'];
-			$stored_submissions = $fetch_settings['stored_submissions'];
-			$use_captcha = $fetch_settings['use_captcha'];
-		} else {
-			exit($TEXT['UNDER_CONSTRUCTION']);
-		}
-		$email_body = '';
-		
-		// Create blank "required" array
-		$required = array();
-		
-		// Captcha
-		if($use_captcha) {
-			if(isset($_POST['captcha']) AND $_POST['captcha'] != ''){
-				// Check for a mismatch
-				if(!isset($_POST['captcha']) OR !isset($_SESSION['captcha']) OR $_POST['captcha'] != $_SESSION['captcha']) {
-					$captcha_error = $MESSAGE['MOD_FORM']['INCORRECT_CAPTCHA'];
-				}
-			} else {
-				$captcha_error = $MESSAGE['MOD_FORM']['INCORRECT_CAPTCHA'];
-			}
-		}
-		if(isset($_SESSION['captcha'])) { unset($_SESSION['captcha']); }
-
-		// Loop through fields and add to message body
-		// Get list of fields
-		$query_fields = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_form_fields WHERE section_id = '$section_id' ORDER BY position ASC");
-		if($query_fields->numRows() > 0) {
-			while($field = $query_fields->fetchRow()) {
-				// Add to message body
-				if($field['type'] != '') {
-					if(!empty($_POST['field'.$field['field_id']])) {
-						// do not allow droplets in user input!
-						if (is_array($_POST['field'.$field['field_id']])) {
-							$_SESSION['field'.$field['field_id']] = str_replace(array("[[", "]]"), array("&#91;&#91;", "&#93;&#93;"), $_POST['field'.$field['field_id']]);
-						} else {
-							$_SESSION['field'.$field['field_id']] = str_replace(array("[[", "]]"), array("&#91;&#91;", "&#93;&#93;"), htmlspecialchars($_POST['field'.$field['field_id']]));
-						}
-						// if the output filter is active, we need to revert (dot) to . and (at) to @ (using current filter settings)
-						// otherwise the entered mail will not be accepted and the recipient would see (dot), (at) etc.
-						if ($filter_settings['email_filter']) {
-							$field_value = $_POST['field'.$field['field_id']];
-							$field_value = str_replace($filter_settings['at_replacement'], '@', $field_value);
-							$field_value = str_replace($filter_settings['dot_replacement'], '.', $field_value);
-							$_POST['field'.$field['field_id']] = $field_value;
-						}
-						if($field['type'] == 'email' AND $admin->validate_email($_POST['field'.$field['field_id']]) == false) {
-							$email_error = $MESSAGE['USERS']['INVALID_EMAIL'];
-						}
-						if($field['type'] == 'heading') {
-							$email_body .= $_POST['field'.$field['field_id']]."\n\n";
-						} elseif (!is_array($_POST['field'.$field['field_id']])) {
-							$email_body .= $field['title'].': '.$_POST['field'.$field['field_id']]."\n\n";
-						} else {
-							$email_body .= $field['title'].": \n";
-							foreach ($_POST['field'.$field['field_id']] as $k=>$v) {
-								$email_body .= $v."\n";
-							}
-							$email_body .= "\n";
-						}
-					} elseif($field['required'] == 1) {
-						$required[] = $field['title'];
-					}
-				}
-			}
-		}
-	
-		// Check if the user forgot to enter values into all the required fields
-		if($required != array()) {
-			if(!isset($MESSAGE['MOD_FORM']['REQUIRED_FIELDS'])) {
-				echo 'You must enter details for the following fields';
-			} else {
-				echo $MESSAGE['MOD_FORM']['REQUIRED_FIELDS'];
-			}
-			echo ':<br /><ul>';
-			foreach($required AS $field_title) {
-				echo '<li>'.$field_title;
-			}
-			if(isset($email_error)) {
-				echo '<li>'.$email_error.'</li>';
-			}
-			if(isset($captcha_error)) {
-				echo '<li>'.$captcha_error.'</li>';
-			}
-			echo '</ul><a href="'.htmlspecialchars(strip_tags($_SERVER['SCRIPT_NAME'])).'">'.$TEXT['BACK'].'</a>';
-		} else {
-			if(isset($email_error)) {
-				echo '<br /><ul>';
-				echo '<li>'.$email_error.'</li>';
-				echo '</ul><a href="'.htmlspecialchars(strip_tags($_SERVER['SCRIPT_NAME'])).'">'.$TEXT['BACK'].'</a>';
-			} elseif(isset($captcha_error)) {
-				echo '<br /><ul>';
-				echo '<li>'.$captcha_error.'</li>';
-				echo '</ul><a href="'.htmlspecialchars(strip_tags($_SERVER['SCRIPT_NAME'])).'">'.$TEXT['BACK'].'</a>';
-			} else {
-				// Check how many times form has been submitted in last hour
-				$last_hour = time()-3600;
-				$query_submissions = $database->query("SELECT submission_id FROM ".TABLE_PREFIX."mod_form_submissions WHERE submitted_when >= '$last_hour'");
-				if($query_submissions->numRows() > $max_submissions) {
-					// Too many submissions so far this hour
-					echo $MESSAGE['MOD_FORM']['EXCESS_SUBMISSIONS'];
-					$success = false;
-				} else {
-					/**	
-					 *	Adding the IP to the body and try to send the email
-					 */
-					$email_body .= "\n\nIP: ".$_SERVER['REMOTE_ADDR'];
-					
-					if($email_to != '') {
-						if($email_from != '') {
-							if($wb->mail($email_from,$email_to,$email_subject,$email_body,$email_fromname)) {
-								$success = true;
-							}
-						} else {
-							if($wb->mail('',$email_to,$email_subject,$email_body,$email_fromname)) { 
-								$success = true; 
-							}
-						}
-					}				
-					if($success_email_to != '') {
-						if($success_email_from != '') {
-							if($wb->mail($success_email_from,$success_email_to,$success_email_subject,$success_email_text,$success_email_fromname)) {
-								$success = true;
-							}
-						} else {
-							if($wb->mail('',$success_email_to,$success_email_subject,$success_email_text,$success_email_fromname)) {
-								$success = true;
-							}
-						}
-					}				
-			
-					// Write submission to database
-					if(isset($admin) AND $admin->is_authenticated() AND $admin->get_user_id() > 0) {
-						$submitted_by = $admin->get_user_id();
-					} else {
-						$submitted_by = 0;
-					}
-					$email_body = htmlspecialchars($wb->add_slashes($email_body));
-					$database->query("INSERT INTO ".TABLE_PREFIX."mod_form_submissions (page_id,section_id,submitted_when,submitted_by,body) VALUES ('".PAGE_ID."','$section_id','".time()."','$submitted_by','$email_body')");
-					// Make sure submissions table isn't too full
-					$query_submissions = $database->query("SELECT submission_id FROM ".TABLE_PREFIX."mod_form_submissions ORDER BY submitted_when");
-					$num_submissions = $query_submissions->numRows();
-					if($num_submissions > $stored_submissions) {
-						// Remove excess submission
-						$num_to_remove = $num_submissions-$stored_submissions;
-						while($submission = $query_submissions->fetchRow()) {
-							if($num_to_remove > 0) {
-								$submission_id = $submission['submission_id'];
-								$database->query("DELETE FROM ".TABLE_PREFIX."mod_form_submissions WHERE submission_id = '$submission_id'");
-								$num_to_remove = $num_to_remove-1;
-							}
-						}
-					}
-					if(!$database->is_error()) {
-						$success = true;
-					}
-				}
-			}	
-		}
-	}
-	
-	// Now check if the email was sent successfully
-	if(isset($success) AND $success == true) {
-	   if ($success_page=='none') {
-			echo str_replace("\n","<br />",$success_email_text);
-  		} else {
-			$query_menu = $database->query("SELECT link,target FROM ".TABLE_PREFIX."pages WHERE `page_id` = '$success_page'");
-			if($query_menu->numRows() > 0) {
-  	        	$fetch_settings = $query_menu->fetchRow();
-			   $link = WB_URL.PAGES_DIRECTORY.$fetch_settings['link'].PAGE_EXTENSION;
-			   echo "<script type='text/javascript'>location.href='".$link."';</script>";
-			}    
-		}
-		// clearing session on success
-		$query_fields = $database->query("SELECT field_id FROM ".TABLE_PREFIX."mod_form_fields WHERE section_id = '$section_id'");
-		while($field = $query_fields->fetchRow()) {
-			$field_id = $field[0];
-			if(isset($_SESSION['field'.$field_id])) unset($_SESSION['field'.$field_id]);
-		}
-	} else {
-		if(isset($success) AND $success == false) {
-			echo $TEXT['ERROR'];
-		}
-	}
-}
-
-?>
\ No newline at end of file
+<?php
+/**
+ *
+ * @category        module
+ * @package         Form
+ * @author          WebsiteBaker Project
+ * @copyright       2004-2009, Ryan Djurovich
+ * @copyright       2009-2011, Website Baker Org. e.V.
+ * @link			http://www.websitebaker2.org/
+ * @license         http://www.gnu.org/licenses/gpl.html
+ * @platform        WebsiteBaker 2.8.x
+ * @requirements    PHP 5.2.2 and higher
+ * @version         $Id$
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
+ * @description     
+ */
+
+// Must include code to stop this file being access directly
+if(defined('WB_PATH') == false) { exit("Cannot access this file directly"); }
+
+// check if frontend.css file needs to be included into the <body></body> of view.php
+if((!function_exists('register_frontend_modfiles') || !defined('MOD_FRONTEND_CSS_REGISTERED')) &&
+	file_exists(WB_PATH .'/modules/form/frontend.css')) {
+	echo '<style type="text/css">';
+	include(WB_PATH .'/modules/form/frontend.css');
+	echo "\n</style>\n";
+} 
+
+require_once(WB_PATH.'/include/captcha/captcha.php');
+
+// obtain the settings of the output filter module
+if(file_exists(WB_PATH.'/modules/output_filter/filter-routines.php')) {
+	include_once(WB_PATH.'/modules/output_filter/filter-routines.php');
+	$filter_settings = get_output_filter_settings();
+} else {
+	// no output filter used, define default settings
+	$filter_settings['email_filter'] = 0;
+}
+
+// Function for generating an optionsfor a select field
+if (!function_exists('make_option')) {
+function make_option(&$n, $k, $values) {
+	// start option group if it exists
+	if (substr($n,0,2) == '[=') {
+	 	$n = '<optgroup label="'.substr($n,2,strlen($n)).'">';
+	} elseif ($n == ']') {
+		$n = '</optgroup>';
+	} else {
+		if(in_array($n, $values)) {
+			$n = '<option selected="selected" value="'.$n.'">'.$n.'</option>';
+		} else {
+			$n = '<option value="'.$n.'">'.$n.'</option>';
+		}
+	}
+}
+}
+// Function for generating a checkbox
+if (!function_exists('make_checkbox')) {
+function make_checkbox(&$n, $idx, $params) {
+	$field_id = $params[0][0];
+	$seperator = $params[0][1];
+	$label_id = 'wb_'.preg_replace('/[^a-z0-1]/i', '_', $n);
+	if(in_array($n, $params[1])) {
+		$n = '<input class="field_checkbox" type="checkbox" id="'.$label_id.'" name="field'.$field_id.'['.$idx.']" value="'.$n.'" checked="checked" />'.'<label for="'.$label_id.'" class="checkbox_label">'.$n.'</lable>'.$seperator;
+	} else {
+		$n = '<input class="field_checkbox" type="checkbox" id="'.$label_id.'" name="field'.$field_id.'['.$idx.']" value="'.$n.'" />'.'<label for="'.$label_id.'" class="checkbox_label">'.$n.'</label>'.$seperator;
+	}	
+}
+}
+// Function for generating a radio button
+if (!function_exists('make_radio')) {
+function make_radio(&$n, $idx, $params) {
+	$field_id = $params[0];
+	$group = $params[1];
+	$seperator = $params[2];
+	$label_id = 'wb_'.preg_replace('/[^a-z0-1]/i', '_', $n);
+	if($n == $params[3]) { 
+		$n = '<input class="field_radio" type="radio" id="'.$label_id.'" name="field'.$field_id.'" value="'.$n.'" checked="checked" />'.'<label for="'.$label_id.'" class="radio_label">'.$n.'</label>'.$seperator;
+	} else {
+		$n = '<input class="field_radio" type="radio" id="'.$label_id.'" name="field'.$field_id.'" value="'.$n.'" />'.'<label for="'.$label_id.'" class="radio_label">'.$n.'</label>'.$seperator;
+	}
+}
+}
+
+if (!function_exists("new_submission_id") ) {
+	function new_submission_id() {
+		$submission_id = '';
+		$salt = "abchefghjkmnpqrstuvwxyz0123456789";
+		srand((double)microtime()*1000000);
+		$i = 0;
+		while ($i <= 7) {
+			$num = rand() % 33;
+			$tmp = substr($salt, $num, 1);
+			$submission_id = $submission_id . $tmp;
+			$i++;
+		}
+		return $submission_id;
+	}
+}
+
+// Work-out if the form has been submitted or not
+if($_POST == array()) {
+
+// Set new submission ID in session
+$_SESSION['form_submission_id'] = new_submission_id();
+
+// Get settings
+$query_settings = $database->query("SELECT header,field_loop,footer,use_captcha FROM ".TABLE_PREFIX."mod_form_settings WHERE section_id = '$section_id'");
+if($query_settings->numRows() > 0) {
+	$fetch_settings = $query_settings->fetchRow();
+	$header = str_replace('{WB_URL}',WB_URL,$fetch_settings['header']);
+	$field_loop = $fetch_settings['field_loop'];
+	$footer = str_replace('{WB_URL}',WB_URL,$fetch_settings['footer']);
+	$use_captcha = $fetch_settings['use_captcha'];
+	$form_name = 'form';
+	$use_xhtml_strict = false;
+} else {
+	$header = '';
+	$field_loop = '';
+	$footer = '';
+	$form_name = 'form';
+	$use_xhtml_strict = false;
+}
+
+?>
+<form <?php echo ( ( (strlen($form_name) > 0) AND (false == $use_xhtml_strict) ) ? "name=\"".$form_name."\"" : ""); ?> action="<?php echo htmlspecialchars(strip_tags($_SERVER['SCRIPT_NAME'])); ?>#wb_<?PHP echo $section_id;?>" method="post">
+<div>
+<input type="hidden" name="submission_id" value="<?php echo $_SESSION['form_submission_id']; ?>" />
+<?php echo $admin->getFTAN(); ?>
+</div>
+<?php
+if(ENABLED_ASP) { // first add some honeypot-fields
+?>
+<div>
+<input type="hidden" name="submitted_when" value="<?php $t=time(); echo $t; $_SESSION['submitted_when']=$t; ?>" />
+</div>
+<p class="nixhier">
+email address:
+<label for="email">Leave this field email-address blank:</label>
+<input id="email" name="email" size="56" value="" /><br />
+Homepage:
+<label for="homepage">Leave this field homepage blank:</label>
+<input id="homepage" name="homepage" size="55" value="" /><br />
+URL:
+<label for="url">Leave this field url blank:</label>
+<input id="url" name="url" size="61" value="" /><br />
+Comment:
+<label for="comment">Leave this field comment blank:</label>
+<textarea id="comment" name="comment" cols="50" rows="10"></textarea><br />
+</p>
+
+<?php }
+
+// Print header
+echo $header;
+
+// Get list of fields
+$query_fields = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_form_fields WHERE section_id = '$section_id' ORDER BY position ASC");
+
+if($query_fields->numRows() > 0) {
+	while($field = $query_fields->fetchRow()) {
+		// Set field values
+		$field_id = $field['field_id'];
+		$value = $field['value'];
+		// Print field_loop after replacing vars with values
+		$vars = array('{TITLE}', '{REQUIRED}');
+		if (($field['type'] == "radio") || ($field['type'] == "checkbox")) {
+			$field_title = $field['title'];
+		} else {
+			$field_title = '<label for="field'.$field_id.'">'.$field['title'].'</label>';
+		}
+		$values = array($field_title);
+		if ($field['required'] == 1) {
+			$values[] = '<span class="required">*</span>';
+		} else {
+			$values[] = '';
+		}
+		if($field['type'] == 'textfield') {
+			$vars[] = '{FIELD}';
+			$max_lenght_para = (intval($field['extra']) ? ' maxlenght="'.intval($field['extra']).'"' : '');
+			$values[] = '<input type="text" name="field'.$field_id.'" id="field'.$field_id.'"'.$max_lenght_para.' value="'.(isset($_SESSION['field'.$field_id])?$_SESSION['field'.$field_id]:$value).'" class="textfield" />';
+		} elseif($field['type'] == 'textarea') {
+			$vars[] = '{FIELD}';
+			$values[] = '<textarea name="field'.$field_id.'" id="field'.$field_id.'" class="textarea" cols="25" rows="5">'.(isset($_SESSION['field'.$field_id])?$_SESSION['field'.$field_id]:$value).'</textarea>';
+		} elseif($field['type'] == 'select') {
+			$vars[] = '{FIELD}';
+			$options = explode(',', $value);
+			array_walk($options, 'make_option', (isset($_SESSION['field'.$field_id])?$_SESSION['field'.$field_id]:array()));
+			$field['extra'] = explode(',',$field['extra']);
+			$values[] = '<select name="field'.$field_id.'[]" id="field'.$field_id.'" size="'.$field['extra'][0].'" '.$field['extra'][1].' class="select">'.implode($options).'</select>';		
+		} elseif($field['type'] == 'heading') {
+			$vars[] = '{FIELD}';
+			$str = '<input type="hidden" name="field'.$field_id.'" id="field'.$field_id.'" value="===['.$field['title'].']===" />';
+			$values[] = ( true == $use_xhtml_strict) ? "<div>".$str."</div>" : $str;
+			$tmp_field_loop = $field_loop;		// temporarily modify the field loop template
+			$field_loop = $field['extra'];
+		} elseif($field['type'] == 'checkbox') {
+			$vars[] = '{FIELD}';
+			$options = explode(',', $value);
+			array_walk($options, 'make_checkbox', array(array($field_id,$field['extra']),(isset($_SESSION['field'.$field_id])?$_SESSION['field'.$field_id]:array())));
+			$options[count($options)-1]=substr($options[count($options)-1],0,strlen($options[count($options)-1])-strlen($field['extra']));
+			$values[] = implode($options);
+		} elseif($field['type'] == 'radio') {
+			$vars[] = '{FIELD}';
+			$options = explode(',', $value);
+			array_walk($options, 'make_radio', array($field_id,$field['title'],$field['extra'], (isset($_SESSION['field'.$field_id])?$_SESSION['field'.$field_id]:'')));
+			$options[count($options)-1]=substr($options[count($options)-1],0,strlen($options[count($options)-1])-strlen($field['extra']));
+			$values[] = implode($options);
+		} elseif($field['type'] == 'email') {
+			$vars[] = '{FIELD}';
+			$max_lenght_para = (intval($field['extra']) ? ' maxlenght="'.intval($field['extra']).'"' : '');
+			$values[] = '<input type="text" name="field'.$field_id.'" id="field'.$field_id.'" value="'.(isset($_SESSION['field'.$field_id])?$_SESSION['field'.$field_id]:'').'"'.$max_lenght_para.' class="email" />';
+		}
+		if(isset($_SESSION['field'.$field_id])) unset($_SESSION['field'.$field_id]);
+		if($field['type'] != '') {
+			echo str_replace($vars, $values, $field_loop);
+		}
+		if (isset($tmp_field_loop)) $field_loop = $tmp_field_loop;
+	}
+}
+
+// Captcha
+if($use_captcha) { ?>
+	<tr>
+	<td class="field_title"><?php echo $TEXT['VERIFICATION']; ?>:</td>
+	<td><?php call_captcha(); ?></td>
+	</tr>
+	<?php
+}
+
+// Print footer
+echo $footer;
+
+/**
+	NOTE: comment out the line ob_end_flush() if you indicate problems (e.g. when using ob_start in the index.php of your template)
+	With ob_end_flush(): output filter will be disabled for this page (and all sections embedded on this page)
+	Without ob_end_flush(): emails are rewritten (e.g. name@domain.com --> name(at)domain(dot)com) if output filter is enabled
+	All replacements made by the Output-Filter module will be reverted before the email is send out
+*/
+if($filter_settings['email_filter'] && !($filter_settings['at_replacement']=='@' && $filter_settings['dot_replacement']=='.')) {
+  /* 	ob_end_flush(); */
+}
+
+// Add form end code
+?>
+</form>
+<?php
+
+} else {
+
+	// Check that submission ID matches
+	if(isset($_SESSION['form_submission_id']) AND isset($_POST['submission_id']) AND $_SESSION['form_submission_id'] == $_POST['submission_id']) {
+		
+		// Set new submission ID in session
+		$_SESSION['form_submission_id'] = new_submission_id();
+		
+		if(ENABLED_ASP && ( // form faked? Check the honeypot-fields.
+			(!isset($_POST['submitted_when']) OR !isset($_SESSION['submitted_when'])) OR 
+			($_POST['submitted_when'] != $_SESSION['submitted_when']) OR
+			(!isset($_POST['email']) OR $_POST['email']) OR
+			(!isset($_POST['homepage']) OR $_POST['homepage']) OR
+			(!isset($_POST['comment']) OR $_POST['comment']) OR
+			(!isset($_POST['url']) OR $_POST['url'])
+		)) {
+			exit(header("Location: ".WB_URL.PAGES_DIRECTORY.""));
+		}
+/*
+		if (!$admin->checkFTAN())
+		{
+			$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']);
+			exit();
+		}
+*/
+		// Submit form data
+		// First start message settings
+		$query_settings = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_form_settings WHERE section_id = '$section_id'");
+		if($query_settings->numRows() > 0) {
+			$fetch_settings = $query_settings->fetchRow();
+			$email_to = $fetch_settings['email_to'];
+			$email_from = $fetch_settings['email_from'];
+			if(substr($email_from, 0, 5) == 'field') {
+				// Set the email from field to what the user entered in the specified field
+				$email_from = htmlspecialchars($wb->add_slashes($_POST[$email_from]));
+			}
+			$email_fromname = $fetch_settings['email_fromname'];
+			$email_subject = $fetch_settings['email_subject'];
+			$success_page = $fetch_settings['success_page'];
+			$success_email_to = $fetch_settings['success_email_to'];
+			if(substr($success_email_to, 0, 5) == 'field') {
+				// Set the success_email to field to what the user entered in the specified field
+				$success_email_to = htmlspecialchars($wb->add_slashes($_POST[$success_email_to]));
+			}
+			$success_email_from = $fetch_settings['success_email_from'];
+			$success_email_fromname = $fetch_settings['success_email_fromname'];
+			$success_email_text = $fetch_settings['success_email_text'];
+			$success_email_subject = $fetch_settings['success_email_subject'];		
+			$max_submissions = $fetch_settings['max_submissions'];
+			$stored_submissions = $fetch_settings['stored_submissions'];
+			$use_captcha = $fetch_settings['use_captcha'];
+		} else {
+			exit($TEXT['UNDER_CONSTRUCTION']);
+		}
+		$email_body = '';
+		
+		// Create blank "required" array
+		$required = array();
+		
+		// Captcha
+		if($use_captcha) {
+			if(isset($_POST['captcha']) AND $_POST['captcha'] != ''){
+				// Check for a mismatch
+				if(!isset($_POST['captcha']) OR !isset($_SESSION['captcha']) OR $_POST['captcha'] != $_SESSION['captcha']) {
+					$captcha_error = $MESSAGE['MOD_FORM']['INCORRECT_CAPTCHA'];
+				}
+			} else {
+				$captcha_error = $MESSAGE['MOD_FORM']['INCORRECT_CAPTCHA'];
+			}
+		}
+		if(isset($_SESSION['captcha'])) { unset($_SESSION['captcha']); }
+
+		// Loop through fields and add to message body
+		// Get list of fields
+		$query_fields = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_form_fields WHERE section_id = '$section_id' ORDER BY position ASC");
+		if($query_fields->numRows() > 0) {
+			while($field = $query_fields->fetchRow()) {
+				// Add to message body
+				if($field['type'] != '') {
+					if(!empty($_POST['field'.$field['field_id']])) {
+						// do not allow droplets in user input!
+						if (is_array($_POST['field'.$field['field_id']])) {
+							$_SESSION['field'.$field['field_id']] = str_replace(array("[[", "]]"), array("&#91;&#91;", "&#93;&#93;"), $_POST['field'.$field['field_id']]);
+						} else {
+							$_SESSION['field'.$field['field_id']] = str_replace(array("[[", "]]"), array("&#91;&#91;", "&#93;&#93;"), htmlspecialchars($_POST['field'.$field['field_id']]));
+						}
+						// if the output filter is active, we need to revert (dot) to . and (at) to @ (using current filter settings)
+						// otherwise the entered mail will not be accepted and the recipient would see (dot), (at) etc.
+						if ($filter_settings['email_filter']) {
+							$field_value = $_POST['field'.$field['field_id']];
+							$field_value = str_replace($filter_settings['at_replacement'], '@', $field_value);
+							$field_value = str_replace($filter_settings['dot_replacement'], '.', $field_value);
+							$_POST['field'.$field['field_id']] = $field_value;
+						}
+						if($field['type'] == 'email' AND $admin->validate_email($_POST['field'.$field['field_id']]) == false) {
+							$email_error = $MESSAGE['USERS']['INVALID_EMAIL'];
+						}
+						if($field['type'] == 'heading') {
+							$email_body .= $_POST['field'.$field['field_id']]."\n\n";
+						} elseif (!is_array($_POST['field'.$field['field_id']])) {
+							$email_body .= $field['title'].': '.$_POST['field'.$field['field_id']]."\n\n";
+						} else {
+							$email_body .= $field['title'].": \n";
+							foreach ($_POST['field'.$field['field_id']] as $k=>$v) {
+								$email_body .= $v."\n";
+							}
+							$email_body .= "\n";
+						}
+					} elseif($field['required'] == 1) {
+						$required[] = $field['title'];
+					}
+				}
+			}
+		}
+	
+		// Check if the user forgot to enter values into all the required fields
+		if($required != array()) {
+			if(!isset($MESSAGE['MOD_FORM']['REQUIRED_FIELDS'])) {
+				echo 'You must enter details for the following fields';
+			} else {
+				echo $MESSAGE['MOD_FORM']['REQUIRED_FIELDS'];
+			}
+			echo ':<br /><ul>';
+			foreach($required AS $field_title) {
+				echo '<li>'.$field_title;
+			}
+			if(isset($email_error)) {
+				echo '<li>'.$email_error.'</li>';
+			}
+			if(isset($captcha_error)) {
+				echo '<li>'.$captcha_error.'</li>';
+			}
+			echo '</ul><a href="'.htmlspecialchars(strip_tags($_SERVER['SCRIPT_NAME'])).'">'.$TEXT['BACK'].'</a>';
+		} else {
+			if(isset($email_error)) {
+				echo '<br /><ul>';
+				echo '<li>'.$email_error.'</li>';
+				echo '</ul><a href="'.htmlspecialchars(strip_tags($_SERVER['SCRIPT_NAME'])).'">'.$TEXT['BACK'].'</a>';
+			} elseif(isset($captcha_error)) {
+				echo '<br /><ul>';
+				echo '<li>'.$captcha_error.'</li>';
+				echo '</ul><a href="'.htmlspecialchars(strip_tags($_SERVER['SCRIPT_NAME'])).'">'.$TEXT['BACK'].'</a>';
+			} else {
+				// Check how many times form has been submitted in last hour
+				$last_hour = time()-3600;
+				$query_submissions = $database->query("SELECT submission_id FROM ".TABLE_PREFIX."mod_form_submissions WHERE submitted_when >= '$last_hour'");
+				if($query_submissions->numRows() > $max_submissions) {
+					// Too many submissions so far this hour
+					echo $MESSAGE['MOD_FORM']['EXCESS_SUBMISSIONS'];
+					$success = false;
+				} else {
+					/**	
+					 *	Adding the IP to the body and try to send the email
+					 */
+					$email_body .= "\n\nIP: ".$_SERVER['REMOTE_ADDR'];
+					
+					if($email_to != '') {
+						if($email_from != '') {
+							if($wb->mail($email_from,$email_to,$email_subject,$email_body,$email_fromname)) {
+								$success = true;
+							}
+						} else {
+							if($wb->mail('',$email_to,$email_subject,$email_body,$email_fromname)) { 
+								$success = true; 
+							}
+						}
+					}				
+					if($success_email_to != '') {
+						if($success_email_from != '') {
+							if($wb->mail($success_email_from,$success_email_to,$success_email_subject,$success_email_text,$success_email_fromname)) {
+								$success = true;
+							}
+						} else {
+							if($wb->mail('',$success_email_to,$success_email_subject,$success_email_text,$success_email_fromname)) {
+								$success = true;
+							}
+						}
+					}				
+			
+					// Write submission to database
+					if(isset($admin) AND $admin->is_authenticated() AND $admin->get_user_id() > 0) {
+						$submitted_by = $admin->get_user_id();
+					} else {
+						$submitted_by = 0;
+					}
+					$email_body = htmlspecialchars($wb->add_slashes($email_body));
+					$database->query("INSERT INTO ".TABLE_PREFIX."mod_form_submissions (page_id,section_id,submitted_when,submitted_by,body) VALUES ('".PAGE_ID."','$section_id','".time()."','$submitted_by','$email_body')");
+					// Make sure submissions table isn't too full
+					$query_submissions = $database->query("SELECT submission_id FROM ".TABLE_PREFIX."mod_form_submissions ORDER BY submitted_when");
+					$num_submissions = $query_submissions->numRows();
+					if($num_submissions > $stored_submissions) {
+						// Remove excess submission
+						$num_to_remove = $num_submissions-$stored_submissions;
+						while($submission = $query_submissions->fetchRow()) {
+							if($num_to_remove > 0) {
+								$submission_id = $submission['submission_id'];
+								$database->query("DELETE FROM ".TABLE_PREFIX."mod_form_submissions WHERE submission_id = '$submission_id'");
+								$num_to_remove = $num_to_remove-1;
+							}
+						}
+					}
+					if(!$database->is_error()) {
+						$success = true;
+					}
+				}
+			}	
+		}
+	}
+	
+	// Now check if the email was sent successfully
+	if(isset($success) AND $success == true) {
+	   if ($success_page=='none') {
+			echo str_replace("\n","<br />",$success_email_text);
+  		} else {
+			$query_menu = $database->query("SELECT link,target FROM ".TABLE_PREFIX."pages WHERE `page_id` = '$success_page'");
+			if($query_menu->numRows() > 0) {
+  	        	$fetch_settings = $query_menu->fetchRow();
+			   $link = WB_URL.PAGES_DIRECTORY.$fetch_settings['link'].PAGE_EXTENSION;
+			   echo "<script type='text/javascript'>location.href='".$link."';</script>";
+			}    
+		}
+		// clearing session on success
+		$query_fields = $database->query("SELECT field_id FROM ".TABLE_PREFIX."mod_form_fields WHERE section_id = '$section_id'");
+		while($field = $query_fields->fetchRow()) {
+			$field_id = $field[0];
+			if(isset($_SESSION['field'.$field_id])) unset($_SESSION['field'.$field_id]);
+		}
+	} else {
+		if(isset($success) AND $success == false) {
+			echo $TEXT['ERROR'];
+		}
+	}
+}

Property changes on: branches/2.8.x/wb/modules/form/view.php
___________________________________________________________________
Modified: svn:keywords
## -1 +1,4 ##
-Id
\ No newline at end of property
+Id
+Revision
+HeadURL
+Date
\ No newline at end of property
Index: branches/2.8.x/wb/modules/form/move_up.php
===================================================================
--- branches/2.8.x/wb/modules/form/move_up.php	(revision 1456)
+++ branches/2.8.x/wb/modules/form/move_up.php	(revision 1457)
@@ -11,8 +11,8 @@
  * @platform        WebsiteBaker 2.8.x
  * @requirements    PHP 5.2.2 and higher
  * @version         $Id$
- * @filesource		$HeadURL:  $
- * @lastmodified    $Date:  $
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
  * @description     
  */
 
@@ -25,7 +25,6 @@
 $field_id = $admin->checkIDKEY('field_id', false, 'GET');
 if (!$field_id) {
  $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id);
- exit();
 }
 
 // Include the ordering class
@@ -41,5 +40,3 @@
 
 // Print admin footer
 $admin->print_footer();
-
-?>
\ No newline at end of file

Property changes on: branches/2.8.x/wb/modules/form/move_up.php
___________________________________________________________________
Modified: svn:keywords
## -1 +1,4 ##
-Id
\ No newline at end of property
+Id
+Revision
+HeadURL
+Date
\ No newline at end of property
Index: branches/2.8.x/wb/modules/form/delete_submission.php
===================================================================
--- branches/2.8.x/wb/modules/form/delete_submission.php	(revision 1456)
+++ branches/2.8.x/wb/modules/form/delete_submission.php	(revision 1457)
@@ -11,8 +11,8 @@
  * @platform        WebsiteBaker 2.8.x
  * @requirements    PHP 5.2.2 and higher
  * @version         $Id$
- * @filesource		$HeadURL:  $
- * @lastmodified    $Date:  $
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
  * @description     
  */
 
@@ -26,7 +26,6 @@
 $submission_id = $admin->checkIDKEY('submission_id', false, 'GET');
 if (!$submission_id) {
  $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id);
- exit();
 }
 
 // Delete row
@@ -41,5 +40,3 @@
 
 // Print admin footer
 $admin->print_footer();
-
-?>
\ No newline at end of file

Property changes on: branches/2.8.x/wb/modules/form/delete_submission.php
___________________________________________________________________
Modified: svn:keywords
## -1 +1,4 ##
-Id
\ No newline at end of property
+Id
+Revision
+HeadURL
+Date
\ No newline at end of property
Index: branches/2.8.x/wb/modules/form/save_settings.php
===================================================================
--- branches/2.8.x/wb/modules/form/save_settings.php	(revision 1456)
+++ branches/2.8.x/wb/modules/form/save_settings.php	(revision 1457)
@@ -11,22 +11,25 @@
  * @platform        WebsiteBaker 2.8.x
  * @requirements    PHP 5.2.2 and higher
  * @version         $Id$
- * @filesource		$HeadURL:  $
- * @lastmodified    $Date:  $
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
  * @description     
  */
 
 require('../../config.php');
 
+$admin_header = false;
+// Tells script to update when this page was last updated
+$update_when_modified = true;
 // Include WB admin wrapper script
-$update_when_modified = true; // Tells script to update when this page was last updated
 require(WB_PATH.'/modules/admin.php');
 
 if (!$admin->checkFTAN())
 {
+	$admin->print_header();
 	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id);
-	exit();
 }
+$admin->print_header();
 
 // This code removes any <?php tags and adds slashes
 $friendly = array('&lt;', '&gt;', '?php');

Property changes on: branches/2.8.x/wb/modules/form/save_settings.php
___________________________________________________________________
Modified: svn:keywords
## -1 +1,4 ##
-Id
\ No newline at end of property
+Id
+Revision
+HeadURL
+Date
\ No newline at end of property
Index: branches/2.8.x/wb/modules/form/frontend.css
===================================================================
--- branches/2.8.x/wb/modules/form/frontend.css	(revision 1456)
+++ branches/2.8.x/wb/modules/form/frontend.css	(revision 1457)

Property changes on: branches/2.8.x/wb/modules/form/frontend.css
___________________________________________________________________
Modified: svn:keywords
## -1 +1,4 ##
-Id
\ No newline at end of property
+Id
+Revision
+HeadURL
+Date
\ No newline at end of property
Index: branches/2.8.x/wb/modules/form/view_submission.php
===================================================================
--- branches/2.8.x/wb/modules/form/view_submission.php	(revision 1456)
+++ branches/2.8.x/wb/modules/form/view_submission.php	(revision 1457)
@@ -11,8 +11,8 @@
  * @platform        WebsiteBaker 2.8.x
  * @requirements    PHP 5.2.2 and higher
  * @version         $Id$
- * @filesource		$HeadURL:  $
- * @lastmodified    $Date:  $
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
  * @description     
  */
 
@@ -20,14 +20,13 @@
 
 // Include WB admin wrapper script
 require(WB_PATH.'/modules/admin.php');
-
+/*
 // Get id
 $submission_id = $admin->checkIDKEY('submission_id', false, 'GET');
 if (!$submission_id) {
  $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id);
- exit();
 }
-
+*/
 // Get submission details
 $query_content = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_form_submissions WHERE submission_id = '$submission_id'");
 $submission = $query_content->fetchRow();

Property changes on: branches/2.8.x/wb/modules/form/view_submission.php
___________________________________________________________________
Modified: svn:keywords
## -1 +1,4 ##
-Id
\ No newline at end of property
+Id
+Revision
+HeadURL
+Date
\ No newline at end of property
Index: branches/2.8.x/wb/modules/form/modify.php
===================================================================
--- branches/2.8.x/wb/modules/form/modify.php	(revision 1456)
+++ branches/2.8.x/wb/modules/form/modify.php	(revision 1457)
@@ -11,8 +11,8 @@
  * @platform        WebsiteBaker 2.8.x
  * @requirements    PHP 5.2.2 and higher
  * @version         $Id$
- * @filesource		$HeadURL:  $
- * @lastmodified    $Date:  $
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
  * @description     
  */
 

Property changes on: branches/2.8.x/wb/modules/form/modify.php
___________________________________________________________________
Modified: svn:keywords
## -1 +1,4 ##
-Id
\ No newline at end of property
+Id
+Revision
+HeadURL
+Date
\ No newline at end of property
Index: branches/2.8.x/wb/modules/form/backend.css
===================================================================
--- branches/2.8.x/wb/modules/form/backend.css	(revision 1456)
+++ branches/2.8.x/wb/modules/form/backend.css	(revision 1457)

Property changes on: branches/2.8.x/wb/modules/form/backend.css
___________________________________________________________________
Modified: svn:keywords
## -1 +1,4 ##
-Id
\ No newline at end of property
+Id
+Revision
+HeadURL
+Date
\ No newline at end of property
Index: branches/2.8.x/wb/modules/form/add.php
===================================================================
--- branches/2.8.x/wb/modules/form/add.php	(revision 1456)
+++ branches/2.8.x/wb/modules/form/add.php	(revision 1457)
@@ -11,8 +11,8 @@
  * @platform        WebsiteBaker 2.8.x
  * @requirements    PHP 5.2.2 and higher
  * @version         $Id$
- * @filesource		$HeadURL:  $
- * @lastmodified    $Date:  $
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
  * @description     
  */
 // Must include code to stop this file being access directly

Property changes on: branches/2.8.x/wb/modules/form/add.php
___________________________________________________________________
Modified: svn:keywords
## -1 +1,4 ##
-Id
\ No newline at end of property
+Id
+Revision
+HeadURL
+Date
\ No newline at end of property
Index: branches/2.8.x/wb/modules/jsadmin/uninstall.php
===================================================================
--- branches/2.8.x/wb/modules/jsadmin/uninstall.php	(revision 1456)
+++ branches/2.8.x/wb/modules/jsadmin/uninstall.php	(revision 1457)

Property changes on: branches/2.8.x/wb/modules/jsadmin/uninstall.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/jsadmin/info.php
===================================================================
--- branches/2.8.x/wb/modules/jsadmin/info.php	(revision 1456)
+++ branches/2.8.x/wb/modules/jsadmin/info.php	(revision 1457)

Property changes on: branches/2.8.x/wb/modules/jsadmin/info.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/jsadmin/tool.php
===================================================================
--- branches/2.8.x/wb/modules/jsadmin/tool.php	(revision 1456)
+++ branches/2.8.x/wb/modules/jsadmin/tool.php	(revision 1457)
@@ -27,7 +27,7 @@
 	// a module language file exists for the language defined by the user, load it
 	require_once(WB_PATH .'/modules/jsadmin/languages/'.LANGUAGE .'.php');
 }
-
+/*
 // check if backend.css file needs to be included into the <body></body>
 if(!method_exists($admin, 'register_backend_modfiles') && file_exists(WB_PATH .'/modules/jsadmin/backend.css')) {
 	echo '<style type="text/css">';
@@ -34,16 +34,17 @@
 	include(WB_PATH .'/modules/jsadmin/backend.css');
 	echo "\n</style>\n";
 }
-
+*/
 require_once(WB_PATH.'/modules/jsadmin/jsadmin.php');
 
 // Check if user selected what add-ons to reload
-if(isset($_POST['submit']) AND $_POST['submit'] != '') {
+if(isset($_POST['save_settings']))  {
 	if (!$admin->checkFTAN())
 	{
+		$admin->print_header();
 		$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'],$_SERVER['REQUEST_URI']);
-		exit();
 	}
+	$admin->print_header();
 
 	// Include functions file
 	require_once(WB_PATH.'/framework/functions.php');
@@ -50,15 +51,23 @@
 	save_setting('mod_jsadmin_persist_order', isset($_POST['persist_order']));
 	save_setting('mod_jsadmin_ajax_order_pages', isset($_POST['ajax_order_pages']));
 	save_setting('mod_jsadmin_ajax_order_sections', isset($_POST['ajax_order_sections']));
-	echo '<div style="border: solid 2px #9c9; background: #ffd; padding: 0.5em; margin-top: 1em">'.$MESSAGE['SETTINGS']['SAVED'].'</div>';
+   // 	echo '<div style="border: solid 2px #9c9; background: #ffd; padding: 0.5em; margin-top: 1em">'.$MESSAGE['SETTINGS']['SAVED'].'</div>';
+	// check if there is a database error, otherwise say successful
+	if($database->is_error()) {
+		$admin->print_error($database->get_error(), $js_back);
+	} else {
+
+		$admin->print_success($MESSAGE['PAGES']['SAVED'], ADMIN_URL.'/admintools/tool.php?tool=jsadmin');
+	}
+
+} else {
+	// $admin->print_header();
 }
 
 // Display form
-$persist_order = get_setting('mod_jsadmin_persist_order', true) ? 'checked="checked"' : '';
-$ajax_order_pages = get_setting('mod_jsadmin_ajax_order_pages', true) ? 'checked="checked"' : '';
-$ajax_order_sections = get_setting('mod_jsadmin_ajax_order_sections', true) ? 'checked="checked"' : '';
-?>
-<?php
+	$persist_order = get_setting('mod_jsadmin_persist_order', true) ? 'checked="checked"' : '';
+	$ajax_order_pages = get_setting('mod_jsadmin_ajax_order_pages', true) ? 'checked="checked"' : '';
+	$ajax_order_sections = get_setting('mod_jsadmin_ajax_order_sections', true) ? 'checked="checked"' : '';
 
 // THIS ROUTINE CHECKS THE EXISTING OFF ALL NEEDED YUI FILES
   $YUI_ERROR=false; // ist there an Error
@@ -73,16 +82,17 @@
 	}
 	if($YUI_ERROR)
 	{
-    ?><div id="jsadmin_install" style="border: solid 2px #c99; background: #ffd; padding: 0.5em; margin-top: 1em">
+?>
+	<div id="jsadmin_install" style="border: solid 2px #c99; background: #ffd; padding: 0.5em; margin-top: 1em">
 
      <?php echo $MOD_JSADMIN['TXT_ERROR_INSTALLINFO_B'].$YUI_PUT_MISSING_Files; ?>
       </div>
-      <?php
+<?php
   }
   else
   {
   ?>
-   <form id="jsadmin_form" style="margin-top: 1em; display: true;" action="<?php echo $_SERVER['REQUEST_URI']; ?>" method="post">
+   <form id="jsadmin_form" name="store_settings" style="margin-top: 1em; display: true;" action="<?php echo $_SERVER['REQUEST_URI']; ?>" method="post">
 	<?php echo $admin->getFTAN(); ?>
    <table cellpadding="4" cellspacing="0" border="0">
    <tr>
@@ -103,7 +113,7 @@
    <tr>
 	     <td>&nbsp;</td>
 	     <td>
-		   <input type="submit" name="submit" value="<?php echo $TEXT['SAVE']; ?>" />
+		   <input type="submit" name="save_settings" value="<?php echo $TEXT['SAVE']; ?>" />
 	    </td>
    </tr>
    </table>
@@ -110,4 +120,3 @@
    </form>
  <?php
  }
-?>

Property changes on: branches/2.8.x/wb/modules/jsadmin/tool.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/jsadmin/jsadmin_backend_include.php
===================================================================
--- branches/2.8.x/wb/modules/jsadmin/jsadmin_backend_include.php	(revision 1456)
+++ branches/2.8.x/wb/modules/jsadmin/jsadmin_backend_include.php	(revision 1457)

Property changes on: branches/2.8.x/wb/modules/jsadmin/jsadmin_backend_include.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/jsadmin/README.txt
===================================================================
--- branches/2.8.x/wb/modules/jsadmin/README.txt	(revision 1456)
+++ branches/2.8.x/wb/modules/jsadmin/README.txt	(revision 1457)
@@ -1,65 +1,65 @@
-Javscript Admin
-
-Release 1.2
- On Sourcecode of
-(C) Copyright 2006 Stepan Riha (www.nonplus.net)
-* -----------------------------------------------------------------------------------------
-*	MODIFICATION HISTORY:
-*   by Swen Uth; 01/24/2008
-*   + Update to 1.2
-*   + Update to Website Baker (include/yui)-> YUI to Version 2.4.1
-*   + take the YUI folder to wb/include/
-*   + Website Baker 2.7 Kompatible
-*   + Multilingual
-*   + initial release of the English language file
-*   + initial release of the German language file
-*   + include the Option for backend.cs
-*   + include the option for backend.js
-*   + renamed footer.php to jsadmin_backend_include.php for a better understanding for integration and development
-*   + INCLUDE ERRORHANDLING for missing YUI - Files
-*   + the Array $js_yui_scripts are defined in the jsadmin.php for better development
-* -----------------------------------------------------------------------------------------
-*
-______________________________________________________________
-
-DESCRIPTION
-
-This tool module adds Javascript functionality to the Website Baker Admin to
-improve some of the UI interactions.
-
-Portions of this module use scripts from the Yahoo! UI Library
-You can find it in the WB/include folder
-
-	http://developer.yahoo.com/yui/
-	
-______________________________________________________________
-
-REQUIREMENTS
-
-This module is supported on Website Baker 2.7 and later.
-
-______________________________________________________________
-
-INSTALLATION
-
-The module includes the following files:
-
-	!!! footer.php is canceled -> renamed to jsadmin_backend_include.php
-	images/busy.gif
-	images/failure.gif
-	images/success.gif
-	index.php
-	info.php
-	js/dragdrop.js
-	js/jsadmin.js
-	js/restore_pages.js
-	js/tool.js
- 	+ languages/EN.php
-	+ languages/DE.php
-	jsadmin.php
-	move_to.php
-	README.txt
-	tool.php
-
-______________________________________________________________
-
+Javscript Admin
+
+Release 1.2
+ On Sourcecode of
+(C) Copyright 2006 Stepan Riha (www.nonplus.net)
+* -----------------------------------------------------------------------------------------
+*	MODIFICATION HISTORY:
+*   by Swen Uth; 01/24/2008
+*   + Update to 1.2
+*   + Update to Website Baker (include/yui)-> YUI to Version 2.4.1
+*   + take the YUI folder to wb/include/
+*   + Website Baker 2.7 Kompatible
+*   + Multilingual
+*   + initial release of the English language file
+*   + initial release of the German language file
+*   + include the Option for backend.cs
+*   + include the option for backend.js
+*   + renamed footer.php to jsadmin_backend_include.php for a better understanding for integration and development
+*   + INCLUDE ERRORHANDLING for missing YUI - Files
+*   + the Array $js_yui_scripts are defined in the jsadmin.php for better development
+* -----------------------------------------------------------------------------------------
+*
+______________________________________________________________
+
+DESCRIPTION
+
+This tool module adds Javascript functionality to the Website Baker Admin to
+improve some of the UI interactions.
+
+Portions of this module use scripts from the Yahoo! UI Library
+You can find it in the WB/include folder
+
+	http://developer.yahoo.com/yui/
+	
+______________________________________________________________
+
+REQUIREMENTS
+
+This module is supported on Website Baker 2.7 and later.
+
+______________________________________________________________
+
+INSTALLATION
+
+The module includes the following files:
+
+	!!! footer.php is canceled -> renamed to jsadmin_backend_include.php
+	images/busy.gif
+	images/failure.gif
+	images/success.gif
+	index.php
+	info.php
+	js/dragdrop.js
+	js/jsadmin.js
+	js/restore_pages.js
+	js/tool.js
+ 	+ languages/EN.php
+	+ languages/DE.php
+	jsadmin.php
+	move_to.php
+	README.txt
+	tool.php
+
+______________________________________________________________
+

Property changes on: branches/2.8.x/wb/modules/jsadmin/README.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/jsadmin/jsadmin.php
===================================================================
--- branches/2.8.x/wb/modules/jsadmin/jsadmin.php	(revision 1456)
+++ branches/2.8.x/wb/modules/jsadmin/jsadmin.php	(revision 1457)

Property changes on: branches/2.8.x/wb/modules/jsadmin/jsadmin.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/jsadmin/install.php
===================================================================
--- branches/2.8.x/wb/modules/jsadmin/install.php	(revision 1456)
+++ branches/2.8.x/wb/modules/jsadmin/install.php	(revision 1457)

Property changes on: branches/2.8.x/wb/modules/jsadmin/install.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/jsadmin/index.php
===================================================================
--- branches/2.8.x/wb/modules/jsadmin/index.php	(revision 1456)
+++ branches/2.8.x/wb/modules/jsadmin/index.php	(revision 1457)

Property changes on: branches/2.8.x/wb/modules/jsadmin/index.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/jsadmin/backend.css
===================================================================
--- branches/2.8.x/wb/modules/jsadmin/backend.css	(revision 1456)
+++ branches/2.8.x/wb/modules/jsadmin/backend.css	(revision 1457)

Property changes on: branches/2.8.x/wb/modules/jsadmin/backend.css
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/output_filter/uninstall.php
===================================================================
--- branches/2.8.x/wb/modules/output_filter/uninstall.php	(revision 1456)
+++ branches/2.8.x/wb/modules/output_filter/uninstall.php	(revision 1457)

Property changes on: branches/2.8.x/wb/modules/output_filter/uninstall.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/output_filter/tool.php
===================================================================
--- branches/2.8.x/wb/modules/output_filter/tool.php	(revision 1456)
+++ branches/2.8.x/wb/modules/output_filter/tool.php	(revision 1457)
@@ -33,8 +33,8 @@
 	
 	if (!$admin->checkFTAN())
 	{
+		$admin->print_header();
 		$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'],$_SERVER['REQUEST_URI'],false);
-		exit();
 	}
 	// get overall output filter settings
 	$email_filter = (isset($_POST['email_filter']) && $_POST['email_filter'] == '1') ? '1' : '0';
@@ -51,6 +51,7 @@
 		mailto_filter = '$mailto_filter', at_replacement = '$at_replacement', dot_replacement = '$dot_replacement'");
 
 	// check if there is a database error, otherwise say successful
+	$admin->print_header();
 	if($database->is_error()) {
 		$admin->print_error($database->get_error(), $js_back);
 	} else {
@@ -64,7 +65,7 @@
 	// include filter functions
 	require_once(WB_PATH .'/modules/output_filter/filter-routines.php');
 	
-	// read the mail filter settings from the database 
+	// read the mail filter settings from the database
 	$data = get_output_filter_settings();
 	
 	// output the form with values from the database
Index: branches/2.8.x/wb/modules/output_filter/languages/NL.php
===================================================================
--- branches/2.8.x/wb/modules/output_filter/languages/NL.php	(revision 1456)
+++ branches/2.8.x/wb/modules/output_filter/languages/NL.php	(revision 1457)
@@ -29,7 +29,7 @@
 // Headings and text outputs
 $MOD_MAIL_FILTER['HEADING']				= 'Beheersinstellingen: Output Filter';
 $MOD_MAIL_FILTER['HOWTO']				= 'Hier kan je de uitvoer filteren met onderstaande opties.<p style="line-height:1.5em;"><strong>Tip: </strong>Mailto links kunnen gecodeerd worden door een Javascript functie. Om van deze optie gebruik te kunnen maken moet je de PHP code <code style="background:#FFA;color:#900;">&lt;?php register_frontend_modfiles(\'js\');?&gt;</code> in de &lt;head&gt; sectie van het index.php bestand van je template plaatsen. Zonder deze aanpassing zal enkel het @ teken in het mailto deel vervangen worden.</p>';
-$MOD_MAIL_FILTER['WARNING']				= '<p style="color: red; line-height:1.5em;"><strong>Waarschuwing: </strong>Deze functionaliteit is vanaf nu ook beschikbaar als Droplet. De volgende versie van Website Baker (2.9) zal dit filter dan ook niet meer ondersteunen. Gebruik voortaan de <a href="?tool=droplets">Droplet</a> [[EmailFilter]]</p>';
+$MOD_MAIL_FILTER['WARNING']				= '';
 
 // Text and captions of form elements
 $MOD_MAIL_FILTER['BASIC_CONF']			= 'E-mail Configuratie';
Index: branches/2.8.x/wb/modules/output_filter/languages/NO.php
===================================================================
--- branches/2.8.x/wb/modules/output_filter/languages/NO.php	(revision 1456)
+++ branches/2.8.x/wb/modules/output_filter/languages/NO.php	(revision 1457)
@@ -29,7 +29,7 @@
 // Headings and text outputs
 $MOD_MAIL_FILTER['HEADING']	= 'Valg: Filtrering av ut data';
 $MOD_MAIL_FILTER['HOWTO']	= 'Du kan gj&oslash;re innstillinger for utdatafitreringen i valgene nedenfor.<p style="line-height:1.5em;"><strong>Tips: </strong>Mailto linker kan krypteres av en Javascript funksjon. For &aring; f&aring; benyttet denne funksjonen, m&aring; det legges til f&oslash;lgende PHP kode <code style="background:#FFA;color:#900;">&lt;?php register_frontend_modfiles(\'js\');?&gt;</code> inn i &lt;head&gt; seksjonen i index.php p&aring; design malen din. Uten denne modifikasjonen, vil kun @ karakterer i mailto linker bli erstattet.</p>';
-$MOD_MAIL_FILTER['WARNING']						= '<p style="color: red; line-height:1.5em;"><strong>Warning: </strong>This function is now available as a Droplet. The next major release of website baker will not include this filter anymore. Please concider using the <a href="?tool=droplets">Droplet</a> [[EmailFilter]]</p>';
+$MOD_MAIL_FILTER['WARNING']	= '';
 
 // Text and captions of form elements
 $MOD_MAIL_FILTER['BASIC_CONF']	= 'Enkel Epost konfigurasjon';
Index: branches/2.8.x/wb/modules/output_filter/languages/EN.php
===================================================================
--- branches/2.8.x/wb/modules/output_filter/languages/EN.php	(revision 1456)
+++ branches/2.8.x/wb/modules/output_filter/languages/EN.php	(revision 1457)
@@ -29,7 +29,7 @@
 // Headings and text outputs
 $MOD_MAIL_FILTER['HEADING']				= 'Options: Output Filter';
 $MOD_MAIL_FILTER['HOWTO']						= 'You can configure the output filtering with the options below.<p style="line-height:1.5em;"><strong>Tip: </strong>Mailto links can be encrypted by a Javascript function. To make use of this option, one needs to add the PHP code <code style="background:#FFA;color:#900;">&lt;?php register_frontend_modfiles(\'js\');?&gt;</code> into the &lt;head&gt; section of the index.php of your template. Without this modification, only the @ character in the mailto part will be replaced.</p>';
-$MOD_MAIL_FILTER['WARNING']						= '<p style="color: red; line-height:1.5em;"><strong>Warning: </strong>This function is now available as a Droplet. The next major release of website baker will not include this filter anymore. Please concider using the <a href="?tool=droplets">Droplet</a> [[EmailFilter]]</p>';
+$MOD_MAIL_FILTER['WARNING']				= '';
 
 // Text and captions of form elements
 $MOD_MAIL_FILTER['BASIC_CONF']			= 'Basic Email Configuration';
Index: branches/2.8.x/wb/modules/output_filter/languages/DA.php
===================================================================
--- branches/2.8.x/wb/modules/output_filter/languages/DA.php	(revision 1456)
+++ branches/2.8.x/wb/modules/output_filter/languages/DA.php	(revision 1457)
@@ -1,45 +1,45 @@
-<?php
-
-// $Id$
-
-/*
-
- Website Baker Project <http://www.websitebaker.org/>
- Copyright (C) 2004-2009, Ryan Djurovich
-
- Website Baker is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- Website Baker is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Website Baker; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
- -----------------------------------------------------------------------------------------
-  DANISH LANGUAGE FILE FOR THE ADDON: OUTPUT_FILTER
- -----------------------------------------------------------------------------------------
-*/
-
-// Headings and text outputs
-$MOD_MAIL_FILTER['HEADING'] = 'Indstillinger: Output-filter';
-$MOD_MAIL_FILTER['HOWTO'] = 'Du kan konfigurere output-filteret med indstillingerne nedenfor.<p style="line-height:1.5em;"><strong>Tip: </strong>Mailadresser kan krypteres vedhj&Atilde;&brvbar;lp af en  Javascript-funktion. For at g&Atilde;¸re brug af denne indstilling, skal du tilf&Atilde;¸je PHP-koden <code style="background:#FFA;color:#900;"><?php register_frontend_modfiles(js);?></code> til <head> sektionnen af  index.php i din template (layout-skabelon). Uden denne &Atilde;&brvbar;ndring vil kun @-tegnet i email-adressen blive erstattet.</p>';
-$MOD_MAIL_FILTER['WARNING'] = '<p style="color: red; line-height:1.5em;"><strong>Advarsel: </strong>Denne funktion fundes nu som en droplet. Den n&Atilde;&brvbar;ste hovedversion af Website Baker vil ikke indeholde dette filter. Brug i stedet <a href="?tool=droplets">Droplet</a> [[EmailFilter]]</p>';
-
-// Text and captions of form elements
-$MOD_MAIL_FILTER['BASIC_CONF'] = 'Email grundindstillinger';
-$MOD_MAIL_FILTER['EMAIL_FILTER'] = 'Filtrer emailadresser i tekst';
-$MOD_MAIL_FILTER['MAILTO_FILTER'] = 'Filtrer emailadresser i mailto-links';
-$MOD_MAIL_FILTER['ENABLED'] = 'Aktiveret';
-$MOD_MAIL_FILTER['DISABLED'] = 'Deaktiveret';
-
-$MOD_MAIL_FILTER['REPLACEMENT_CONF'] = 'Email erstatninger';
-$MOD_MAIL_FILTER['AT_REPLACEMENT'] = 'Erstat "@" med';
-$MOD_MAIL_FILTER['DOT_REPLACEMENT'] = 'Erstat "." med';
-
-?>
+<?php
+
+// $Id$
+
+/*
+
+ Website Baker Project <http://www.websitebaker.org/>
+ Copyright (C) 2004-2009, Ryan Djurovich
+
+ Website Baker is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ Website Baker is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Website Baker; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+ -----------------------------------------------------------------------------------------
+  DANISH LANGUAGE FILE FOR THE ADDON: OUTPUT_FILTER
+ -----------------------------------------------------------------------------------------
+*/
+
+// Headings and text outputs
+$MOD_MAIL_FILTER['HEADING'] = 'Indstillinger: Output-filter';
+$MOD_MAIL_FILTER['HOWTO'] = 'Du kan konfigurere output-filteret med indstillingerne nedenfor.<p style="line-height:1.5em;"><strong>Tip: </strong>Mailadresser kan krypteres vedhj&Atilde;&brvbar;lp af en  Javascript-funktion. For at g&Atilde;¸re brug af denne indstilling, skal du tilf&Atilde;¸je PHP-koden <code style="background:#FFA;color:#900;"><?php register_frontend_modfiles(js);?></code> til <head> sektionnen af  index.php i din template (layout-skabelon). Uden denne &Atilde;&brvbar;ndring vil kun @-tegnet i email-adressen blive erstattet.</p>';
+$MOD_MAIL_FILTER['WARNING']				= '';
+
+// Text and captions of form elements
+$MOD_MAIL_FILTER['BASIC_CONF'] = 'Email grundindstillinger';
+$MOD_MAIL_FILTER['EMAIL_FILTER'] = 'Filtrer emailadresser i tekst';
+$MOD_MAIL_FILTER['MAILTO_FILTER'] = 'Filtrer emailadresser i mailto-links';
+$MOD_MAIL_FILTER['ENABLED'] = 'Aktiveret';
+$MOD_MAIL_FILTER['DISABLED'] = 'Deaktiveret';
+
+$MOD_MAIL_FILTER['REPLACEMENT_CONF'] = 'Email erstatninger';
+$MOD_MAIL_FILTER['AT_REPLACEMENT'] = 'Erstat "@" med';
+$MOD_MAIL_FILTER['DOT_REPLACEMENT'] = 'Erstat "." med';
+
+?>
Index: branches/2.8.x/wb/modules/output_filter/languages/RU.php
===================================================================
--- branches/2.8.x/wb/modules/output_filter/languages/RU.php	(revision 1456)
+++ branches/2.8.x/wb/modules/output_filter/languages/RU.php	(revision 1457)
@@ -29,7 +29,7 @@
 // Headings and text outputs
 $MOD_MAIL_FILTER['HEADING']				= '&#1053;&#1072;&#1089;&#1090;&#1088;&#1086;&#1081;&#1082;&#1080;: Output Filter';
 $MOD_MAIL_FILTER['HOWTO']						= '&#1042;&#1099; &#1084;&#1086;&#1078;&#1077;&#1090;&#1077; &#1085;&#1072;&#1089;&#1090;&#1088;&#1086;&#1080;&#1090;&#1100; &#1092;&#1080;&#1083;&#1100;&#1090;&#1088;&#1072;&#1094;&#1080;&#1102;, &#1080;&#1089;&#1087;&#1086;&#1083;&#1100;&#1079;&#1091;&#1103; &#1085;&#1072;&#1089;&#1090;&#1088;&#1086;&#1081;&#1082;&#1080; &#1085;&#1080;&#1078;&#1077;.<p style="line-height:1.5em;"><strong>&#1042;&#1072;&#1078;&#1085;&#1086;: </strong>Mailto &#1089;&#1089;&#1099;&#1083;&#1082;&#1080; &#1084;&#1086;&#1075;&#1091;&#1090; &#1073;&#1099;&#1090;&#1100; &#1089;&#1082;&#1088;&#1099;&#1090;&#1099; &#1086;&#1090; &#1089;&#1087;&#1072;&#1084;&#1077;&#1088;&#1086;&#1074; &#1089; &#1087;&#1086;&#1084;&#1086;&#1097;&#1100;&#1102; Javascript. &#1063;&#1090;&#1086;&#1073;&#1099; &#1080;&#1089;&#1087;&#1086;&#1083;&#1100;&#1079;&#1086;&#1074;&#1072;&#1090;&#1100; &#1101;&#1090;&#1091; &#1074;&#1086;&#1079;&#1084;&#1086;&#1078;&#1085;&#1086;&#1089;&#1090;&#1100;, &#1076;&#1086;&#1073;&#1072;&#1074;&#1100;&#1090;&#1077; &#1089;&#1083;&#1077;&#1076;&#1091;&#1102;&#1097;&#1080;&#1081; PHP &#1082;&#1086;&#1076; <code style="background:#FFA;color:#900;">&lt;?php register_frontend_modfiles(\'js\');?&gt;</code> &#1074; &lt;head&gt; &#1089;&#1077;&#1082;&#1094;&#1080;&#1102; index.php &#1092;&#1072;&#1081;&#1083;&#1072; &#1074;&#1072;&#1096;&#1077;&#1075;&#1086; &#1096;&#1072;&#1073;&#1083;&#1086;&#1085;&#1072;. &#1048;&#1085;&#1072;&#1095;&#1077; &#1090;&#1086;&#1083;&#1100;&#1082;&#1086; &#1089;&#1080;&#1084;&#1074;&#1086;&#1083; @ &#1073;&#1091;&#1076;&#1077;&#1090; &#1079;&#1072;&#1084;&#1077;&#1085;&#1077;&#1085; &#1074; mailto &#1089;&#1089;&#1099;&#1083;&#1082;&#1072;&#1093;.</p>';
-$MOD_MAIL_FILTER['WARNING']						= '<p style="color: red; line-height:1.5em;"><strong>Warning: </strong>This function is now available as a Droplet. The next major release of website baker will not include this filter anymore. Please concider using the <a href="?tool=droplets">Droplet</a> [[EmailFilter]]</p>';
+$MOD_MAIL_FILTER['WARNING']				= '';
 
 // Text and captions of form elements
 $MOD_MAIL_FILTER['BASIC_CONF']			= '&#1054;&#1089;&#1085;&#1086;&#1074;&#1085;&#1099;&#1077; &#1085;&#1072;&#1089;&#1090;&#1088;&#1086;&#1081;&#1082;&#1080; Email';
Index: branches/2.8.x/wb/modules/output_filter/languages/FR.php
===================================================================
--- branches/2.8.x/wb/modules/output_filter/languages/FR.php	(revision 1456)
+++ branches/2.8.x/wb/modules/output_filter/languages/FR.php	(revision 1457)
@@ -1,47 +1,47 @@
-<?php
-
-// $Id$
-
-/*
-
- Website Baker Project <http://www.websitebaker.org/>
- Copyright (C) 2004-2009, Ryan Djurovich
-
- Website Baker is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- Website Baker is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Website Baker; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
- -----------------------------------------------------------------------------------------
-  FRENCH LANGUAGE FILE FOR THE ADDON: OUTPUT_FILTER
- -----------------------------------------------------------------------------------------
-*/
-//Module Description
-$module_description = 'Ce module g&egrave;re le filtrage des donn&eacute;es avant affichage &agrave; l&apos;utilisateur. Permets de filtrer les liens mailto et les adresses emails.';
-
-// Headings and text outputs
-$MOD_MAIL_FILTER['HEADING']				= 'Options: Output Filter';
-$MOD_MAIL_FILTER['HOWTO']						= 'Vous pouvez configurer le filtrage des donn&eacute;es avant affichage gr&acirc;ce aux options ci-dessous.<p style="line-height:1.5em;"><strong>Conseil: </strong>Les liens Mailto peuvent &ecirc;tre crypt&eacute;s &agrave; l&apos;aide d&apos;une fonction Javascript. Pour utiliser cette fonctionnalit&eacute;, vous devez ajouter le code PHP <code style="background:#FFA;color:#900;">&lt;?php register_frontend_modfiles(&apos;js&apos;);?&gt;</code> dans la partie &lt;head&gt; de index.php de votre fichier mod&egrave;le. Sans cette modification, seulement le caract&egrave;re @ sera remplac&eacute; dans le champ mailto.</p>';
-$MOD_MAIL_FILTER['WARNING']						= '<p style="color: red; line-height:1.5em;"><strong>Warning: </strong>This function is now available as a Droplet. The next major release of website baker will not include this filter anymore. Please concider using the <a href="?tool=droplets">Droplet</a> [[EmailFilter]]</p>';
-
-// Text and captions of form elements
-$MOD_MAIL_FILTER['BASIC_CONF']			= 'Configuration de base des Emails';
-$MOD_MAIL_FILTER['EMAIL_FILTER']		= 'Filtrer le texte des Emails';
-$MOD_MAIL_FILTER['MAILTO_FILTER']		= 'Filtrer les liens mailto des Emails';
-$MOD_MAIL_FILTER['ENABLED']					= 'Activ&eacute;';
-$MOD_MAIL_FILTER['DISABLED']				= 'D&eacute;sactiv&eacute;';
-
-$MOD_MAIL_FILTER['REPLACEMENT_CONF']= 'Remplacements';
-$MOD_MAIL_FILTER['AT_REPLACEMENT']	= 'Remplacer "@" par';
-$MOD_MAIL_FILTER['DOT_REPLACEMENT']	= 'Remplacer "." par';
-
+<?php
+
+// $Id$
+
+/*
+
+ Website Baker Project <http://www.websitebaker.org/>
+ Copyright (C) 2004-2009, Ryan Djurovich
+
+ Website Baker is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ Website Baker is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Website Baker; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+ -----------------------------------------------------------------------------------------
+  FRENCH LANGUAGE FILE FOR THE ADDON: OUTPUT_FILTER
+ -----------------------------------------------------------------------------------------
+*/
+//Module Description
+$module_description = 'Ce module g&egrave;re le filtrage des donn&eacute;es avant affichage &agrave; l&apos;utilisateur. Permets de filtrer les liens mailto et les adresses emails.';
+
+// Headings and text outputs
+$MOD_MAIL_FILTER['HEADING']				= 'Options: Output Filter';
+$MOD_MAIL_FILTER['HOWTO']						= 'Vous pouvez configurer le filtrage des donn&eacute;es avant affichage gr&acirc;ce aux options ci-dessous.<p style="line-height:1.5em;"><strong>Conseil: </strong>Les liens Mailto peuvent &ecirc;tre crypt&eacute;s &agrave; l&apos;aide d&apos;une fonction Javascript. Pour utiliser cette fonctionnalit&eacute;, vous devez ajouter le code PHP <code style="background:#FFA;color:#900;">&lt;?php register_frontend_modfiles(&apos;js&apos;);?&gt;</code> dans la partie &lt;head&gt; de index.php de votre fichier mod&egrave;le. Sans cette modification, seulement le caract&egrave;re @ sera remplac&eacute; dans le champ mailto.</p>';
+$MOD_MAIL_FILTER['WARNING']				= '';
+
+// Text and captions of form elements
+$MOD_MAIL_FILTER['BASIC_CONF']			= 'Configuration de base des Emails';
+$MOD_MAIL_FILTER['EMAIL_FILTER']		= 'Filtrer le texte des Emails';
+$MOD_MAIL_FILTER['MAILTO_FILTER']		= 'Filtrer les liens mailto des Emails';
+$MOD_MAIL_FILTER['ENABLED']					= 'Activ&eacute;';
+$MOD_MAIL_FILTER['DISABLED']				= 'D&eacute;sactiv&eacute;';
+
+$MOD_MAIL_FILTER['REPLACEMENT_CONF']= 'Remplacements';
+$MOD_MAIL_FILTER['AT_REPLACEMENT']	= 'Remplacer "@" par';
+$MOD_MAIL_FILTER['DOT_REPLACEMENT']	= 'Remplacer "." par';
+
 ?>
\ No newline at end of file
Index: branches/2.8.x/wb/modules/output_filter/languages/DE.php
===================================================================
--- branches/2.8.x/wb/modules/output_filter/languages/DE.php	(revision 1456)
+++ branches/2.8.x/wb/modules/output_filter/languages/DE.php	(revision 1457)
@@ -32,7 +32,7 @@
 // Ueberschriften und Textausgaben
 $MOD_MAIL_FILTER['HEADING']				= 'Optionen: Ausgabe Filterung';
 $MOD_MAIL_FILTER['HOWTO']				= '&Uuml;ber nachfolgende Optionen kann die Ausgabefilterung konfiguriert werden.<p style="line-height:1.5em;"><strong>Tipp: </strong>Mailto Links k&ouml;nnen mit einer Javascript Routine verschl&uuml;sselt werden. Um diese Option zu aktivieren muss der PHP Befehl <code style="background:#FFA;color:#900;">&lt;?php register_frontend_modfiles(\'js\');?&gt;</code> im &lt;head&gt; Bereich der index.php Ihres Templates eingebunden werden. Ohne diese &Auml;nderungen wird nur das @ Zeichen im mailto: Teil ersetzt.</p>';
-$MOD_MAIL_FILTER['WARNING']				= '<p style="color: red; line-height:1.5em;"><strong>Achtung: </strong>Diese Funktion ist auch als Droplet verf&uuml;gbar. Ab der n&auml;chsten WB Version wird der Output-Filter deswegen nicht mehr enthalten sein. Es wird empfohlen deine Seiten auf das <a href="?tool=droplets">Droplet</a> [[EmailFilter]] umzustellen.</p>';
+$MOD_MAIL_FILTER['WARNING']				= '';
 
 // Text von Form Elementen
 $MOD_MAIL_FILTER['BASIC_CONF']			= 'Grundeinstellungen';
Index: branches/2.8.x/wb/modules/code/htt/modify.htt
===================================================================
--- branches/2.8.x/wb/modules/code/htt/modify.htt	(revision 1456)
+++ branches/2.8.x/wb/modules/code/htt/modify.htt	(revision 1457)

Property changes on: branches/2.8.x/wb/modules/code/htt/modify.htt
___________________________________________________________________
Added: svn:keywords
## -0,0 +1,2 ##
+svn:eol-stylenativesvn:keywordsDate Revision Id HeadURLsvn:mime-type
+text/plain
\ No newline at end of property
Index: branches/2.8.x/wb/modules/code/uninstall.php
===================================================================
--- branches/2.8.x/wb/modules/code/uninstall.php	(revision 1456)
+++ branches/2.8.x/wb/modules/code/uninstall.php	(revision 1457)
@@ -11,9 +11,9 @@
  * @license         http://www.gnu.org/licenses/gpl.html
  * @platform        WebsiteBaker 2.8.x
  * @requirements    PHP 5.2.2 and higher
- * @version         $Id$
- * @filesource      $HeadURL$
- * @lastmodified    $Date$
+ * @version         $Id: uninstall.php 1428 2011-02-07 04:55:31Z Luisehahne $
+ * @filesource      $HeadURL: http://svn.websitebaker2.org/branches/2.8.x/wb/modules/code/uninstall.php $
+ * @lastmodified    $Date: 2011-02-07 05:55:31 +0100 (Mo, 07. Feb 2011) $
  *
  */
 

Property changes on: branches/2.8.x/wb/modules/code/uninstall.php
___________________________________________________________________
Modified: svn:keywords
## -1 +1,2 ##
-Date Revision Id HeadURL
\ No newline at end of property
+svn:eol-stylenativesvn:keywordsDate Revision Id HeadURLsvn:mime-type
+text/plain
\ No newline at end of property
Index: branches/2.8.x/wb/modules/code/view.php
===================================================================
--- branches/2.8.x/wb/modules/code/view.php	(revision 1456)
+++ branches/2.8.x/wb/modules/code/view.php	(revision 1457)
@@ -1,6 +1,6 @@
 <?php
 
-// $Id$
+// $Id: view.php 1420 2011-01-26 17:43:56Z Luisehahne $
 
 /*
 

Property changes on: branches/2.8.x/wb/modules/code/view.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1 +1,2 ##
-Id
\ No newline at end of property
+svn:eol-stylenativesvn:keywordsDate Revision Id HeadURLsvn:mime-type
+text/plain
\ No newline at end of property
Index: branches/2.8.x/wb/modules/code/info.php
===================================================================
--- branches/2.8.x/wb/modules/code/info.php	(revision 1456)
+++ branches/2.8.x/wb/modules/code/info.php	(revision 1457)
@@ -1,28 +1,28 @@
-<?php
-/**
- *
- * @category        modules
- * @package         code
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
- * @copyright       2009-2011, Website Baker Org. e.V.
- * @link			http://www.websitebaker2.org/
- * @license         http://www.gnu.org/licenses/gpl.html
- * @platform        WebsiteBaker 2.8.x
- * @requirements    PHP 5.2.2 and higher
- * @version         $Id$
- * @filesource		$HeadURL$
- * @lastmodified    $Date$
- *
-*/
-
-$module_directory	= 'code';
-$module_name		= 'Code';
-$module_function	= 'page';
-$module_version		= '2.8.2';
-$module_platform	= '2.7 | 2.8.x';
-$module_author		= 'Ryan Djurovich';
-$module_license		= 'GNU General Public License';
-$module_description	= 'This module allows you to execute PHP commands (limit access to users you trust!!)';
-
+<?php
+/**
+ *
+ * @category        modules
+ * @package         code
+ * @author          WebsiteBaker Project
+ * @copyright       2004-2009, Ryan Djurovich
+ * @copyright       2009-2011, Website Baker Org. e.V.
+ * @link			http://www.websitebaker2.org/
+ * @license         http://www.gnu.org/licenses/gpl.html
+ * @platform        WebsiteBaker 2.8.x
+ * @requirements    PHP 5.2.2 and higher
+ * @version         $Id: info.php 1389 2011-01-16 12:39:50Z FrankH $
+ * @filesource		$HeadURL: http://svn.websitebaker2.org/branches/2.8.x/wb/modules/code/info.php $
+ * @lastmodified    $Date: 2011-01-16 13:39:50 +0100 (So, 16. Jan 2011) $
+ *
+*/
+
+$module_directory	= 'code';
+$module_name		= 'Code';
+$module_function	= 'page';
+$module_version		= '2.8.2';
+$module_platform	= '2.7 | 2.8.x';
+$module_author		= 'Ryan Djurovich';
+$module_license		= 'GNU General Public License';
+$module_description	= 'This module allows you to execute PHP commands (limit access to users you trust!!)';
+
 ?>
\ No newline at end of file

Property changes on: branches/2.8.x/wb/modules/code/info.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1,4 +1,2 ##
-Id
-Revision
-HeadURL
-Date
\ No newline at end of property
+svn:eol-stylenativesvn:keywordsDate Revision Id HeadURLsvn:mime-type
+text/plain
\ No newline at end of property
Index: branches/2.8.x/wb/modules/code/save.php
===================================================================
--- branches/2.8.x/wb/modules/code/save.php	(revision 1456)
+++ branches/2.8.x/wb/modules/code/save.php	(revision 1457)
@@ -10,23 +10,27 @@
  * @license         http://www.gnu.org/licenses/gpl.html
  * @platform        WebsiteBaker 2.8.x
  * @requirements    PHP 5.2.2 and higher
- * @version         $Id$
- * @filesource		$HeadURL$
- * @lastmodified    $Date$
+ * @version         $Id: save.php 1425 2011-02-03 23:16:12Z Luisehahne $
+ * @filesource		$HeadURL: http://svn.websitebaker2.org/branches/2.8.x/wb/modules/code/save.php $
+ * @lastmodified    $Date: 2011-02-04 00:16:12 +0100 (Fr, 04. Feb 2011) $
  *
  */
 
 require('../../config.php');
 
+// suppress to print the header, so no new FTAN will be set
+$admin_header = false;
+// Tells script to update when this page was last updated
+$update_when_modified = true;
 // Include WB admin wrapper script
-$update_when_modified = true; // Tells script to update when this page was last updated
 require(WB_PATH.'/modules/admin.php');
 
 if (!$admin->checkFTAN())
 {
+	$admin->print_header();
 	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id);
-	exit();
 }
+$admin->print_header();
 
 // Update the mod_wysiwygs table with the contents
 if(isset($_POST['content'])) {

Property changes on: branches/2.8.x/wb/modules/code/save.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1,4 +1,2 ##
-Id
-Revision
-HeadURL
-Date
\ No newline at end of property
+svn:eol-stylenativesvn:keywordsDate Revision Id HeadURLsvn:mime-type
+text/plain
\ No newline at end of property
Index: branches/2.8.x/wb/modules/code/languages/NL.php
===================================================================
--- branches/2.8.x/wb/modules/code/languages/NL.php	(revision 1456)
+++ branches/2.8.x/wb/modules/code/languages/NL.php	(revision 1457)
@@ -1,6 +1,6 @@
 <?php
 
-// $Id$
+// $Id: NL.php 915 2009-01-21 19:27:01Z Ruebenwurzel $
 
 /*
 

Property changes on: branches/2.8.x/wb/modules/code/languages/NL.php
___________________________________________________________________
Modified: svn:keywords
## -1 +1,2 ##
-Id
\ No newline at end of property
+svn:eol-stylenativesvn:keywordsDate Revision Id HeadURLsvn:mime-type
+text/plain
\ No newline at end of property
Index: branches/2.8.x/wb/modules/code/languages/NO.php
===================================================================
--- branches/2.8.x/wb/modules/code/languages/NO.php	(revision 1456)
+++ branches/2.8.x/wb/modules/code/languages/NO.php	(revision 1457)
@@ -1,6 +1,6 @@
 <?php
 
-// $Id$
+// $Id: NO.php 966 2009-04-17 12:41:33Z Ruebenwurzel $
 
 /*
 

Property changes on: branches/2.8.x/wb/modules/code/languages/NO.php
___________________________________________________________________
Modified: svn:keywords
## -1 +1,2 ##
-Id
\ No newline at end of property
+svn:eol-stylenativesvn:keywordsDate Revision Id HeadURLsvn:mime-type
+text/plain
\ No newline at end of property
Index: branches/2.8.x/wb/modules/code/languages/DA.php
===================================================================
--- branches/2.8.x/wb/modules/code/languages/DA.php	(revision 1456)
+++ branches/2.8.x/wb/modules/code/languages/DA.php	(revision 1457)
@@ -1,6 +1,6 @@
 <?php
 
-// $Id$
+// $Id: DA.php 1097 2009-07-27 06:58:07Z Ruebenwurzel $
 
 /*
 

Property changes on: branches/2.8.x/wb/modules/code/languages/DA.php
___________________________________________________________________
Modified: svn:keywords
## -1 +1,2 ##
-Id
\ No newline at end of property
+svn:eol-stylenativesvn:keywordsDate Revision Id HeadURLsvn:mime-type
+text/plain
\ No newline at end of property
Index: branches/2.8.x/wb/modules/code/languages/RU.php
===================================================================
--- branches/2.8.x/wb/modules/code/languages/RU.php	(revision 1456)
+++ branches/2.8.x/wb/modules/code/languages/RU.php	(revision 1457)
@@ -1,6 +1,6 @@
 <?php
 
-// $Id$
+// $Id: RU.php 915 2009-01-21 19:27:01Z Ruebenwurzel $
 
 /*
 

Property changes on: branches/2.8.x/wb/modules/code/languages/RU.php
___________________________________________________________________
Modified: svn:keywords
## -1 +1,2 ##
-Id
\ No newline at end of property
+svn:eol-stylenativesvn:keywordsDate Revision Id HeadURLsvn:mime-type
+text/plain
\ No newline at end of property
Index: branches/2.8.x/wb/modules/code/languages/FR.php
===================================================================
--- branches/2.8.x/wb/modules/code/languages/FR.php	(revision 1456)
+++ branches/2.8.x/wb/modules/code/languages/FR.php	(revision 1457)
@@ -1,6 +1,6 @@
 <?php
 
-// $Id$
+// $Id: FR.php 961 2009-04-13 12:05:04Z Ruebenwurzel $
 
 /*
 

Property changes on: branches/2.8.x/wb/modules/code/languages/FR.php
___________________________________________________________________
Modified: svn:keywords
## -1 +1,2 ##
-Id
\ No newline at end of property
+svn:eol-stylenativesvn:keywordsDate Revision Id HeadURLsvn:mime-type
+text/plain
\ No newline at end of property
Index: branches/2.8.x/wb/modules/code/languages/index.php
===================================================================
--- branches/2.8.x/wb/modules/code/languages/index.php	(revision 1456)
+++ branches/2.8.x/wb/modules/code/languages/index.php	(revision 1457)
@@ -1,6 +1,6 @@
 <?php
 
-// $Id$
+// $Id: index.php 915 2009-01-21 19:27:01Z Ruebenwurzel $
 
 /*
 

Property changes on: branches/2.8.x/wb/modules/code/languages/index.php
___________________________________________________________________
Modified: svn:keywords
## -1 +1,2 ##
-Id
\ No newline at end of property
+svn:eol-stylenativesvn:keywordsDate Revision Id HeadURLsvn:mime-type
+text/plain
\ No newline at end of property
Index: branches/2.8.x/wb/modules/code/languages/DE.php
===================================================================
--- branches/2.8.x/wb/modules/code/languages/DE.php	(revision 1456)
+++ branches/2.8.x/wb/modules/code/languages/DE.php	(revision 1457)
@@ -1,6 +1,6 @@
 <?php
 
-// $Id$
+// $Id: DE.php 915 2009-01-21 19:27:01Z Ruebenwurzel $
 
 /*
 

Property changes on: branches/2.8.x/wb/modules/code/languages/DE.php
___________________________________________________________________
Modified: svn:keywords
## -1 +1,2 ##
-Id
\ No newline at end of property
+svn:eol-stylenativesvn:keywordsDate Revision Id HeadURLsvn:mime-type
+text/plain
\ No newline at end of property
Index: branches/2.8.x/wb/modules/code/delete.php
===================================================================
--- branches/2.8.x/wb/modules/code/delete.php	(revision 1456)
+++ branches/2.8.x/wb/modules/code/delete.php	(revision 1457)
@@ -1,6 +1,6 @@
 <?php
 
-// $Id$
+// $Id: delete.php 1420 2011-01-26 17:43:56Z Luisehahne $
 
 /*
 

Property changes on: branches/2.8.x/wb/modules/code/delete.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1 +1,2 ##
-Id
\ No newline at end of property
+svn:eol-stylenativesvn:keywordsDate Revision Id HeadURLsvn:mime-type
+text/plain
\ No newline at end of property
Index: branches/2.8.x/wb/modules/code/install.php
===================================================================
--- branches/2.8.x/wb/modules/code/install.php	(revision 1456)
+++ branches/2.8.x/wb/modules/code/install.php	(revision 1457)
@@ -1,63 +1,63 @@
-<?php
-/**
- *
- * @category        modules
- * @package         code
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
- * @copyright       2009-2011, Website Baker Org. e.V.
- * @link			http://www.websitebaker2.org/
- * @license         http://www.gnu.org/licenses/gpl.html
- * @platform        WebsiteBaker 2.8.x
- * @requirements    PHP 5.2.2 and higher
- * @version      	$Id$
- * @filesource		$HeadURL$
- * @lastmodified    $Date$
- *
- */
-
-if(defined('WB_URL'))
-{
-	
-	// Create table
-	//$database->query("DROP TABLE IF EXISTS `".TABLE_PREFIX."mod_code`");
-	$mod_code = 'CREATE TABLE IF NOT EXISTS `'.TABLE_PREFIX.'mod_code` ('
-		. ' `section_id` INT NOT NULL DEFAULT \'0\','
-		. ' `page_id` INT NOT NULL DEFAULT \'0\','
-		. ' `content` TEXT NOT NULL,'
-		. ' PRIMARY KEY ( `section_id` )'
-		. ' )';
-	$database->query($mod_code);
-
-    $mod_search = "SELECT * FROM ".TABLE_PREFIX."search  WHERE value = 'code'";
-    $insert_search = $database->query($mod_search);
-    if( $insert_search->numRows() == 0 )
-    {
-    	// Insert info into the search table
-    	// Module query info
-    	$field_info = array();
-    	$field_info['page_id'] = 'page_id';
-    	$field_info['title'] = 'page_title';
-    	$field_info['link'] = 'link';
-    	$field_info['description'] = 'description';
-    	$field_info['modified_when'] = 'modified_when';
-    	$field_info['modified_by'] = 'modified_by';
-    	$field_info = serialize($field_info);
-    	$database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('module', 'code', '$field_info')");
-    	// Query start
-    	$query_start_code = "SELECT [TP]pages.page_id, [TP]pages.page_title,	[TP]pages.link, [TP]pages.description, [TP]pages.modified_when, [TP]pages.modified_by	FROM [TP]mod_code, [TP]pages WHERE ";
-    	$database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('query_start', '$query_start_code', 'code')");
-    	// Query body
-    	$query_body_code = " [TP]pages.page_id = [TP]mod_code.page_id AND [TP]mod_code.content [O] \'[W][STRING][W]\' AND [TP]pages.searching = \'1\'";
-    	$database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('query_body', '$query_body_code', 'code')");
-    	// Query end
-    	$query_end_code = "";
-    	$database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('query_end', '$query_end_code', 'code')");
-
-    	// Insert blank row (there needs to be at least on row for the search to work)
-    	$database->query("INSERT INTO ".TABLE_PREFIX."mod_code (page_id,section_id) VALUES ('0','0')");
-
-    }
-}
-
+<?php
+/**
+ *
+ * @category        modules
+ * @package         code
+ * @author          WebsiteBaker Project
+ * @copyright       2004-2009, Ryan Djurovich
+ * @copyright       2009-2011, Website Baker Org. e.V.
+ * @link			http://www.websitebaker2.org/
+ * @license         http://www.gnu.org/licenses/gpl.html
+ * @platform        WebsiteBaker 2.8.x
+ * @requirements    PHP 5.2.2 and higher
+ * @version      	$Id: install.php 1374 2011-01-10 12:21:47Z Luisehahne $
+ * @filesource		$HeadURL: http://svn.websitebaker2.org/branches/2.8.x/wb/modules/code/install.php $
+ * @lastmodified    $Date: 2011-01-10 13:21:47 +0100 (Mo, 10. Jan 2011) $
+ *
+ */
+
+if(defined('WB_URL'))
+{
+	
+	// Create table
+	//$database->query("DROP TABLE IF EXISTS `".TABLE_PREFIX."mod_code`");
+	$mod_code = 'CREATE TABLE IF NOT EXISTS `'.TABLE_PREFIX.'mod_code` ('
+		. ' `section_id` INT NOT NULL DEFAULT \'0\','
+		. ' `page_id` INT NOT NULL DEFAULT \'0\','
+		. ' `content` TEXT NOT NULL,'
+		. ' PRIMARY KEY ( `section_id` )'
+		. ' )';
+	$database->query($mod_code);
+
+    $mod_search = "SELECT * FROM ".TABLE_PREFIX."search  WHERE value = 'code'";
+    $insert_search = $database->query($mod_search);
+    if( $insert_search->numRows() == 0 )
+    {
+    	// Insert info into the search table
+    	// Module query info
+    	$field_info = array();
+    	$field_info['page_id'] = 'page_id';
+    	$field_info['title'] = 'page_title';
+    	$field_info['link'] = 'link';
+    	$field_info['description'] = 'description';
+    	$field_info['modified_when'] = 'modified_when';
+    	$field_info['modified_by'] = 'modified_by';
+    	$field_info = serialize($field_info);
+    	$database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('module', 'code', '$field_info')");
+    	// Query start
+    	$query_start_code = "SELECT [TP]pages.page_id, [TP]pages.page_title,	[TP]pages.link, [TP]pages.description, [TP]pages.modified_when, [TP]pages.modified_by	FROM [TP]mod_code, [TP]pages WHERE ";
+    	$database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('query_start', '$query_start_code', 'code')");
+    	// Query body
+    	$query_body_code = " [TP]pages.page_id = [TP]mod_code.page_id AND [TP]mod_code.content [O] \'[W][STRING][W]\' AND [TP]pages.searching = \'1\'";
+    	$database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('query_body', '$query_body_code', 'code')");
+    	// Query end
+    	$query_end_code = "";
+    	$database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('query_end', '$query_end_code', 'code')");
+
+    	// Insert blank row (there needs to be at least on row for the search to work)
+    	$database->query("INSERT INTO ".TABLE_PREFIX."mod_code (page_id,section_id) VALUES ('0','0')");
+
+    }
+}
+
 ?>
\ No newline at end of file

Property changes on: branches/2.8.x/wb/modules/code/install.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1,4 +1,2 ##
-Id
-Revision
-HeadURL
-Date
\ No newline at end of property
+svn:eol-stylenativesvn:keywordsDate Revision Id HeadURLsvn:mime-type
+text/plain
\ No newline at end of property
Index: branches/2.8.x/wb/modules/code/index.php
===================================================================
--- branches/2.8.x/wb/modules/code/index.php	(revision 1456)
+++ branches/2.8.x/wb/modules/code/index.php	(revision 1457)
@@ -1,21 +1,21 @@
-<?php
-/**
- *
- * @category        modules
- * @package         code
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
- * @copyright       2009-2011, Website Baker Org. e.V.
- * @link			http://www.websitebaker2.org/
- * @license         http://www.gnu.org/licenses/gpl.html
- * @platform        WebsiteBaker 2.8.x
- * @requirements    PHP 5.2.2 and higher
- * @version         $Id$
- * @filesource		$HeadURL$
- * @lastmodified    $Date$
- *
-*/
-
-header('Location: ../index.php');
-
+<?php
+/**
+ *
+ * @category        modules
+ * @package         code
+ * @author          WebsiteBaker Project
+ * @copyright       2004-2009, Ryan Djurovich
+ * @copyright       2009-2011, Website Baker Org. e.V.
+ * @link			http://www.websitebaker2.org/
+ * @license         http://www.gnu.org/licenses/gpl.html
+ * @platform        WebsiteBaker 2.8.x
+ * @requirements    PHP 5.2.2 and higher
+ * @version         $Id: index.php 1374 2011-01-10 12:21:47Z Luisehahne $
+ * @filesource		$HeadURL: http://svn.websitebaker2.org/branches/2.8.x/wb/modules/code/index.php $
+ * @lastmodified    $Date: 2011-01-10 13:21:47 +0100 (Mo, 10. Jan 2011) $
+ *
+*/
+
+header('Location: ../index.php');
+
 ?>
\ No newline at end of file

Property changes on: branches/2.8.x/wb/modules/code/index.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1,4 +1,2 ##
-Id
-Revision
-HeadURL
-Date
\ No newline at end of property
+svn:eol-stylenativesvn:keywordsDate Revision Id HeadURLsvn:mime-type
+text/plain
\ No newline at end of property
Index: branches/2.8.x/wb/modules/code/modify.php
===================================================================
--- branches/2.8.x/wb/modules/code/modify.php	(revision 1456)
+++ branches/2.8.x/wb/modules/code/modify.php	(revision 1457)
@@ -10,9 +10,9 @@
  * @license         http://www.gnu.org/licenses/gpl.html
  * @platform        WebsiteBaker 2.8.x
  * @requirements    PHP 5.2.2 and higher
- * @version         $Id$
- * @filesource		$HeadURL$
- * @lastmodified    $Date$
+ * @version         $Id: modify.php 1428 2011-02-07 04:55:31Z Luisehahne $
+ * @filesource		$HeadURL: http://svn.websitebaker2.org/branches/2.8.x/wb/modules/code/modify.php $
+ * @lastmodified    $Date: 2011-02-07 05:55:31 +0100 (Mo, 07. Feb 2011) $
  *
  */
 

Property changes on: branches/2.8.x/wb/modules/code/modify.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1,4 +1,2 ##
-Id
-Revision
-HeadURL
-Date
\ No newline at end of property
+svn:eol-stylenativesvn:keywordsDate Revision Id HeadURLsvn:mime-type
+text/plain
\ No newline at end of property
Index: branches/2.8.x/wb/modules/code/upgrade.php
===================================================================
--- branches/2.8.x/wb/modules/code/upgrade.php	(revision 1456)
+++ branches/2.8.x/wb/modules/code/upgrade.php	(revision 1457)
@@ -11,9 +11,9 @@
  * @license         http://www.gnu.org/licenses/gpl.html
  * @platform        WebsiteBaker 2.8.x
  * @requirements    PHP 5.2.2 and higher
- * @version         $Id$
- * @filesource      $HeadURL$
- * @lastmodified    $Date$
+ * @version         $Id: upgrade.php 1428 2011-02-07 04:55:31Z Luisehahne $
+ * @filesource      $HeadURL: http://svn.websitebaker2.org/branches/2.8.x/wb/modules/code/upgrade.php $
+ * @lastmodified    $Date: 2011-02-07 05:55:31 +0100 (Mo, 07. Feb 2011) $
  *
  */
 

Property changes on: branches/2.8.x/wb/modules/code/upgrade.php
___________________________________________________________________
Modified: svn:keywords
## -1 +1,2 ##
-Date Revision Id HeadURL
\ No newline at end of property
+svn:eol-stylenativesvn:keywordsDate Revision Id HeadURLsvn:mime-type
+text/plain
\ No newline at end of property
Index: branches/2.8.x/wb/modules/code/add.php
===================================================================
--- branches/2.8.x/wb/modules/code/add.php	(revision 1456)
+++ branches/2.8.x/wb/modules/code/add.php	(revision 1457)
@@ -1,6 +1,6 @@
 <?php
 
-// $Id$
+// $Id: add.php 1420 2011-01-26 17:43:56Z Luisehahne $
 
 /*
 

Property changes on: branches/2.8.x/wb/modules/code/add.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: svn:keywords
## -1 +1,2 ##
-Id
\ No newline at end of property
+svn:eol-stylenativesvn:keywordsDate Revision Id HeadURLsvn:mime-type
+text/plain
\ No newline at end of property
Index: branches/2.8.x/wb/modules/fckeditor/wb_config/wb_fcktemplates.xml
===================================================================
--- branches/2.8.x/wb/modules/fckeditor/wb_config/wb_fcktemplates.xml	(revision 1456)
+++ branches/2.8.x/wb/modules/fckeditor/wb_config/wb_fcktemplates.xml	(revision 1457)
@@ -25,16 +25,15 @@
  * See FCKConfig.TemplatesXmlPath in the configuration file.
 -->
 <Templates imagesBasePath="fck_template/images/">
-	<Template title="Rechtliche Hinweise" image="template1.gif">
-		<Description>Rechtliche Hinweise Links</Description>
+	<Template title="Import Block3" image="template1.gif">
+		<Description>Import Block3</Description>
 		<Html>
 			<![CDATA[
-                <div class="recht">
-                    <p><b>Rechtliche Hinweise</b><br />
-                    1. Externe Links ( <a class="next" onclick="window.open(this.href,'','resizable=yes,location=no,menubar=no,scrollbars=yes,status=yes,toolbar=no,fullscreen=no,dependent=yes,width=600,height=300,left=150,top=150,status'); return false" href="http://www.disclaimer.de/disclaimer.htm"><font color="#810081">Bitte Disclaimer-Haftungsausschluss lesen</font></a> ) <br />
-                    Die Inhalte externer Links werden nicht gepr&uuml;ft. Sie unterliegen der Haftung der jeweiligen Anbieter.<br />
-                    &nbsp;</p>
-                </div>
+				<div class="block3">
+				<div class="text3 rounded">
+				<div>[[showrandomwysiwyg?section=206,207,208,209,628]]</div>
+				</div>
+				</div>
             ]]>
 		</Html>
 	</Template>
@@ -42,9 +41,9 @@
 		<Description>One main image with a title and text that surround the image.</Description>
 		<Html>
 			<![CDATA[
-				<img style="MARGIN-RIGHT: 10px" height="100" alt="" width="100" align="left"/>
+				<div><img align="left" width="61" vspace="2" hspace="10" height="57" alt="" src="http://staging.websitebaker.org/start/media/common/backend.png" /></div>
 				<h3>Type the title here</h3>
-				<p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tatio</p>
+				<p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tatio</p>			
 			]]>
 		</Html>
 	</Template>
Index: branches/2.8.x/wb/modules/fckeditor/wb_config/wb_fckconfig.js
===================================================================
--- branches/2.8.x/wb/modules/fckeditor/wb_config/wb_fckconfig.js	(revision 1456)
+++ branches/2.8.x/wb/modules/fckeditor/wb_config/wb_fckconfig.js	(revision 1457)
@@ -104,7 +104,7 @@
    FCKConfig.ToolbarSets["WBToolbar"] = [
 	['Source','DocProps','-','NewPage','Preview','-','Templates'],
 	['Cut','Copy','Paste','PasteText','PasteWord','-','Print','SpellCheck'],
-    ['FitWindow','ShowBlocks', '-', /* 'SyntaxHighLight2', */ /* 'flvPlayer', */ '-','About'],
+    ['FitWindow','ShowBlocks', '-', 'SyntaxHighLight2',  /**/ /* 'flvPlayer', */ '-','About'],
 	'/',
 	['Form','Checkbox','Radio','TextField','Textarea','Select','Button','ImageButton','HiddenField'],
     ['TextColor','BGColor'],
@@ -168,7 +168,7 @@
    CSS definition file and place it as "editor.css" in your template folder.
    All styles will automatically be updated and used with the FCK editor.
 
-   If you don´t want to put custom "editor.css" files into your templates folder, you can
+   If you don�t want to put custom "editor.css" files into your templates folder, you can
    try the other approach introduced below:
    
    copy all CSS definitions of your template into file: /my_config/my_fckeditorarea.css
@@ -178,7 +178,7 @@
    Via file (/my_config/my_fckstyles.xml) you can define additional styles for default
    elements. Use this option, if you want to display conditional styles only if a special
    HTML element is selected (e.g. after selecting an <img> element, the style menu will
-   provide additional elements like align=left, align=right, which don´t show up for other
+   provide additional elements like align=left, align=right, which don�t show up for other
    elements like <p>
 
    CSS definitions declared in the XML file are realised as INLINE styles. If you want avoid
Index: branches/2.8.x/wb/modules/droplets/delete_droplet.php
===================================================================
--- branches/2.8.x/wb/modules/droplets/delete_droplet.php	(revision 1456)
+++ branches/2.8.x/wb/modules/droplets/delete_droplet.php	(revision 1457)
@@ -1,57 +1,57 @@
-<?php
-/**
- *
- * @category        module
- * @package         droplet
- * @author          Ruud Eisinga (Ruud) John (PCWacht)
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
- * @copyright       2009-2011, Website Baker Org. e.V.
- * @link			http://www.websitebaker2.org/
- * @license         http://www.gnu.org/licenses/gpl.html
- * @platform        WebsiteBaker 2.8.x
- * @requirements    PHP 5.2.2 and higher
- * @version         $Id$
- * @filesource		$HeadURL$
- * @lastmodified    $Date$
- *
- */
-
-require('../../config.php');
-
-// Include WB admin wrapper script
-require_once(WB_PATH.'/framework/class.admin.php');
-require_once(WB_PATH.'/framework/functions.php');
-
-// check website baker platform (with WB 2.7, Admin-Tools were moved out of settings dialogue)
-if(file_exists(ADMIN_PATH .'/admintools/tool.php')) {
-	$admintool_link = ADMIN_URL .'/admintools/index.php';
-	$module_edit_link = ADMIN_URL .'/admintools/tool.php?tool=droplets';
-	$admin = new admin('admintools', 'admintools');
-} else {
-	$admintool_link = ADMIN_URL .'/settings/index.php?advanced=yes#administration_tools"';
-	$module_edit_link = ADMIN_URL .'/settings/tool.php?tool=droplets';
-	$admin = new admin('Settings', 'settings_advanced');
-}
-
-// Get id
-$droplet_id = $admin->checkIDKEY('droplet_id', false, 'GET');
-if (!$droplet_id) {
- $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL);
- exit();
-}
-
-// Delete droplet
-$database->query("DELETE FROM ".TABLE_PREFIX."mod_droplets WHERE id = '$droplet_id' LIMIT 1");
-
-// Check if there is a db error, otherwise say successful
-if($database->is_error()) {
-	$admin->print_error($database->get_error(), WB_URL.'/modules/droplets/modify_droplet.php?droplet_id='.$droplet_id);
-} else {
-    $admin->print_success($TEXT['SUCCESS'], $module_edit_link);
-}
-
-// Print admin footer
-$admin->print_footer();
-
+<?php
+/**
+ *
+ * @category        module
+ * @package         droplet
+ * @author          Ruud Eisinga (Ruud) John (PCWacht)
+ * @author          WebsiteBaker Project
+ * @copyright       2004-2009, Ryan Djurovich
+ * @copyright       2009-2011, Website Baker Org. e.V.
+ * @link			http://www.websitebaker2.org/
+ * @license         http://www.gnu.org/licenses/gpl.html
+ * @platform        WebsiteBaker 2.8.x
+ * @requirements    PHP 5.2.2 and higher
+ * @version         $Id$
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
+ *
+ */
+
+require('../../config.php');
+
+// Include WB admin wrapper script
+require_once(WB_PATH.'/framework/class.admin.php');
+require_once(WB_PATH.'/framework/functions.php');
+
+// check website baker platform (with WB 2.7, Admin-Tools were moved out of settings dialogue)
+if(file_exists(ADMIN_PATH .'/admintools/tool.php')) {
+	$admintool_link = ADMIN_URL .'/admintools/index.php';
+	$module_edit_link = ADMIN_URL .'/admintools/tool.php?tool=droplets';
+	$admin = new admin('admintools', 'admintools');
+} else {
+	$admintool_link = ADMIN_URL .'/settings/index.php?advanced=yes#administration_tools"';
+	$module_edit_link = ADMIN_URL .'/settings/tool.php?tool=droplets';
+	$admin = new admin('Settings', 'settings_advanced');
+}
+
+// Get id
+$droplet_id = $admin->checkIDKEY('droplet_id', false, 'GET');
+if (!$droplet_id) {
+ $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL);
+ exit();
+}
+
+// Delete droplet
+$database->query("DELETE FROM ".TABLE_PREFIX."mod_droplets WHERE id = '$droplet_id' LIMIT 1");
+
+// Check if there is a db error, otherwise say successful
+if($database->is_error()) {
+	$admin->print_error($database->get_error(), WB_URL.'/modules/droplets/modify_droplet.php?droplet_id='.$droplet_id);
+} else {
+    $admin->print_success($TEXT['SUCCESS'], $module_edit_link);
+}
+
+// Print admin footer
+$admin->print_footer();
+
 ?>
\ No newline at end of file

Property changes on: branches/2.8.x/wb/modules/droplets/delete_droplet.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/droplets/info.php
===================================================================
--- branches/2.8.x/wb/modules/droplets/info.php	(revision 1456)
+++ branches/2.8.x/wb/modules/droplets/info.php	(revision 1457)
@@ -1,31 +1,31 @@
-<?php
-/**
- *
- * @category        module
- * @package         droplet
- * @author          Ruud Eisinga (Ruud) John (PCWacht)
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
- * @copyright       2009-2011, Website Baker Org. e.V.
- * @link			http://www.websitebaker2.org/
- * @license         http://www.gnu.org/licenses/gpl.html
- * @platform        WebsiteBaker 2.8.x
- * @requirements    PHP 5.2.2 and higher
- * @version         $Id$
- * @filesource		$HeadURL$
- * @lastmodified    $Date$
- *
- */
-
-$module_directory = 'droplets';
-$module_name = 'Droplets';
-$module_function = 'tool';
-$module_version = '1.0.4';
-$module_platform = '2.8.x';
-$module_author = 'Ruud and pcwacht';
-$module_license = 'GNU General Public License';
-$module_description = 'This tool allows you to manage your local Droplets.';
-
-$module_home = 'http://www.websitebakers.com/pages/droplets/about-droplets.php';
-$module_guid = '9F2AC2DF-C3E1-4E15-BA4C-2A86E37FE6E5';
+<?php
+/**
+ *
+ * @category        module
+ * @package         droplet
+ * @author          Ruud Eisinga (Ruud) John (PCWacht)
+ * @author          WebsiteBaker Project
+ * @copyright       2004-2009, Ryan Djurovich
+ * @copyright       2009-2011, Website Baker Org. e.V.
+ * @link			http://www.websitebaker2.org/
+ * @license         http://www.gnu.org/licenses/gpl.html
+ * @platform        WebsiteBaker 2.8.x
+ * @requirements    PHP 5.2.2 and higher
+ * @version         $Id$
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
+ *
+ */
+
+$module_directory = 'droplets';
+$module_name = 'Droplets';
+$module_function = 'tool';
+$module_version = '1.0.5';
+$module_platform = '2.8.x';
+$module_author = 'Ruud and pcwacht';
+$module_license = 'GNU General Public License';
+$module_description = 'This tool allows you to manage your local Droplets.';
+
+$module_home = 'http://www.websitebakers.com/pages/droplets/about-droplets.php';
+$module_guid = '9F2AC2DF-C3E1-4E15-BA4C-2A86E37FE6E5';
 ?>
\ No newline at end of file

Property changes on: branches/2.8.x/wb/modules/droplets/info.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/droplets/droplets.php
===================================================================
--- branches/2.8.x/wb/modules/droplets/droplets.php	(revision 1456)
+++ branches/2.8.x/wb/modules/droplets/droplets.php	(revision 1457)

Property changes on: branches/2.8.x/wb/modules/droplets/droplets.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/droplets/install.php
===================================================================
--- branches/2.8.x/wb/modules/droplets/install.php	(revision 1456)
+++ branches/2.8.x/wb/modules/droplets/install.php	(revision 1457)

Property changes on: branches/2.8.x/wb/modules/droplets/install.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/droplets/index.php
===================================================================
--- branches/2.8.x/wb/modules/droplets/index.php	(revision 1456)
+++ branches/2.8.x/wb/modules/droplets/index.php	(revision 1457)
@@ -1,22 +1,22 @@
-<?php
-/**
- *
- * @category        module
- * @package         droplet
- * @author          Ruud Eisinga (Ruud) John (PCWacht)
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
- * @copyright       2009-2011, Website Baker Org. e.V.
- * @link			http://www.websitebaker2.org/
- * @license         http://www.gnu.org/licenses/gpl.html
- * @platform        WebsiteBaker 2.8.x
- * @requirements    PHP 5.2.2 and higher
- * @version         $Id$
- * @filesource		$HeadURL$
- * @lastmodified    $Date$
- *
- */
-
-header('Location: ../index.php');
-
+<?php
+/**
+ *
+ * @category        module
+ * @package         droplet
+ * @author          Ruud Eisinga (Ruud) John (PCWacht)
+ * @author          WebsiteBaker Project
+ * @copyright       2004-2009, Ryan Djurovich
+ * @copyright       2009-2011, Website Baker Org. e.V.
+ * @link			http://www.websitebaker2.org/
+ * @license         http://www.gnu.org/licenses/gpl.html
+ * @platform        WebsiteBaker 2.8.x
+ * @requirements    PHP 5.2.2 and higher
+ * @version         $Id$
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
+ *
+ */
+
+header('Location: ../index.php');
+
 ?>
\ No newline at end of file

Property changes on: branches/2.8.x/wb/modules/droplets/index.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/droplets/uninstall.php
===================================================================
--- branches/2.8.x/wb/modules/droplets/uninstall.php	(revision 1456)
+++ branches/2.8.x/wb/modules/droplets/uninstall.php	(revision 1457)
@@ -1,26 +1,26 @@
-<?php
-/**
- *
- * @category        module
- * @package         droplet
- * @author          Ruud Eisinga (Ruud) John (PCWacht)
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
- * @copyright       2009-2011, Website Baker Org. e.V.
- * @link			http://www.websitebaker2.org/
- * @license         http://www.gnu.org/licenses/gpl.html
- * @platform        WebsiteBaker 2.8.x
- * @requirements    PHP 5.2.2 and higher
- * @version         $Id$
- * @filesource		$HeadURL$
- * @lastmodified    $Date$
- *
- */
-
-// prevent this file from being accessed directly
-if(!defined('WB_PATH')) die(header('Location: ../index.php'));
-
-$table = TABLE_PREFIX .'mod_droplets';
-$database->query("DROP TABLE IF EXISTS `$table`");
-
+<?php
+/**
+ *
+ * @category        module
+ * @package         droplet
+ * @author          Ruud Eisinga (Ruud) John (PCWacht)
+ * @author          WebsiteBaker Project
+ * @copyright       2004-2009, Ryan Djurovich
+ * @copyright       2009-2011, Website Baker Org. e.V.
+ * @link			http://www.websitebaker2.org/
+ * @license         http://www.gnu.org/licenses/gpl.html
+ * @platform        WebsiteBaker 2.8.x
+ * @requirements    PHP 5.2.2 and higher
+ * @version         $Id$
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
+ *
+ */
+
+// prevent this file from being accessed directly
+if(!defined('WB_PATH')) die(header('Location: ../index.php'));
+
+$table = TABLE_PREFIX .'mod_droplets';
+$database->query("DROP TABLE IF EXISTS `$table`");
+
 ?>
\ No newline at end of file

Property changes on: branches/2.8.x/wb/modules/droplets/uninstall.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/droplets/tool.php
===================================================================
--- branches/2.8.x/wb/modules/droplets/tool.php	(revision 1456)
+++ branches/2.8.x/wb/modules/droplets/tool.php	(revision 1457)
@@ -38,7 +38,9 @@
 
 // Get userid for showing admin only droplets or not
 $loggedin_user = $admin->get_user_id();
-	
+$loggedin_group = $admin->get_groups_id();
+$admin_user = ( ($admin->get_home_folder() == '') && ($admin->ami_group_member('1') ) || ($loggedin_user == '1'));
+
 // And... action
 $admintool_url = ADMIN_URL .'/admintools/index.php';
 
@@ -47,7 +49,7 @@
 ?>
 
 <br />
-<table cellpadding="0" cellspacing="0" border="0" width="100%">
+<table summary="" cellpadding="0" cellspacing="0" border="0" width="100%">
 <tr>
 	<td valign="bottom" width="50%">
 		<button class="add" type="button" name="add_droplet" onclick="javascript: window.location = '<?php echo WB_URL; ?>/modules/droplets/add_droplet.php';"><?php echo $TEXT['ADD'].' '.$DR_TEXT['DROPLETS']; ?></button>	
@@ -58,7 +60,7 @@
 	<td valign="top" width="50%" align="right">
 		<a href="#" onclick="javascript: window.open('<?php echo WB_URL; ?>/modules/droplets/readme/<?php echo $DR_TEXT['README']; ?>','helpwindow','width=700,height=550,directories=no,location=no,menubar=no,scrollbars=yes,status=no,toolbar=no,resizable=yes');"><?php echo $DR_TEXT['HELP']; ?></a>
 		<br /><br />
-		<a href="#" onclick="javascript: window.location = '<?php echo WB_URL; ?>/modules/droplets/backup_droplets.php?id=<?php echo $admin->getIDKEY(999) . '\';">' .$DR_TEXT['BACKUP']; ?></a>
+		<a href="#" onclick="javascript: window.location = '<?php echo WB_URL; ?>/modules/droplets/backup_droplets.php?id=<?php echo $admin->getIDKEY(999); ?>'"><?php echo $DR_TEXT['BACKUP']; ?></a>
 	</td>
 </tr>
 </table>
@@ -66,7 +68,8 @@
 
 <h2><?php echo $TEXT['MODIFY'].'/'.$TEXT['DELETE'].' '.$DR_TEXT['DROPLETS']; ?></h2>
 <?php
-if ($loggedin_user == '1') {
+// if ($loggedin_user == '1') {
+if ($admin_user) {
 	$query_droplets = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_droplets ORDER BY modified_when DESC");
 } else { 
 	$query_droplets = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_droplets WHERE admin_view <> '1' ORDER BY modified_when DESC");
@@ -74,7 +77,7 @@
 $num_droplets = $query_droplets->numRows();
 if($num_droplets > 0) {
 	?>
-	<table class="row_a" border="0" cellspacing="0" cellpadding="3" width="100%">
+	<table summary="" class="row_a" border="0" cellspacing="0" cellpadding="3" width="100%">
 	<thead>
 		<tr>
 			<td width="3%"></td>
@@ -153,4 +156,3 @@
 	$query_droplets = $database->query("SELECT name FROM ".TABLE_PREFIX."mod_droplets WHERE name = '$name'");
 	return ($query_droplets->numRows() == 1);
 }
-?>
\ No newline at end of file

Property changes on: branches/2.8.x/wb/modules/droplets/tool.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/droplets/modify_droplet.php
===================================================================
--- branches/2.8.x/wb/modules/droplets/modify_droplet.php	(revision 1456)
+++ branches/2.8.x/wb/modules/droplets/modify_droplet.php	(revision 1457)

Property changes on: branches/2.8.x/wb/modules/droplets/modify_droplet.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/droplets/add_droplet.php
===================================================================
--- branches/2.8.x/wb/modules/droplets/add_droplet.php	(revision 1456)
+++ branches/2.8.x/wb/modules/droplets/add_droplet.php	(revision 1457)
@@ -1,52 +1,52 @@
-<?php
-/**
- *
- * @category        module
- * @package         droplet
- * @author          Ruud Eisinga (Ruud) John (PCWacht)
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
- * @copyright       2009-2011, Website Baker Org. e.V.
- * @link			http://www.websitebaker2.org/
- * @license         http://www.gnu.org/licenses/gpl.html
- * @platform        WebsiteBaker 2.8.x
- * @requirements    PHP 5.2.2 and higher
- * @version         $Id$
- * @filesource		$HeadURL$
- * @lastmodified    $Date$
- *
- */
-
-require('../../config.php');
-
-require_once(WB_PATH.'/framework/class.admin.php');
-require_once(WB_PATH.'/framework/functions.php');
-$admin = new admin('admintools','admintools',false,false);
-if($admin->get_permission('admintools') == true) {
-	
-	$admintool_link = ADMIN_URL .'/admintools/index.php';
-	$module_edit_link = ADMIN_URL .'/admintools/tool.php?tool=droplets';
-	$admin = new admin('admintools', 'admintools');
-
-	$modified_when = time();
-	$modified_by = $admin->get_user_id();
-
-	// Insert new row into database
-	$database->query("INSERT INTO ".TABLE_PREFIX."mod_droplets (active,modified_when,modified_by) VALUES ('1','$modified_when','$modified_by' )");
-
-	// Get the id
-	$droplet_id = $database->get_one("SELECT LAST_INSERT_ID()");
-
-	// Say that a new record has been added, then redirect to modify page
-	if($database->is_error()) {
-		$admin->print_error($database->get_error(), $module_edit_link);
-	} else {
-		$admin->print_success($TEXT['SUCCESS'], WB_URL.'/modules/droplets/modify_droplet.php?droplet_id='. $admin->getIDKEY($droplet_id));
-	}
-
-	// Print admin footer
-	$admin->print_footer();
-} else {
-	die(header('Location: ../../index.php'));
-} 
+<?php
+/**
+ *
+ * @category        module
+ * @package         droplet
+ * @author          Ruud Eisinga (Ruud) John (PCWacht)
+ * @author          WebsiteBaker Project
+ * @copyright       2004-2009, Ryan Djurovich
+ * @copyright       2009-2011, Website Baker Org. e.V.
+ * @link			http://www.websitebaker2.org/
+ * @license         http://www.gnu.org/licenses/gpl.html
+ * @platform        WebsiteBaker 2.8.x
+ * @requirements    PHP 5.2.2 and higher
+ * @version         $Id$
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
+ *
+ */
+
+require('../../config.php');
+
+require_once(WB_PATH.'/framework/class.admin.php');
+require_once(WB_PATH.'/framework/functions.php');
+$admin = new admin('admintools','admintools',false,false);
+if($admin->get_permission('admintools') == true) {
+	
+	$admintool_link = ADMIN_URL .'/admintools/index.php';
+	$module_edit_link = ADMIN_URL .'/admintools/tool.php?tool=droplets';
+	$admin = new admin('admintools', 'admintools');
+
+	$modified_when = time();
+	$modified_by = $admin->get_user_id();
+
+	// Insert new row into database
+	$database->query("INSERT INTO ".TABLE_PREFIX."mod_droplets (active,modified_when,modified_by) VALUES ('1','$modified_when','$modified_by' )");
+
+	// Get the id
+	$droplet_id = $database->get_one("SELECT LAST_INSERT_ID()");
+
+	// Say that a new record has been added, then redirect to modify page
+	if($database->is_error()) {
+		$admin->print_error($database->get_error(), $module_edit_link);
+	} else {
+		$admin->print_success($TEXT['SUCCESS'], WB_URL.'/modules/droplets/modify_droplet.php?droplet_id='. $admin->getIDKEY($droplet_id));
+	}
+
+	// Print admin footer
+	$admin->print_footer();
+} else {
+	die(header('Location: ../../index.php'));
+} 
 ?>
\ No newline at end of file

Property changes on: branches/2.8.x/wb/modules/droplets/add_droplet.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/droplets/backup_droplets.php
===================================================================
--- branches/2.8.x/wb/modules/droplets/backup_droplets.php	(revision 1456)
+++ branches/2.8.x/wb/modules/droplets/backup_droplets.php	(revision 1457)
@@ -1,93 +1,93 @@
-<?php
-/**
- *
- * @category        module
- * @package         droplet
- * @author          Ruud Eisinga (Ruud) John (PCWacht)
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
- * @copyright       2009-2011, Website Baker Org. e.V.
- * @link			http://www.websitebaker2.org/
- * @license         http://www.gnu.org/licenses/gpl.html
- * @platform        WebsiteBaker 2.8.x
- * @requirements    PHP 5.2.2 and higher
- * @version         $Id$
- * @filesource		$HeadURL$
- * @lastmodified    $Date$
- *
- */
-
-// tool_edit.php
-require_once('../../config.php');
-require_once(WB_PATH.'/framework/class.admin.php');
-
-require_once(WB_PATH.'/framework/functions.php');
-// create admin object depending on platform (admin tools were moved out of settings with WB 2.7)
-$admin = new admin('admintools', 'admintools');
-$admintool_link = ADMIN_URL .'/admintools/index.php';
-$module_edit_link = ADMIN_URL .'/admintools/tool.php?tool=droplets';
-$template_edit_link = ADMIN_URL .'/admintools/tool.php?tool=templateedit';
-
-// protect from CSRF
-$id = $admin->checkIDKEY('id', false, 'GET');
-if (!$id or $id != 999) {
- $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL);
- exit();
-}
-
-?>
-<h4 style="margin: 0; border-bottom: 1px solid #DDD; padding-bottom: 5px;">
-	<a href="<?php echo $admintool_link;?>"><?php echo $HEADING['ADMINISTRATION_TOOLS']; ?></a>
-	->
-	<a href="<?php echo $module_edit_link;?>">Droplets</a>
-</h4>
-<?php
-
-$temp_dir = WB_PATH.'/temp/droplets/';
-$temp_file = '/modules/droplets/backup-droplets.zip';
-// make the temporary working directory
-mkdir($temp_dir);
-$query_droplets = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_droplets ORDER BY modified_when DESC");
-while($droplet = $query_droplets->fetchRow()) {
-	echo 'Saving: '.$droplet["name"].'.php<br />';
-	$sFile = $temp_dir.$droplet["name"].'.php';
-	$fh = fopen($sFile, 'w') ;
-	fwrite($fh, '//:'.$droplet['description']."\n");
-	fwrite($fh, '//:'.str_replace("\n"," ",$droplet['comments'])."\n");
-	fwrite($fh, $droplet['code']);
-	fclose($fh);
-}
-echo '<br />Create archive: backup-droplets.zip<br />';
-
-require_once(WB_PATH.'/include/pclzip/pclzip.lib.php');
-$archive = new PclZip(WB_PATH.$temp_file);
-$file_list = $archive->create($temp_dir, PCLZIP_OPT_REMOVE_ALL_PATH);
-if ($file_list == 0){
-	echo "Packaging error: '.$archive->errorInfo(true).'";
-	die("Error : ".$archive->errorInfo(true));
-}
-else {
-	echo '<br /><br />Backup created - <a href="'.WB_URL.$temp_file.'">Download</a>';
-}
-delete_directory ( $temp_dir );
-$admin->print_footer();
-
-
-function delete_directory($dirname) {
-    if (is_dir($dirname))
-        $dir_handle = opendir($dirname);
-    if (!$dir_handle)
-        return false;
-    while($file = readdir($dir_handle)) {
-        if ($file != "." && $file != "..") {
-            if (!is_dir($dirname."/".$file))
-                unlink($dirname."/".$file);
-            else
-                delete_directory($dirname.'/'.$file);          
-        }
-    }
-    closedir($dir_handle);
-    rmdir($dirname);
-    return true;
-}
+<?php
+/**
+ *
+ * @category        module
+ * @package         droplet
+ * @author          Ruud Eisinga (Ruud) John (PCWacht)
+ * @author          WebsiteBaker Project
+ * @copyright       2004-2009, Ryan Djurovich
+ * @copyright       2009-2011, Website Baker Org. e.V.
+ * @link			http://www.websitebaker2.org/
+ * @license         http://www.gnu.org/licenses/gpl.html
+ * @platform        WebsiteBaker 2.8.x
+ * @requirements    PHP 5.2.2 and higher
+ * @version         $Id$
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
+ *
+ */
+
+// tool_edit.php
+require_once('../../config.php');
+require_once(WB_PATH.'/framework/class.admin.php');
+
+require_once(WB_PATH.'/framework/functions.php');
+// create admin object depending on platform (admin tools were moved out of settings with WB 2.7)
+$admin = new admin('admintools', 'admintools');
+$admintool_link = ADMIN_URL .'/admintools/index.php';
+$module_edit_link = ADMIN_URL .'/admintools/tool.php?tool=droplets';
+$template_edit_link = ADMIN_URL .'/admintools/tool.php?tool=templateedit';
+
+// protect from CSRF
+$id = $admin->checkIDKEY('id', false, 'GET');
+if (!$id or $id != 999) {
+ $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL);
+ exit();
+}
+
+?>
+<h4 style="margin: 0; border-bottom: 1px solid #DDD; padding-bottom: 5px;">
+	<a href="<?php echo $admintool_link;?>"><?php echo $HEADING['ADMINISTRATION_TOOLS']; ?></a>
+	->
+	<a href="<?php echo $module_edit_link;?>">Droplets</a>
+</h4>
+<?php
+
+$temp_dir = WB_PATH.'/temp/droplets/';
+$temp_file = '/modules/droplets/backup-droplets.zip';
+// make the temporary working directory
+mkdir($temp_dir);
+$query_droplets = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_droplets ORDER BY modified_when DESC");
+while($droplet = $query_droplets->fetchRow()) {
+	echo 'Saving: '.$droplet["name"].'.php<br />';
+	$sFile = $temp_dir.$droplet["name"].'.php';
+	$fh = fopen($sFile, 'w') ;
+	fwrite($fh, '//:'.$droplet['description']."\n");
+	fwrite($fh, '//:'.str_replace("\n"," ",$droplet['comments'])."\n");
+	fwrite($fh, $droplet['code']);
+	fclose($fh);
+}
+echo '<br />Create archive: backup-droplets.zip<br />';
+
+require_once(WB_PATH.'/include/pclzip/pclzip.lib.php');
+$archive = new PclZip(WB_PATH.$temp_file);
+$file_list = $archive->create($temp_dir, PCLZIP_OPT_REMOVE_ALL_PATH);
+if ($file_list == 0){
+	echo "Packaging error: '.$archive->errorInfo(true).'";
+	die("Error : ".$archive->errorInfo(true));
+}
+else {
+	echo '<br /><br />Backup created - <a href="'.WB_URL.$temp_file.'">Download</a>';
+}
+delete_directory ( $temp_dir );
+$admin->print_footer();
+
+
+function delete_directory($dirname) {
+    if (is_dir($dirname))
+        $dir_handle = opendir($dirname);
+    if (!$dir_handle)
+        return false;
+    while($file = readdir($dir_handle)) {
+        if ($file != "." && $file != "..") {
+            if (!is_dir($dirname."/".$file))
+                unlink($dirname."/".$file);
+            else
+                delete_directory($dirname.'/'.$file);          
+        }
+    }
+    closedir($dir_handle);
+    rmdir($dirname);
+    return true;
+}
 ?>
\ No newline at end of file

Property changes on: branches/2.8.x/wb/modules/droplets/backup_droplets.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/droplets/save_droplet.php
===================================================================
--- branches/2.8.x/wb/modules/droplets/save_droplet.php	(revision 1456)
+++ branches/2.8.x/wb/modules/droplets/save_droplet.php	(revision 1457)
@@ -33,18 +33,19 @@
 if(file_exists(ADMIN_PATH .'/admintools/tool.php')) {
 	$admintool_link = ADMIN_URL .'/admintools/index.php';
 	$module_edit_link = ADMIN_URL .'/admintools/tool.php?tool=droplets';
-	$admin = new admin('admintools', 'admintools');
+	$admin = new admin('admintools', 'admintools',false);
 } else {
 	$admintool_link = ADMIN_URL .'/settings/index.php?advanced=yes#administration_tools"';
 	$module_edit_link = ADMIN_URL .'/settings/tool.php?tool=droplets';
-	$admin = new admin('Settings', 'settings_advanced');
+	$admin = new admin('Settings', 'settings_advanced',false);
 }
 
 if (!$admin->checkFTAN())
 {
+	$admin->print_header();
 	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], $module_edit_link);
-	exit();
 }
+$admin->print_header();
 
 // Validate all fields
 if($admin->get_post('title') == '') {
@@ -76,5 +77,3 @@
 
 // Print admin footer
 $admin->print_footer();
-
-?>
\ No newline at end of file

Property changes on: branches/2.8.x/wb/modules/droplets/save_droplet.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/droplets/upgrade.php
===================================================================
--- branches/2.8.x/wb/modules/droplets/upgrade.php	(revision 1456)
+++ branches/2.8.x/wb/modules/droplets/upgrade.php	(revision 1457)
@@ -1,46 +1,46 @@
-<?php
-/**
- *
- * @category        module
- * @package         droplet
- * @author          Ruud Eisinga (Ruud) John (PCWacht)
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
- * @copyright       2009-2011, Website Baker Org. e.V.
- * @link			http://www.websitebaker2.org/
- * @license         http://www.gnu.org/licenses/gpl.html
- * @platform        WebsiteBaker 2.8.x
- * @requirements    PHP 5.2.2 and higher
- * @version         $Id$
- * @filesource		$HeadURL$
- * @lastmodified    $Date$
- *
- */
-
-if(!defined('WB_PATH')) die(header('Location: ../../index.php'));
-
-$table = TABLE_PREFIX .'mod_droplets';
-
-$info = $database->query("SELECT * from `$table` limit 0,1" );
-$fields = $info->fetchRow();
-if (!array_key_exists("admin_edit", $fields)) {
-	/**
-	 *	Call from the upgrade-script
-	 */
-	
-	if (function_exists('db_add_field')) {
-		db_add_field("admin_edit", 'mod_droplets', "INT NOT NULL default '0'");
-		db_add_field("admin_view", 'mod_droplets', "INT NOT NULL default '0'");
-		db_add_field("show_wysiwyg", 'mod_droplets', "INT NOT NULL default '0'");
-	} else {
-		/**
-		 * Not call by the upgrade-script
-		 */
-		$database->query("ALTER TABLE `$table` (
-			`admin_edit` INT NOT NULL default '0',
-			`admin_view` INT NOT NULL default '0',
-			`show_wysiwyg` INT NOT NULL default '0'
-			)");
-	}
-}
+<?php
+/**
+ *
+ * @category        module
+ * @package         droplet
+ * @author          Ruud Eisinga (Ruud) John (PCWacht)
+ * @author          WebsiteBaker Project
+ * @copyright       2004-2009, Ryan Djurovich
+ * @copyright       2009-2011, Website Baker Org. e.V.
+ * @link			http://www.websitebaker2.org/
+ * @license         http://www.gnu.org/licenses/gpl.html
+ * @platform        WebsiteBaker 2.8.x
+ * @requirements    PHP 5.2.2 and higher
+ * @version         $Id$
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
+ *
+ */
+
+if(!defined('WB_PATH')) die(header('Location: ../../index.php'));
+
+$table = TABLE_PREFIX .'mod_droplets';
+
+$info = $database->query("SELECT * from `$table` limit 0,1" );
+$fields = $info->fetchRow();
+if (!array_key_exists("admin_edit", $fields)) {
+	/**
+	 *	Call from the upgrade-script
+	 */
+	
+	if (function_exists('db_add_field')) {
+		db_add_field("admin_edit", 'mod_droplets', "INT NOT NULL default '0'");
+		db_add_field("admin_view", 'mod_droplets', "INT NOT NULL default '0'");
+		db_add_field("show_wysiwyg", 'mod_droplets', "INT NOT NULL default '0'");
+	} else {
+		/**
+		 * Not call by the upgrade-script
+		 */
+		$database->query("ALTER TABLE `$table` (
+			`admin_edit` INT NOT NULL default '0',
+			`admin_view` INT NOT NULL default '0',
+			`show_wysiwyg` INT NOT NULL default '0'
+			)");
+	}
+}
 ?>
\ No newline at end of file

Property changes on: branches/2.8.x/wb/modules/droplets/upgrade.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/droplets/backend.css
===================================================================
--- branches/2.8.x/wb/modules/droplets/backend.css	(revision 1456)
+++ branches/2.8.x/wb/modules/droplets/backend.css	(revision 1457)
@@ -1,27 +1,27 @@
-ul, li   { 
-	list-style: none;
-	margin: 0;
-	padding: 0 
-}
-
-.setting_name {
-	vertical-align: top;
-}
-
-.newsection {
-	border-top: 1px dashed #fff;
-}
-
-thead	{ 
-	font-weight: bold; 
-	background-color: #c7d1db; 
-	height: 25px }
-
-.row_om_out   { 
-	background: #ecf4f5 inherit; 
-	border: outset 1px #a5b3b4 
-}
-
-.row_om_over   { background: #ffffe0; border: outset 1px #679b38 }
-a.tooltip span {display:none; margin-left:14px; width:430px;}
-a.tooltip:hover span{display:inline; position:absolute; padding:5px; border:1px solid #000000; background:#ffffff; color:#000000;}
+ul, li   { 
+	list-style: none;
+	margin: 0;
+	padding: 0 
+}
+
+.setting_name {
+	vertical-align: top;
+}
+
+.newsection {
+	border-top: 1px dashed #fff;
+}
+
+thead	{ 
+	font-weight: bold; 
+	background-color: #c7d1db; 
+	height: 25px }
+
+.row_om_out   { 
+	background: #ecf4f5 inherit; 
+	border: outset 1px #a5b3b4 
+}
+
+.row_om_over   { background: #ffffe0; border: outset 1px #679b38 }
+a.tooltip span {display:none; margin-left:14px; width:430px;}
+a.tooltip:hover span{display:inline; position:absolute; padding:5px; border:1px solid #000000; background:#ffffff; color:#000000;}

Property changes on: branches/2.8.x/wb/modules/droplets/backend.css
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/news/info.php
===================================================================
--- branches/2.8.x/wb/modules/news/info.php	(revision 1456)
+++ branches/2.8.x/wb/modules/news/info.php	(revision 1457)
@@ -1,28 +1,26 @@
-<?php
-/**
- *
- * @category        modules
- * @package         news
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
- * @copyright       2009-2011, Website Baker Org. e.V.
- * @link			http://www.websitebaker2.org/
- * @license         http://www.gnu.org/licenses/gpl.html
- * @platform        WebsiteBaker 2.8.x
- * @requirements    PHP 5.2.2 and higher
- * @version         $Id$
- * @filesource		$HeadURL$
- * @lastmodified    $Date$
- *
- */
-
-$module_directory = 'news';
-$module_name = 'News v3.5';
-$module_function = 'page';
-$module_version = '3.5';
-$module_platform = '2.8.x';
-$module_author = 'Ryan Djurovich, Rob Smith';
-$module_license = 'GNU General Public License';
-$module_description = 'This page type is designed for making a news page.';
-
-?>
\ No newline at end of file
+<?php
+/**
+ *
+ * @category        modules
+ * @package         news
+ * @author          WebsiteBaker Project
+ * @copyright       2004-2009, Ryan Djurovich
+ * @copyright       2009-2011, Website Baker Org. e.V.
+ * @link			http://www.websitebaker2.org/
+ * @license         http://www.gnu.org/licenses/gpl.html
+ * @platform        WebsiteBaker 2.8.x
+ * @requirements    PHP 5.2.2 and higher
+ * @version         $Id$
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
+ *
+ */
+
+$module_directory   = 'news';
+$module_name        = 'News v3.5.5';
+$module_function    = 'page';
+$module_version     = '3.5.5';
+$module_platform    = '2.8.2';
+$module_author      = 'Ryan Djurovich, Rob Smith, Werner v.d.Decken';
+$module_license     = 'GNU General Public License';
+$module_description = 'This page type is designed for making a news page.';

Property changes on: branches/2.8.x/wb/modules/news/info.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/news/add_post.php
===================================================================
--- branches/2.8.x/wb/modules/news/add_post.php	(revision 1456)
+++ branches/2.8.x/wb/modules/news/add_post.php	(revision 1457)
@@ -1,51 +1,51 @@
-<?php
-/**
- *
- * @category        modules
- * @package         news
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
- * @copyright       2009-2011, Website Baker Org. e.V.
- * @link			http://www.websitebaker2.org/
- * @license         http://www.gnu.org/licenses/gpl.html
- * @platform        WebsiteBaker 2.8.x
- * @requirements    PHP 5.2.2 and higher
- * @version         $Id$
- * @filesource		$HeadURL$
- * @lastmodified    $Date$
- *
- */
-
-require('../../config.php');
-
-// Include WB admin wrapper script
-require(WB_PATH.'/modules/admin.php');
-
-// Include the ordering class
-require(WB_PATH.'/framework/class.order.php');
-// Get new order
-$order = new order(TABLE_PREFIX.'mod_news_posts', 'position', 'post_id', 'section_id');
-$position = $order->get_new($section_id);
-
-// Get default commenting
-$query_settings = $database->query("SELECT commenting FROM ".TABLE_PREFIX."mod_news_settings WHERE section_id = '$section_id'");
-$fetch_settings = $query_settings->fetchRow();
-$commenting = $fetch_settings['commenting'];
-
-// Insert new row into database
-$database->query("INSERT INTO ".TABLE_PREFIX."mod_news_posts (section_id,page_id,position,commenting,active) VALUES ('$section_id','$page_id','$position','$commenting','1')");
-
-// Get the id
-$post_id = $admin->getIDKEY($database->get_one("SELECT LAST_INSERT_ID()"));
-
-// Say that a new record has been added, then redirect to modify page
-if($database->is_error()) {
-	$admin->print_error($database->get_error(), WB_URL.'/modules/news/modify_post.php?page_id='.$page_id.'&section_id='.$section_id.'&post_id='.$post_id);
-} else {
-	$admin->print_success($TEXT['SUCCESS'], WB_URL.'/modules/news/modify_post.php?page_id='.$page_id.'&section_id='.$section_id.'&post_id='.$post_id);
-}
-
-// Print admin footer
-$admin->print_footer();
-
+<?php
+/**
+ *
+ * @category        modules
+ * @package         news
+ * @author          WebsiteBaker Project
+ * @copyright       2004-2009, Ryan Djurovich
+ * @copyright       2009-2011, Website Baker Org. e.V.
+ * @link			http://www.websitebaker2.org/
+ * @license         http://www.gnu.org/licenses/gpl.html
+ * @platform        WebsiteBaker 2.8.x
+ * @requirements    PHP 5.2.2 and higher
+ * @version         $Id$
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
+ *
+ */
+
+require('../../config.php');
+
+// Include WB admin wrapper script
+require(WB_PATH.'/modules/admin.php');
+
+// Include the ordering class
+require(WB_PATH.'/framework/class.order.php');
+// Get new order
+$order = new order(TABLE_PREFIX.'mod_news_posts', 'position', 'post_id', 'section_id');
+$position = $order->get_new($section_id);
+
+// Get default commenting
+$query_settings = $database->query("SELECT commenting FROM ".TABLE_PREFIX."mod_news_settings WHERE section_id = '$section_id'");
+$fetch_settings = $query_settings->fetchRow();
+$commenting = $fetch_settings['commenting'];
+
+// Insert new row into database
+$database->query("INSERT INTO ".TABLE_PREFIX."mod_news_posts (section_id,page_id,position,commenting,active) VALUES ('$section_id','$page_id','$position','$commenting','1')");
+
+// Get the id
+$post_id = $admin->getIDKEY($database->get_one("SELECT LAST_INSERT_ID()"));
+
+// Say that a new record has been added, then redirect to modify page
+if($database->is_error()) {
+	$admin->print_error($database->get_error(), WB_URL.'/modules/news/modify_post.php?page_id='.$page_id.'&section_id='.$section_id.'&post_id='.$post_id);
+} else {
+	$admin->print_success($TEXT['SUCCESS'], WB_URL.'/modules/news/modify_post.php?page_id='.$page_id.'&section_id='.$section_id.'&post_id='.$post_id);
+}
+
+// Print admin footer
+$admin->print_footer();
+
 ?>
\ No newline at end of file

Property changes on: branches/2.8.x/wb/modules/news/add_post.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/news/search.php
===================================================================
--- branches/2.8.x/wb/modules/news/search.php	(revision 1456)
+++ branches/2.8.x/wb/modules/news/search.php	(revision 1457)

Property changes on: branches/2.8.x/wb/modules/news/search.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/news/modify_settings.php
===================================================================
--- branches/2.8.x/wb/modules/news/modify_settings.php	(revision 1456)
+++ branches/2.8.x/wb/modules/news/modify_settings.php	(revision 1457)
@@ -18,6 +18,11 @@
 
 require('../../config.php');
 
+// $admin_header = false;
+// Tells script to update when this page was last updated
+$update_when_modified = false;
+// show the info banner
+$print_info_banner = true;
 // Include WB admin wrapper script
 require(WB_PATH.'/modules/admin.php');
 

Property changes on: branches/2.8.x/wb/modules/news/modify_settings.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/news/delete_post.php
===================================================================
--- branches/2.8.x/wb/modules/news/delete_post.php	(revision 1456)
+++ branches/2.8.x/wb/modules/news/delete_post.php	(revision 1457)
@@ -18,17 +18,18 @@
 
 require('../../config.php');
 
+$admin_header = false;
+// Tells script to update when this page was last updated
+$update_when_modified = true;
 // Include WB admin wrapper script
-$update_when_modified = true; // Tells script to update when this page was last updated
 require(WB_PATH.'/modules/admin.php');
 
-$pid = $admin->checkIDKEY('post_id', false, 'GET');
-if (!$pid) {
+$post_id = ($admin->checkIDKEY('post_id', false, 'GET'));
+if (!$post_id) {
+	$admin->print_header();
 	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id);
-	exit();
-} else {
-	$post_id = $pid;
 }
+$admin->print_header();
 
 // Get post details
 $query_details = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_news_posts WHERE post_id = '$post_id'");
@@ -61,5 +62,3 @@
 
 // Print admin footer
 $admin->print_footer();
-
-?>
\ No newline at end of file

Property changes on: branches/2.8.x/wb/modules/news/delete_post.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/news/uninstall.php
===================================================================
--- branches/2.8.x/wb/modules/news/uninstall.php	(revision 1456)
+++ branches/2.8.x/wb/modules/news/uninstall.php	(revision 1457)
@@ -1,33 +1,33 @@
-<?php
-/**
- *
- * @category        modules
- * @package         news
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
- * @copyright       2009-2011, Website Baker Org. e.V.
- * @link			http://www.websitebaker2.org/
- * @license         http://www.gnu.org/licenses/gpl.html
- * @platform        WebsiteBaker 2.8.x
- * @requirements    PHP 5.2.2 and higher
- * @version         $Id$
- * @filesource		$HeadURL$
- * @lastmodified    $Date$
- *
- */
-
-// Must include code to stop this file being access directly
-if(defined('WB_PATH') == false) { exit("Cannot access this file directly"); }
-
-$database->query("DELETE FROM ".TABLE_PREFIX."search WHERE name = 'module' AND value = 'news'");
-$database->query("DELETE FROM ".TABLE_PREFIX."search WHERE extra = 'news'");
-$database->query("DROP TABLE ".TABLE_PREFIX."mod_news_posts");
-$database->query("DROP TABLE ".TABLE_PREFIX."mod_news_groups");
-$database->query("DROP TABLE ".TABLE_PREFIX."mod_news_comments");
-$database->query("DROP TABLE ".TABLE_PREFIX."mod_news_settings");
-
-require_once(WB_PATH.'/framework/functions.php');
-rm_full_dir(WB_PATH.PAGES_DIRECTORY.'/posts');
-rm_full_dir(WB_PATH.MEDIA_DIRECTORY.'/.news');
-
+<?php
+/**
+ *
+ * @category        modules
+ * @package         news
+ * @author          WebsiteBaker Project
+ * @copyright       2004-2009, Ryan Djurovich
+ * @copyright       2009-2011, Website Baker Org. e.V.
+ * @link			http://www.websitebaker2.org/
+ * @license         http://www.gnu.org/licenses/gpl.html
+ * @platform        WebsiteBaker 2.8.x
+ * @requirements    PHP 5.2.2 and higher
+ * @version         $Id$
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
+ *
+ */
+
+// Must include code to stop this file being access directly
+if(defined('WB_PATH') == false) { exit("Cannot access this file directly"); }
+
+$database->query("DELETE FROM ".TABLE_PREFIX."search WHERE name = 'module' AND value = 'news'");
+$database->query("DELETE FROM ".TABLE_PREFIX."search WHERE extra = 'news'");
+$database->query("DROP TABLE ".TABLE_PREFIX."mod_news_posts");
+$database->query("DROP TABLE ".TABLE_PREFIX."mod_news_groups");
+$database->query("DROP TABLE ".TABLE_PREFIX."mod_news_comments");
+$database->query("DROP TABLE ".TABLE_PREFIX."mod_news_settings");
+
+require_once(WB_PATH.'/framework/functions.php');
+rm_full_dir(WB_PATH.PAGES_DIRECTORY.'/posts');
+rm_full_dir(WB_PATH.MEDIA_DIRECTORY.'/.news');
+
 ?>
\ No newline at end of file

Property changes on: branches/2.8.x/wb/modules/news/uninstall.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/news/modify_comment.php
===================================================================
--- branches/2.8.x/wb/modules/news/modify_comment.php	(revision 1456)
+++ branches/2.8.x/wb/modules/news/modify_comment.php	(revision 1457)
@@ -24,7 +24,6 @@
 $comment_id = $admin->checkIDKEY('comment_id', false, 'GET');
 if (!$comment_id) {
 	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'],  ADMIN_URL.'/pages/modify.php?page_id='.$page_id );
-	exit();
 }
 
 // Get header and footer

Property changes on: branches/2.8.x/wb/modules/news/modify_comment.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/news/view.php
===================================================================
--- branches/2.8.x/wb/modules/news/view.php	(revision 1456)
+++ branches/2.8.x/wb/modules/news/view.php	(revision 1457)
@@ -1,23 +1,21 @@
 <?php
 /**
  *
- * @category        modules
- * @package         news
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
- * @copyright       2009-2011, Website Baker Org. e.V.
+ * @category        WebsiteBaker
+ * @package         modules
+ * @subpackage      news
+ * @author          Ryan Djurovich, Rob Smith, Werner v.d.Decken
+ * @copyright       2004-2011, Ryan Djurovich
  * @link			http://www.websitebaker2.org/
  * @license         http://www.gnu.org/licenses/gpl.html
- * @platform        WebsiteBaker 2.8.x
- * @requirements    PHP 5.2.2 and higher
  * @version         $Id$
  * @filesource		$HeadURL$
- * @lastmodified    $Date$
  *
  */
 
 // Must include code to stop this file being access directly
 if(defined('WB_PATH') == false) { exit("Cannot access this file directly"); }
+global $post_id, $post_section,$TEXT,$MESSAGE;
 
 // load module language file
 $lang = (dirname(__FILE__)) . '/languages/' . LANGUAGE . '.php';
@@ -30,25 +28,13 @@
 }
 
 // Check if there is a start point defined
-if(isset($_GET['p']) AND is_numeric($_GET['p']) AND $_GET['p'] >= 0)
-{
-	$position = $_GET['p'];
-} else {
-	$position = 0;
-}
-
+$position = ( isset($_GET['p']) ? intval($_GET['p']) : 0);
 // Get user's username, display name, email, and id - needed for insertion into post info
 $users = array();
-$query_users = $database->query("SELECT user_id,username,display_name,email FROM ".TABLE_PREFIX."users");
-if($query_users->numRows() > 0)
-{
-	while( false != ($user = $query_users->fetchRow()) )
-    {
-		// Insert user info into users array
-		$user_id = $user['user_id'];
-		$users[$user_id]['username'] = $user['username'];
-		$users[$user_id]['display_name'] = $user['display_name'];
-		$users[$user_id]['email'] = $user['email'];
+$sql = 'SELECT `user_id`,`username`,`display_name`,`email` FROM `'.TABLE_PREFIX.'users`';
+if( ($resUsers = $database->query($sql)) ) {
+	while( $recUser = $resUsers->fetchRow() ) {
+		$users[$recUser['user_id']] = $recUser;
 	}
 }
 // Get groups (title, if they are active, and their image [if one has been uploaded])
@@ -64,6 +50,7 @@
 $query_users = $database->query("SELECT group_id,title,active FROM ".TABLE_PREFIX."mod_news_groups WHERE section_id = '$section_id' ORDER BY position ASC");
 if($query_users->numRows() > 0)
 {
+
 	while( false != ($group = $query_users->fetchRow()) )
     {
 		// Insert user info into users array
@@ -79,16 +66,15 @@
 	}
 }
 
-
-
 // Check if we should show the main page or a post itself
-if(!defined('POST_ID') OR !is_numeric(POST_ID))
+// if(!defined('POST_ID') OR !is_numeric(POST_ID))
+if(!isset($post_id) || !is_numeric($post_id))
 {
 
 	// Check if we should only list posts from a certain group
 	if(isset($_GET['g']) AND is_numeric($_GET['g']))
     {
-		$query_extra = " AND group_id = '".$_GET['g']."'";
+		$query_extra = 'AND `group_id`='.(int)$_GET['g'].' ';
 	} else {
 		$query_extra = '';
 	}
@@ -96,34 +82,31 @@
 	// Check if we should only list posts from a certain group
 	if(isset($_GET['g']) AND is_numeric($_GET['g']))
     {
-		$query_extra = " AND group_id = '".$_GET['g']."'";
+		$query_extra = 'AND `group_id`='.(int)$_GET['g'].' ';
 	} else {
 		$query_extra = '';
 	}
 
 	// Get settings
-	$query_settings = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_news_settings WHERE section_id = '$section_id'");
-	if($query_settings->numRows() > 0)
-    {
-		$fetch_settings = $query_settings->fetchRow();
-		$setting_header = ($fetch_settings['header']);
-		$setting_post_loop = ($fetch_settings['post_loop']);
-		$setting_footer = ($fetch_settings['footer']);
-		$setting_posts_per_page = $fetch_settings['posts_per_page'];
-	} else {
-		$setting_header = '';
-		$setting_post_loop = '';
-		$setting_footer = '';
-		$setting_posts_per_page = '';
+	$setting_header = $setting_post_loop = $setting_footer = $setting_posts_per_page = '';
+	$sql  = 'SELECT `header`, `post_loop`, `footer`, `posts_per_page` ';
+	$sql .= 'FROM `'.TABLE_PREFIX.'mod_news_settings` ';
+	$sql .= 'WHERE `section_id`='.(int)$section_id;
+	if( ($resSettings = $database->query($sql)) ){
+		if( ($recSettings = $resSettings->fetchRow()) ) {
+			foreach($recSettings as $key=>$val){
+				${'setting_'.$key} = $val;
+			}
+		}
 	}
-
 	$t = time();
 	// Get total number of posts
-	$query_total_num = $database->query("SELECT post_id, section_id FROM ".TABLE_PREFIX."mod_news_posts
-		WHERE section_id = '$section_id' AND active = '1' AND title != '' $query_extra
-		AND (published_when = '0' OR published_when <= $t) AND (published_until = 0 OR published_until >= $t)");
-	$total_num = $query_total_num->numRows();
-
+	$sql  = 'SELECT COUNT(*) FROM `'.TABLE_PREFIX.'mod_news_posts` ';
+	$sql .= 'WHERE `section_id`='.(int)$section_id.' AND `active`=1 ';
+	$sql .=        'AND `title`!=\'\' '.$query_extra;
+	$sql .=        'AND (`published_when`=0 OR `published_when`<='.$t.') ';
+	$sql .=        'AND (`published_until`=0 OR `published_until`>='.$t.') ';
+	$total_num = intval($database->get_one($sql));
 	// Work-out if we need to add limit code to sql
 	if($setting_posts_per_page != 0)
     {
@@ -222,11 +205,11 @@
 				if ($post['published_when'] === '0') $post['published_when'] = time();
 				if ($post['published_when'] > $post['posted_when'])
                 {
-					$post_date = gmdate(DATE_FORMAT, $post['published_when']+TIMEZONE);
-					$post_time = gmdate(TIME_FORMAT, $post['published_when']+TIMEZONE);
+					$post_date = date(DATE_FORMAT, $post['published_when']+TIMEZONE);
+					$post_time = date(TIME_FORMAT, $post['published_when']+TIMEZONE);
 				} else {
-					$post_date = gmdate(DATE_FORMAT, $post['posted_when']+TIMEZONE);
-					$post_time = gmdate(TIME_FORMAT, $post['posted_when']+TIMEZONE);
+					$post_date = date(DATE_FORMAT, $post['posted_when']+TIMEZONE);
+					$post_time = date(TIME_FORMAT, $post['posted_when']+TIMEZONE);
 				}
 
 				$publ_date = date(DATE_FORMAT,$post['published_when']);
@@ -236,14 +219,8 @@
 				$post_link = page_link($post['link']);
 
                 $post_link_path = str_replace(WB_URL, WB_PATH,$post_link);
-                if(file_exists($post_link_path))
-                {
-    				$create_date = date(DATE_FORMAT, filemtime ( $post_link_path ));
-    				$create_time = date(TIME_FORMAT, filemtime ( $post_link_path ));
-                } else {
-                    $create_date = $publ_date;
-                    $create_time = $publ_time;
-                }
+    			$create_date = date(DATE_FORMAT, $post['created_when']);
+    			$create_time = date(TIME_FORMAT, $post['created_when']);
 
 				if(isset($_GET['p']) AND $position > 0)
                 {
@@ -268,8 +245,6 @@
 
 				// Replace [wblink--PAGE_ID--] with real link
 				$short = ($post['content_short']);
-				$wb->preprocess($short);
-
 				// Replace vars with values
 				$post_long_len = strlen($post['content_long']);
 				$vars = array('[PAGE_TITLE]', '[GROUP_ID]', '[GROUP_TITLE]', '[GROUP_IMAGE]', '[DISPLAY_GROUP]', '[DISPLAY_IMAGE]', '[TITLE]', '[SHORT]', '[LINK]', '[MODI_DATE]', '[MODI_TIME]', '[CREATED_DATE]', '[CREATED_TIME]', '[PUBLISHED_DATE]', '[PUBLISHED_TIME]', '[USER_ID]', '[USERNAME]', '[DISPLAY_NAME]', '[EMAIL]', '[TEXT_READ_MORE]','[SHOW_READ_MORE]');
@@ -304,29 +279,27 @@
     }
 
 }
-elseif(defined('POST_ID') AND is_numeric(POST_ID))
+//elseif(defined('POST_ID') AND is_numeric(POST_ID))
+elseif(isset($post_id) && is_numeric($post_id))
 {
 
   // print '<h2>'.POST_ID.'/'.PAGE_ID.'/'.POST_SECTION.'</h2>';
-  if(defined('POST_SECTION') AND POST_SECTION == $section_id)
+//  if(defined('POST_SECTION') AND POST_SECTION == $section_id)
+  if(isset($post_section) && ($post_section == $section_id))
   {
 	// Get settings
-	$query_settings = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_news_settings WHERE section_id = '$section_id'");
-	if($query_settings->numRows() > 0)
-    {
-		$fetch_settings = $query_settings->fetchRow();
-		$setting_post_header = ($fetch_settings['post_header']);
-		$setting_post_footer = ($fetch_settings['post_footer']);
-		$setting_comments_header = ($fetch_settings['comments_header']);
-		$setting_comments_loop = ($fetch_settings['comments_loop']);
-		$setting_comments_footer = ($fetch_settings['comments_footer']);
-	} else {
-		$setting_post_header = '';
-		$setting_post_footer = '';
-		$setting_comments_header = '';
-		$setting_comments_loop = '';
-		$setting_comments_footer = '';
-    }
+	$setting_post_header = $setting_post_footer = $setting_comments_header
+	                     = $setting_comments_loop = $setting_comments_footer = '';
+	$sql  = 'SELECT `post_header`, `post_footer`, `comments_header`, `comments_loop`, `comments_footer` ';
+	$sql .= 'FROM `'.TABLE_PREFIX.'mod_news_settings` ';
+	$sql .= 'WHERE `section_id`='.(int)$section_id;
+	if( ($resSettings = $database->query($sql)) ){
+		if( ($recSettings = $resSettings->fetchRow()) ) {
+			foreach($recSettings as $key=>$val){
+				${'setting_'.$key} = $val;
+			}
+		}
+	}
 	// Get page info
 	$query_page = $database->query("SELECT link FROM ".TABLE_PREFIX."pages WHERE page_id = '".PAGE_ID."'");
 	if($query_page->numRows() > 0)
@@ -349,7 +322,7 @@
 	// Get post info
 	$t = time();
 	$query_post = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_news_posts
-		WHERE post_id = '".POST_ID."' AND active = '1'
+		WHERE post_id = '".$post_id."' AND active = '1'
 		AND (published_when = '0' OR published_when <= $t) AND (published_until = 0 OR published_until >= $t)");
 
 	if($query_post->numRows() > 0)
@@ -362,30 +335,24 @@
 			if ($post['published_when'] === '0') $post['published_when'] = time();
 			if ($post['published_when'] > $post['posted_when'])
             {
-				$post_date = gmdate(DATE_FORMAT, $post['published_when']+TIMEZONE);
-				$post_time = gmdate(TIME_FORMAT, $post['published_when']+TIMEZONE);
+				$post_date = date(DATE_FORMAT, $post['published_when']+TIMEZONE);
+				$post_time = date(TIME_FORMAT, $post['published_when']+TIMEZONE);
 			}
             else
             {
-				$post_date = gmdate(DATE_FORMAT, $post['posted_when']+TIMEZONE);
-				$post_time = gmdate(TIME_FORMAT, $post['posted_when']+TIMEZONE);
+				$post_date = date(DATE_FORMAT, $post['posted_when']+TIMEZONE);
+				$post_time = date(TIME_FORMAT, $post['posted_when']+TIMEZONE);
 			}
 
 			$publ_date = date(DATE_FORMAT,$post['published_when']);
 			$publ_time = date(TIME_FORMAT,$post['published_when']);
 
-				// Work-out the post link
-				$post_link = page_link($post['link']);
+			// Work-out the post link
+			$post_link = page_link($post['link']);
 
-                $post_link_path = str_replace(WB_URL, WB_PATH,$post_link);
-                if(file_exists($post_link_path))
-                {
-    				$create_date = date(DATE_FORMAT, filemtime ( $post_link_path ));
-    				$create_time = date(TIME_FORMAT, filemtime ( $post_link_path ));
-                } else {
-                    $create_date = $publ_date;
-                    $create_time = $publ_time;
-                }
+			$post_link_path = str_replace(WB_URL, WB_PATH,$post_link);
+			$create_date = date(DATE_FORMAT, $post['created_when']);
+			$create_time = date(TIME_FORMAT, $post['created_when']);
 			// Get group id, title, and image
 			$group_id = $post['group_id'];
 			$group_title = $groups[$group_id]['title'];
@@ -397,7 +364,6 @@
 
 			$vars = array('[PAGE_TITLE]', '[GROUP_ID]', '[GROUP_TITLE]', '[GROUP_IMAGE]', '[DISPLAY_GROUP]', '[DISPLAY_IMAGE]', '[TITLE]', '[SHORT]', '[BACK]', '[TEXT_BACK]', '[TEXT_LAST_CHANGED]', '[MODI_DATE]', '[TEXT_AT]', '[MODI_TIME]', '[CREATED_DATE]', '[CREATED_TIME]', '[PUBLISHED_DATE]', '[PUBLISHED_TIME]', '[TEXT_POSTED_BY]', '[TEXT_ON]', '[USER_ID]', '[USERNAME]', '[DISPLAY_NAME]', '[EMAIL]');
 			$post_short=$post['content_short'];
-			$wb->preprocess($post_short);
 			if(isset($users[$uid]['username']) AND $users[$uid]['username'] != '')
             {
 				$values = array(PAGE_TITLE, $group_id, $group_title, $group_image, $display_group, $display_image, $post['title'], $post_short, $page_link, $MOD_NEWS['TEXT_BACK'], $MOD_NEWS['TEXT_LAST_CHANGED'],$post_date, $MOD_NEWS['TEXT_AT'], $post_time, $create_date, $create_time, $publ_date, $publ_time, $MOD_NEWS['TEXT_POSTED_BY'], $MOD_NEWS['TEXT_ON'], $uid, $users[$uid]['username'], $users[$uid]['display_name'], $users[$uid]['email']);
@@ -404,8 +370,8 @@
 			} else {
 				$values = array(PAGE_TITLE, $group_id, $group_title, $group_image, $display_group, $display_image, $post['title'], $post_short, $page_link, $MOD_NEWS['TEXT_BACK'], $MOD_NEWS['TEXT_LAST_CHANGED'], $post_date, $MOD_NEWS['TEXT_AT'], $post_time, $create_date, $create_time, $publ_date, $publ_time, $MOD_NEWS['TEXT_POSTED_BY'], $MOD_NEWS['TEXT_ON'], '', '', '', '');
 			}
-
-			$post_long = ($post['content_long']);
+			// $post_long = ($post['content_long']);
+			$post_long = ($post['content_long'] != '') ? $post['content_long'] : $post['content_short'];
 		}
 	} else {
 	    	$wb->print_error($MESSAGE['FRONTEND']['SORRY_NO_ACTIVE_SECTIONS'], 'view.php', false);
@@ -414,9 +380,6 @@
 
 	// Print post header
 	print str_replace($vars, $values, $setting_post_header);
-
-	// Replace [wblink--PAGE_ID--] with real link
-  	$wb->preprocess($post_long);
 	// Print long
 	print $post_long;
 
@@ -429,11 +392,11 @@
 		// Print comments header
 		$vars = array('[ADD_COMMENT_URL]','[TEXT_COMMENTS]');
 		// $pid = $admin->getIDKEY(POST_ID);
-		$values = array(WB_URL.'/modules/news/comment.php?post_id='.POST_ID.'&amp;section_id='.$section_id, $MOD_NEWS['TEXT_COMMENTS']);
+		$values = array(WB_URL.'/modules/news/comment.php?post_id='.$post_id.'&amp;section_id='.$section_id, $MOD_NEWS['TEXT_COMMENTS']);
 		print str_replace($vars, $values, $setting_comments_header);
 
 		// Query for comments
-		$query_comments = $database->query("SELECT title,comment,commented_when,commented_by FROM ".TABLE_PREFIX."mod_news_comments WHERE post_id = '".POST_ID."' ORDER BY commented_when ASC");
+		$query_comments = $database->query("SELECT title,comment,commented_when,commented_by FROM ".TABLE_PREFIX."mod_news_comments WHERE post_id = '".$post_id."' ORDER BY commented_when ASC");
 		if($query_comments->numRows() > 0)
         {
 			while( false != ($comment = $query_comments->fetchRow()) )
@@ -442,8 +405,8 @@
 				$comment['comment'] = nl2br($wb->strip_slashes($comment['comment']));
 				$comment['title'] = $wb->strip_slashes($comment['title']);
 				// Print comments loop
-				$commented_date = gmdate(DATE_FORMAT, $comment['commented_when']+TIMEZONE);
-				$commented_time = gmdate(TIME_FORMAT, $comment['commented_when']+TIMEZONE);
+				$commented_date = date(DATE_FORMAT, $comment['commented_when']+TIMEZONE);
+				$commented_time = date(TIME_FORMAT, $comment['commented_when']+TIMEZONE);
 				$uid = $comment['commented_by'];
 				$vars = array('[TITLE]','[COMMENT]','[TEXT_ON]','[DATE]','[TEXT_AT]','[TIME]','[TEXT_BY]','[USER_ID]','[USERNAME]','[DISPLAY_NAME]', '[EMAIL]');
 				if(isset($users[$uid]['username']) AND $users[$uid]['username'] != '')
@@ -467,7 +430,7 @@
 
 		// Print comments footer
 		$vars = array('[ADD_COMMENT_URL]','[TEXT_ADD_COMMENT]');
-		$values = array(WB_URL.'/modules/news/comment.php?post_id='.POST_ID.'&amp;section_id='.$section_id, $MOD_NEWS['TEXT_ADD_COMMENT']);
+		$values = array(WB_URL.'/modules/news/comment.php?post_id='.$post_id.'&amp;section_id='.$section_id, $MOD_NEWS['TEXT_ADD_COMMENT']);
 		print str_replace($vars, $values, $setting_comments_footer);
 
 	}
@@ -476,9 +439,8 @@
 
 	if(ENABLED_ASP)
     {
-		$_SESSION['comes_from_view'] = POST_ID;
+		$_SESSION['comes_from_view'] = $post_id;
 		$_SESSION['comes_from_view_time'] = time();
 	}
 
 }
-?>
\ No newline at end of file

Property changes on: branches/2.8.x/wb/modules/news/view.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/news/save_group.php
===================================================================
--- branches/2.8.x/wb/modules/news/save_group.php	(revision 1456)
+++ branches/2.8.x/wb/modules/news/save_group.php	(revision 1457)
@@ -29,20 +29,23 @@
 	$group_id = $_POST['group_id'];
 }
 
+$admin_header = false;
+// Tells script to update when this page was last updated
+$update_when_modified = true;
 // Include WB admin wrapper script
-$update_when_modified = true; // Tells script to update when this page was last updated
 require(WB_PATH.'/modules/admin.php');
 
 if (!$admin->checkFTAN())
 {
-	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'],ADMIN_URL.'/pages/modify.php?page_id='.$page_id);
-	exit();
+	$admin->print_header();
+	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id);
 }
+$admin->print_header();
 
 // Include WB functions file
 require(WB_PATH.'/framework/functions.php');
 
-// Vagroup_idate all fields
+// Validate all fields
 if($admin->get_post('title') == '')
 {
 	$admin->print_error($MESSAGE['GENERIC']['FILL_IN_ALL'], WB_URL.'/modules/news/modify_group.php?page_id='.$page_id.'&section_id='.$section_id.'&group_id='.$admin->getIDKEY($group_id));
@@ -57,23 +60,38 @@
 $database->query("UPDATE ".TABLE_PREFIX."mod_news_groups SET title = '$title', active = '$active' WHERE group_id = '$group_id'");
 
 // Check if the user uploaded an image or wants to delete one
-if(isset($_FILES['image']['tmp_name']) AND $_FILES['image']['tmp_name'] != '')
-{
+if(isset($_FILES['image']['tmp_name']) AND $_FILES['image']['tmp_name'] != '') {
 	// Get real filename and set new filename
 	$filename = $_FILES['image']['name'];
+	$file_image_type = $_FILES['image']['type'];
 	$new_filename = WB_PATH.MEDIA_DIRECTORY.'/.news/image'.$group_id.'.jpg';
 	// Make sure the image is a jpg file
 	$file4=substr($filename, -4, 4);
+
+	switch ($file_image_type) :
+		case 'image/jpeg' :
+		case 'image/pjpeg' :
+		case 'image/png' :
+		case 'image/x-png' :
+		break;
+		default:
+			$admin->print_error($MESSAGE['GENERIC']['FILE_TYPE'].' JPG (JPEG) or PNG',ADMIN_URL.'/pages/modify.php?page_id='.$page_id);
+		break;
+	endswitch;
+
+/*
 	if(($file4 != '.jpg')and($file4 != '.JPG')and($file4 != '.png')and($file4 != '.PNG') and ($file4 !='jpeg') and ($file4 != 'JPEG'))
     {
-		$admin->print_error($MESSAGE['GENERIC']['FILE_TYPE'].' JPG (JPEG) or PNG a');
+		$admin->print_error($MESSAGE['GENERIC']['FILE_TYPE'].' JPG (JPEG) or PNG',ADMIN_URL.'/pages/modify.php?page_id='.$page_id);
 	} elseif(
 	(($_FILES['image']['type']) != 'image/jpeg' AND mime_content_type($_FILES['image']['tmp_name']) != 'image/jpg')
 	and
 	(($_FILES['image']['type']) != 'image/png' AND mime_content_type($_FILES['image']['tmp_name']) != 'image/png')
 	){
-		$admin->print_error($MESSAGE['GENERIC']['FILE_TYPE'].' JPG (JPEG) or PNG b');
+		$admin->print_error($MESSAGE['GENERIC']['FILE_TYPE'].' JPG (JPEG) or PNG',ADMIN_URL.'/pages/modify.php?page_id='.$page_id);
 	}
+*/
+
 	// Make sure the target directory exists
 	make_dir(WB_PATH.MEDIA_DIRECTORY.'/.news');
 	// Upload image
@@ -112,5 +130,3 @@
 
 // Print admin footer
 $admin->print_footer();
-
-?>
\ No newline at end of file

Property changes on: branches/2.8.x/wb/modules/news/save_group.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/news/move_up.php
===================================================================
--- branches/2.8.x/wb/modules/news/move_up.php	(revision 1456)
+++ branches/2.8.x/wb/modules/news/move_up.php	(revision 1457)
@@ -1,56 +1,53 @@
-<?php
-/**
- *
- * @category        modules
- * @package         news
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
- * @copyright       2009-2011, Website Baker Org. e.V.
- * @link			http://www.websitebaker2.org/
- * @license         http://www.gnu.org/licenses/gpl.html
- * @platform        WebsiteBaker 2.8.x
- * @requirements    PHP 5.2.2 and higher
- * @version         $Id$
- * @filesource		$HeadURL$
- * @lastmodified    $Date$
- *
- */
-
-require('../../config.php');
-
-// Include WB admin wrapper script
-require(WB_PATH.'/modules/admin.php');
-
-// Get id
-$pid = $admin->checkIDKEY('post_id', false, 'GET');
-$gid = $admin->checkIDKEY('group_id', false, 'GET');
-if (!$pid) {
-	if (!$gid) {
-		$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL);
-		exit();
-	} else {
-		$id = $gid;
-		$id_field = 'group_id';
-		$table = TABLE_PREFIX.'mod_news_groups';
-	}
-} else {
-	$id = $pid;
-	$id_field = 'post_id';
-	$table = TABLE_PREFIX.'mod_news_posts';
-}
-
-// Include the ordering class
-require(WB_PATH.'/framework/class.order.php');
-
-// Create new order object an reorder
-$order = new order($table, 'position', $id_field, 'section_id');
-if($order->move_up($id)) {
-	$admin->print_success($TEXT['SUCCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id);
-} else {
-	$admin->print_error($TEXT['ERROR'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id);
-}
-
-// Print admin footer
-$admin->print_footer();
-
-?>
\ No newline at end of file
+<?php
+/**
+ *
+ * @category        modules
+ * @package         news
+ * @author          WebsiteBaker Project
+ * @copyright       2004-2009, Ryan Djurovich
+ * @copyright       2009-2011, Website Baker Org. e.V.
+ * @link			http://www.websitebaker2.org/
+ * @license         http://www.gnu.org/licenses/gpl.html
+ * @platform        WebsiteBaker 2.8.x
+ * @requirements    PHP 5.2.2 and higher
+ * @version         $Id$
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
+ *
+ */
+
+require('../../config.php');
+
+// Include WB admin wrapper script
+require(WB_PATH.'/modules/admin.php');
+
+// Get id
+$pid = $admin->checkIDKEY('post_id', false, 'GET');
+$gid = $admin->checkIDKEY('group_id', false, 'GET');
+if (!$pid) {
+	if (!$gid) {
+		$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL);
+	} else {
+		$id = $gid;
+		$id_field = 'group_id';
+		$table = TABLE_PREFIX.'mod_news_groups';
+	}
+} else {
+	$id = $pid;
+	$id_field = 'post_id';
+	$table = TABLE_PREFIX.'mod_news_posts';
+}
+
+// Include the ordering class
+require(WB_PATH.'/framework/class.order.php');
+
+// Create new order object an reorder
+$order = new order($table, 'position', $id_field, 'section_id');
+if($order->move_up($id)) {
+	$admin->print_success($TEXT['SUCCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id);
+} else {
+	$admin->print_error($TEXT['ERROR'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id);
+}
+
+// Print admin footer
+$admin->print_footer();

Property changes on: branches/2.8.x/wb/modules/news/move_up.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/news/save_settings.php
===================================================================
--- branches/2.8.x/wb/modules/news/save_settings.php	(revision 1456)
+++ branches/2.8.x/wb/modules/news/save_settings.php	(revision 1457)
@@ -17,7 +17,7 @@
  */
 
 require('../../config.php');
-
+/*
 // Include WB admin wrapper script
 $update_when_modified = true; // Tells script to update when this page was last updated
 require(WB_PATH.'/modules/admin.php');
@@ -27,7 +27,21 @@
 	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'],ADMIN_URL.'/pages/modify.php?page_id='.$page_id);
 	exit();
 }
+*/
 
+$admin_header = false;
+// Tells script to update when this page was last updated
+$update_when_modified = true;
+// Include WB admin wrapper script
+require(WB_PATH.'/modules/admin.php');
+
+if (!$admin->checkFTAN())
+{
+	$admin->print_header();
+	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id);
+}
+$admin->print_header();
+
 // This code removes any <?php tags and adds slashes
 $friendly = array('&lt;', '&gt;', '?php');
 $raw = array('<', '>', '');

Property changes on: branches/2.8.x/wb/modules/news/save_settings.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/news/frontend.css
===================================================================
--- branches/2.8.x/wb/modules/news/frontend.css	(revision 1456)
+++ branches/2.8.x/wb/modules/news/frontend.css	(revision 1457)
@@ -1,4 +1,4 @@
-.captcha-table,
+		.captcha-table,
 .captcha_table,
 .news-table {
 	border: 0px;
@@ -7,11 +7,11 @@
 .post_title, .post_date,
 .post-title, .post-date {
 	border-bottom: 1px solid #DDDDDD;
+   font-size :1.0em;
 }
 .post_title,
 .post-title {
 	font-weight: bold;
-	font-size: 12px;
 	color: #000000;
 }
 .post_date,
@@ -93,4 +93,7 @@
 .group_page,
 .group-page {
 	text-align: center;
-}
\ No newline at end of file
+}
+
+.post_loop { font-size :1.0em; margin :0px 0px 10px; }
+.post_loop div {  line-height :1.6em; margin :0px 0px 2px; }		
\ No newline at end of file

Property changes on: branches/2.8.x/wb/modules/news/frontend.css
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/news/delete_comment.php
===================================================================
--- branches/2.8.x/wb/modules/news/delete_comment.php	(revision 1456)
+++ branches/2.8.x/wb/modules/news/delete_comment.php	(revision 1457)
@@ -18,18 +18,18 @@
 
 require('../../config.php');
 
+$admin_header = true;
+// Tells script to update when this page was last updated
+$update_when_modified = true;
 // Include WB admin wrapper script
-$update_when_modified = true; // Tells script to update when this page was last updated
 require(WB_PATH.'/modules/admin.php');
 
-$cid = $admin->checkIDKEY('comment_id', false, 'GET');
-$pid = $admin->checkIDKEY('post_id', false, 'GET');
-if (!$pid || !$cid) {
+$comment_id = intval($admin->checkIDKEY('comment_id', false, 'GET'));
+$post_id = intval($admin->checkIDKEY('post_id', false, 'GET'));
+if (!$post_id || !$comment_id) {
 	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], WB_URL.'/modules/news/modify_post.php?page_id='.$page_id.'&section_id='.$section_id/*.'&post_id='.$post_id */);
-	exit();
 } else {
-	$comment_id = $cid;
-	$post_id = $admin->getIDKEY($pid);
+	$post_id = $admin->getIDKEY($post_id);
 }
 
 // Update row
@@ -42,10 +42,8 @@
 }
 else
 {
-	$admin->print_success($TEXT['SUCCESS'], WB_URL.'/modules/news/modify_post.php?page_id='.$page_id.'&section_id='.$section_id.'&post_id='.$post_id);
+	$admin->print_success($TEXT['SUCCESS'], WB_URL.'/modules/news/modify_post.php?page_id='.$page_id.'&section_id='.$section_id.'&post_id='.$post_id );
 }
 
 // Print admin footer
 $admin->print_footer();
-
-?>
\ No newline at end of file

Property changes on: branches/2.8.x/wb/modules/news/delete_comment.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/news/upgrade.php
===================================================================
--- branches/2.8.x/wb/modules/news/upgrade.php	(revision 1456)
+++ branches/2.8.x/wb/modules/news/upgrade.php	(revision 1457)
@@ -1,106 +1,165 @@
-<?php
-/**
- *
- * @category        modules
- * @package         news
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
- * @copyright       2009-2011, Website Baker Org. e.V.
- * @link			http://www.websitebaker2.org/
- * @license         http://www.gnu.org/licenses/gpl.html
- * @platform        WebsiteBaker 2.8.x
- * @requirements    PHP 5.2.2 and higher
- * @version         $Id$
- * @filesource		$HeadURL$
- * @lastmodified    $Date$
- *
- */
-
-if(defined('WB_URL')) {
-
-    function create_new_post($filename, $filetime=NULL, $content )
-    {
-    global $page_id, $section_id, $post_id;
-	// The depth of the page directory in the directory hierarchy
-	// '/pages' is at depth 1
-	$pages_dir_depth = count(explode('/',PAGES_DIRECTORY))-1;
-	// Work-out how many ../'s we need to get to the index page
-	$index_location = '../';
-	for($i = 0; $i < $pages_dir_depth; $i++)
-    {
-		$index_location .= '../';
-	}
-
-	// Write to the filename
-	$content .='
-define("POST_SECTION", $section_id);
-define("POST_ID", $post_id);
-require("'.$index_location.'config.php");
-require(WB_PATH."/index.php");
-?>';
-    	if($handle = fopen($filename, 'w+'))
-        {
-        	fwrite($handle, $content);
-        	fclose($handle);
-            if($filetime)
-            {
-                touch($filename, $filetime);
-            }
-        	change_mode($filename);
-        }
-    }
-
-    // read files from /pages/posts/
-    if( !function_exists('scandir') )
-    {
-        function scandir($directory, $sorting_order = 0)
-        {
-            $dh  = opendir($directory);
-            while( false !== ($filename = readdir($dh)) )
-            {
-                $files[] = $filename;
-            }
-            if( $sorting_order == 0 )
-            {
-                sort($files);
-            } else
-            {
-                rsort($files);
-            }
-            return($files);
-        }
-    }
-
-    $target_dir = WB_PATH . PAGES_DIRECTORY.'/posts/';
-	$files = scandir($target_dir);
-	natcasesort($files);
-
-		// All files in /pages/posts/
-		foreach( $files as $file )
-        {
-            if( file_exists($target_dir.$file)
-                AND ($file != '.')
-                    AND ($file != '..')
-                        AND ($file != 'index.php') )
-            {
-                clearstatcache();
-                $timestamp = filemtime ( $target_dir.$file );
-                $lines = file($target_dir.$file);
-                $content = '';
-                // read lines until first define
-                foreach ($lines as $line_num => $line) {
-                    if(strstr($line,'define'))
-                    {
-                      break;
-                    }
-                    $content .= $line;
-                }
-
-                create_new_post($target_dir.$file, $timestamp, $content);
-            }
-
-        }
-// Print admin footer
-$admin->print_footer();
-}
-?>
\ No newline at end of file
+<?php
+/**
+ *
+ * @category        WebsiteBaker
+ * @package         modules
+ * @subpackage      news
+ * @copyright       2004-2009, Ryan Djurovich
+ * @copyright       2009-2011, Website Baker Org. e.V.
+ * @link			http://www.websitebaker2.org/
+ * @license         http://www.gnu.org/licenses/gpl.html
+ * @platform        WebsiteBaker 2.8.x
+ * @requirements    PHP 5.2.2 and higher
+ * @version         $Id$
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
+ *
+ */
+
+// Must include code to stop this file being access directly
+if(!defined('WB_URL')) { throw new Exception('illegal file access!! ['.$_SERVER['PHP_SELF'].']'); }
+
+/* **** START UPGRADE ******************************************************* */
+	function mod_news_Upgrade()
+	{
+		global $database, $admin, $MESSAGE;
+		$callingScript = $_SERVER["SCRIPT_NAME"];
+		$tmp = 'upgrade-script.php';
+		$globalStarted = substr_compare($callingScript, $tmp,(0-strlen($tmp)),strlen($tmp)) === 0;
+
+		$sPagesPath = WB_PATH.PAGES_DIRECTORY;
+		$sPostsPath = $sPagesPath.'/posts';
+	// create /posts/ - directory if not exists
+		if(!file_exists($sPostsPath)) {
+			if(is_writable($sPagesPath)) {
+				make_dir(WB_PATH.PAGES_DIRECTORY.'/posts/');
+			}else {
+				if(!$globalStarted){
+					$admin->print_error($MESSAGE['PAGES_CANNOT_CREATE_ACCESS_FILE']);
+				}else {
+					echo $MESSAGE['PAGES_CANNOT_CREATE_ACCESS_FILE'].'<br />';
+					return;
+				}
+			}
+			if($globalStarted) {echo 'directory "'.PAGES_DIRECTORY.'/posts/" created.<br />'; }
+		}
+	// check if new fields must be added
+		$doImportDate = true;
+		if(!$database->field_exists(TABLE_PREFIX.'mod_news_posts', 'created_when')) {
+			if(!$database->field_add(TABLE_PREFIX.'mod_news_posts', 'created_when',
+			                        'INT NOT NULL DEFAULT \'0\' AFTER `commenting`')) {
+				if($globalStarted){
+					echo $MESSAGE['RECORD_MODIFIED_FAILED'].'<br />';
+					return;
+				}else {
+					$admin->print_error($MESSAGE['RECORD_MODIFIED_FAILED']);
+				}
+			}
+			if($globalStarted) { echo 'datafield `'.TABLE_PREFIX.'mod_news_posts`.`created_when` added.<br />'; }
+		}else { $doImportDate = false; }
+		if(!$database->field_exists(TABLE_PREFIX.'mod_news_posts', 'created_by')) {
+			if(!$database->field_add(TABLE_PREFIX.'mod_news_posts', 'created_by',
+			                        'INT NOT NULL DEFAULT \'0\' AFTER `created_when`')) {
+				if($globalStarted){
+					echo $MESSAGE['RECORD_MODIFIED_FAILED'].'<br />';
+					return;
+				}else {
+					$admin->print_error($MESSAGE['RECORD_MODIFIED_FAILED']);
+				}
+			}
+			if($globalStarted) {echo 'datafield `'.TABLE_PREFIX.'mod_news_posts`.`created_by` added.<br />'; }
+		}
+	// preset new fields `created_by` and `created_when` from existing values
+		if($doImportDate) {
+			$sql  = 'UPDATE `'.TABLE_PREFIX.'mod_news_posts` ';
+			$sql .= 'SET `created_by`=`posted_by`, `created_when`=`posted_when`';
+			$database->query($sql);
+		}
+	// now iterate through all existing accessfiles,
+	// write its creation date into database
+		$oDir = new DirectoryIterator($sPostsPath);
+		$count = 0;
+		foreach ($oDir as $fileinfo)
+		{
+			$fileName = $fileinfo->getFilename();
+			if((!$fileinfo->isDot()) &&
+			   ($fileName != 'index.php') &&
+			   (substr_compare($fileName,PAGE_EXTENSION,(0-strlen(PAGE_EXTENSION)),strlen(PAGE_EXTENSION)) === 0)
+			  )
+			{
+			// save creation date from old accessfile
+				if($doImportDate) {
+					$link = '/posts/'.preg_replace('/'.preg_quote(PAGE_EXTENSION).'$/i', '', $fileinfo->getFilename());
+					$sql  = 'UPDATE `'.TABLE_PREFIX.'mod_news_posts` ';
+					$sql .= 'SET `created_when`='.$fileinfo->getMTime().' ';
+					$sql .= 'WHERE `link`=\''.$link.'\'';
+					$database->query($sql);
+				}
+			// delete old access file
+				unlink($fileinfo->getPathname());
+				$count++;
+			}
+		}
+		unset($oDir);
+		if($globalStarted && $count > 0) {
+			echo 'save date of creation from '.$count.' old accessfiles and delete these files.<br />';
+		}
+// ************************************************
+	// Check the validity of 'create-file-timestamp' and balance against 'posted-timestamp'
+		$sql  = 'UPDATE `'.TABLE_PREFIX.'mod_news_posts` ';
+		$sql .= 'SET `created_when`=`published_when` ';
+		$sql .= 'WHERE `published_when`<`created_when`';
+		$database->query($sql);
+		$sql  = 'UPDATE `'.TABLE_PREFIX.'mod_news_posts` ';
+		$sql .= 'SET `created_when`=`posted_when` ';
+		$sql .= 'WHERE `published_when`=0 OR `published_when`>`posted_when`';
+		$database->query($sql);
+// ************************************************
+
+	// rebuild all access-files
+		$count = 0;
+		// $backSteps = preg_replace('/^'.preg_quote(WB_PATH).'/', '', $sPostsPath);
+		$backSteps = preg_replace('@^'.preg_quote(WB_PATH).'@', '', $sPostsPath);
+		$backSteps = str_repeat( '../', substr_count($backSteps, '/'));
+		$sql  = 'SELECT `page_id`,`post_id`,`section_id`,`link` ';
+		$sql .= 'FROM `'.TABLE_PREFIX.'mod_news_posts`';
+		$sql .= 'WHERE `link` != \'\'';
+		if( ($resPosts = $database->query($sql)) )
+		{
+			while( $recPost = $resPosts->fetchRow() )
+			{
+				$file = $sPagesPath.$recPost['link'].PAGE_EXTENSION;
+				$content =
+					'<?php'."\n".
+					'// *** This file is generated by WebsiteBaker Ver.'.VERSION."\n".
+					'// *** Creation date: '.date('c')."\n".
+					'// *** Do not modify this file manually'."\n".
+					'// *** WB will rebuild this file from time to time!!'."\n".
+					'// *************************************************'."\n".
+					"\t".'$page_id    = '.$recPost['page_id'].';'."\n".
+					"\t".'$section_id = '.$recPost['section_id'].';'."\n".
+					"\t".'$post_id    = '.$recPost['post_id'].';'."\n".
+					"\t".'$post_section = '.$recPost['section_id'].';'."\n".
+//					"\t".'define(\'POST_SECTION\', '.$recPost['section_id'].');'."\n".
+//					"\t".'define(\'POST_ID\',      '.$recPost['post_id'].');'."\n".
+					"\t".'require(\''.$backSteps.'index.php\');'."\n".
+					'// *************************************************'."\n";
+				if( file_put_contents($file, $content) !== false ) {
+				// Chmod the file
+					change_mode($file);
+				}else {
+					if($globalStarted){
+						echo $MESSAGE['PAGES_CANNOT_CREATE_ACCESS_FILE'].'<br />';
+						return;
+					}else {
+						$admin->print_error($MESSAGE['PAGES_CANNOT_CREATE_ACCESS_FILE']);
+					}
+				}
+				$count++;
+			}
+		}
+		if($globalStarted) { echo 'created '.$count.' new accessfiles.'; }
+		if(!$globalStarted) { $admin->print_footer(); }
+	}
+	mod_news_Upgrade();
+/* **** END UPGRADE ********************************************************* */

Property changes on: branches/2.8.x/wb/modules/news/upgrade.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/news/modify.php
===================================================================
--- branches/2.8.x/wb/modules/news/modify.php	(revision 1456)
+++ branches/2.8.x/wb/modules/news/modify.php	(revision 1457)

Property changes on: branches/2.8.x/wb/modules/news/modify.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/news/backend.css
===================================================================
--- branches/2.8.x/wb/modules/news/backend.css	(revision 1456)
+++ branches/2.8.x/wb/modules/news/backend.css	(revision 1457)
@@ -1,19 +1,19 @@
-.setting_name {
-	vertical-align: top;
-	width: 20%;
-}
-.setting_value {
-	vertical-align: top;
-	width: 80%;
-}
-
-/* 
-  The definitions below provide the style for the edit CSS button 
-  Required CSS class name: input.mod_moduledirectory_edit_css
-*/
-input.mod_news_edit_css {
-  color: #000;
-  padding: 2px;
-  margin: -20px auto;
-  float: right;
-}		
\ No newline at end of file
+						.setting_name {
+	vertical-align: top;
+	width: 20%;
+}
+.setting_value {
+	vertical-align: top;
+	width: 80%;
+}
+
+/* 
+  The definitions below provide the style for the edit CSS button 
+  Required CSS class name: input.mod_moduledirectory_edit_css
+*/
+input.mod_news_edit_css {
+  color: #000;
+  padding: 2px;
+  margin: -20px auto;
+  float: right;
+}								
\ No newline at end of file

Property changes on: branches/2.8.x/wb/modules/news/backend.css
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/news/add.php
===================================================================
--- branches/2.8.x/wb/modules/news/add.php	(revision 1456)
+++ branches/2.8.x/wb/modules/news/add.php	(revision 1457)
@@ -1,75 +1,73 @@
-<?php
-/**
- *
- * @category        modules
- * @package         news
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
- * @copyright       2009-2011, Website Baker Org. e.V.
- * @link			http://www.websitebaker2.org/
- * @license         http://www.gnu.org/licenses/gpl.html
- * @platform        WebsiteBaker 2.8.x
- * @requirements    PHP 5.2.2 and higher
- * @version         $Id$
- * @filesource		$HeadURL$
- * @lastmodified    $Date$
- *
- */
-
-// Must include code to stop this file being access directly
-if(defined('WB_PATH') == false) { exit("Cannot access this file directly"); }
-
-$header = '<table cellpadding=\"0\" cellspacing=\"0\" class=\"loop-header\">'."\n";
-$post_loop = '<tr class=\"post-top\">
-<td class=\"post-title\"><a href=\"[LINK]\">[TITLE]</a></td>
-<td class=\"post-date\">[PUBLISHED_DATE], [PUBLISHED_TIME]</td>
-</tr>
-<tr>
-<td class=\"post-short\" colspan=\"2\">
-[SHORT]
-<span style=\"visibility:[SHOW_READ_MORE];\"><a href=\"[LINK]\">[TEXT_READ_MORE]</a></span>
-</td>
-</tr>';
-$footer = '</table>
-<table cellpadding="0" cellspacing="0" class="page-header" style="display: [DISPLAY_PREVIOUS_NEXT_LINKS]">
-<tr>
-<td class="page-left">[PREVIOUS_PAGE_LINK]</td>
-<td class="page-center">[OF]</td>
-<td class="page-right">[NEXT_PAGE_LINK]</td>
-</tr>
-</table>';
-$post_header = addslashes('<table cellpadding="0" cellspacing="0" class="post-header">
-<tr>
-<td><h1>[TITLE]</h1></td>
-<td rowspan="3" style="display: [DISPLAY_IMAGE]">[GROUP_IMAGE]</td>
-</tr>
-<tr>
-<td class="public-info"><b>[TEXT_POSTED_BY] [DISPLAY_NAME] ([USERNAME]) [TEXT_ON] [PUBLISHED_DATE]</b></td>
-</tr>
-<tr style="display: [DISPLAY_GROUP]">
-<td class="group-page"><a href="[BACK]">[PAGE_TITLE]</a> &gt;&gt; <a href="[BACK]?g=[GROUP_ID]">[GROUP_TITLE]</a></td>
-</tr>
-</table>');
-$post_footer = '<p>[TEXT_LAST_CHANGED]: [MODI_DATE] [TEXT_AT] [MODI_TIME]</p>
-<a href=\"[BACK]\">[TEXT_BACK]</a>';
-$comments_header = addslashes('<br /><br />
-<h2>[TEXT_COMMENTS]</h2>
-<table cellpadding="2" cellspacing="0" class="comment-header">');
-$comments_loop = addslashes('<tr>
-<td class="comment_title">[TITLE]</td>
-<td class="comment_info">[TEXT_BY] [DISPLAY_NAME] [TEXT_ON] [DATE] [TEXT_AT] [TIME]</td>
-</tr>
-<tr>
-<td colspan="2" class="comment-text">[COMMENT]</td>
-</tr>');
-$comments_footer = '</table>
-<br /><a href=\"[ADD_COMMENT_URL]\">[TEXT_ADD_COMMENT]</a>';
-$comments_page = '<h1>[TEXT_COMMENT]</h1>
-<h2>[POST_TITLE]</h2>
-<br />';
-$commenting = 'none';
-$use_captcha = true;
-
-$database->query("INSERT INTO ".TABLE_PREFIX."mod_news_settings (section_id,page_id,header,post_loop,footer,post_header,post_footer,comments_header,comments_loop,comments_footer,comments_page,commenting,use_captcha) VALUES ('$section_id','$page_id','$header','$post_loop','$footer','$post_header','$post_footer','$comments_header','$comments_loop','$comments_footer','$comments_page','$commenting','$use_captcha')");
-
-?>
\ No newline at end of file
+<?php
+/**
+ *
+ * @category        modules
+ * @package         news
+ * @author          WebsiteBaker Project
+ * @copyright       2004-2009, Ryan Djurovich
+ * @copyright       2009-2011, Website Baker Org. e.V.
+ * @link			http://www.websitebaker2.org/
+ * @license         http://www.gnu.org/licenses/gpl.html
+ * @platform        WebsiteBaker 2.8.x
+ * @requirements    PHP 5.2.2 and higher
+ * @version         $Id$
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
+ *
+ */
+
+// Must include code to stop this file being access directly
+if(defined('WB_PATH') == false) { exit("Cannot access this file directly"); }
+
+$header = '<table cellpadding=\"0\" cellspacing=\"0\" class=\"loop-header\">'."\n";
+$post_loop = '<tr class=\"post-top\">
+<td class=\"post-title\"><a href=\"[LINK]\">[TITLE]</a></td>
+<td class=\"post-date\">[PUBLISHED_DATE], [PUBLISHED_TIME]</td>
+</tr>
+<tr>
+<td class=\"post-short\" colspan=\"2\">
+[SHORT]
+<span style=\"visibility:[SHOW_READ_MORE];\"><a href=\"[LINK]\">[TEXT_READ_MORE]</a></span>
+</td>
+</tr>';
+$footer = '</table>
+<table cellpadding="0" cellspacing="0" class="page-header" style="display: [DISPLAY_PREVIOUS_NEXT_LINKS]">
+<tr>
+<td class="page-left">[PREVIOUS_PAGE_LINK]</td>
+<td class="page-center">[OF]</td>
+<td class="page-right">[NEXT_PAGE_LINK]</td>
+</tr>
+</table>';
+$post_header = addslashes('<table cellpadding="0" cellspacing="0" class="post-header">
+<tr>
+<td><h1>[TITLE]</h1></td>
+<td rowspan="3" style="display: [DISPLAY_IMAGE]">[GROUP_IMAGE]</td>
+</tr>
+<tr>
+<td class="public-info"><b>[TEXT_POSTED_BY] [DISPLAY_NAME] ([USERNAME]) [TEXT_ON] [PUBLISHED_DATE]</b></td>
+</tr>
+<tr style="display: [DISPLAY_GROUP]">
+<td class="group-page"><a href="[BACK]">[PAGE_TITLE]</a> &gt;&gt; <a href="[BACK]?g=[GROUP_ID]">[GROUP_TITLE]</a></td>
+</tr>
+</table>');
+$post_footer = '<p>[TEXT_LAST_CHANGED]: [MODI_DATE] [TEXT_AT] [MODI_TIME]</p>
+<a href=\"[BACK]\">[TEXT_BACK]</a>';
+$comments_header = addslashes('<br /><br />
+<h2>[TEXT_COMMENTS]</h2>
+<table cellpadding="2" cellspacing="0" class="comment-header">');
+$comments_loop = addslashes('<tr>
+<td class="comment_title">[TITLE]</td>
+<td class="comment_info">[TEXT_BY] [DISPLAY_NAME] [TEXT_ON] [DATE] [TEXT_AT] [TIME]</td>
+</tr>
+<tr>
+<td colspan="2" class="comment-text">[COMMENT]</td>
+</tr>');
+$comments_footer = '</table>
+<br /><a href=\"[ADD_COMMENT_URL]\">[TEXT_ADD_COMMENT]</a>';
+$comments_page = '<h1>[TEXT_COMMENT]</h1>
+<h2>[POST_TITLE]</h2>
+<br />';
+$commenting = 'none';
+$use_captcha = true;
+
+$database->query("INSERT INTO ".TABLE_PREFIX."mod_news_settings (section_id,page_id,header,post_loop,footer,post_header,post_footer,comments_header,comments_loop,comments_footer,comments_page,commenting,use_captcha) VALUES ('$section_id','$page_id','$header','$post_loop','$footer','$post_header','$post_footer','$comments_header','$comments_loop','$comments_footer','$comments_page','$commenting','$use_captcha')");

Property changes on: branches/2.8.x/wb/modules/news/add.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/news/modify_post.php
===================================================================
--- branches/2.8.x/wb/modules/news/modify_post.php	(revision 1456)
+++ branches/2.8.x/wb/modules/news/modify_post.php	(revision 1457)
@@ -1,255 +1,259 @@
-<?php
-/**
- *
- * @category        modules
- * @package         news
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
- * @copyright       2009-2011, Website Baker Org. e.V.
- * @link			http://www.websitebaker2.org/
- * @license         http://www.gnu.org/licenses/gpl.html
- * @platform        WebsiteBaker 2.8.x
- * @requirements    PHP 5.2.2 and higher
- * @version         $Id$
- * @filesource		$HeadURL$
- * @lastmodified    $Date$
- *
- */
-
-require('../../config.php');
-
-// Include WB admin wrapper script
-require(WB_PATH.'/modules/admin.php');
-
-$post_id = $admin->checkIDKEY('post_id', false, 'GET');
-if (!$post_id) {
-	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL);
-	exit();
-}
-
-// Get header and footer
-$query_content = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_news_posts WHERE post_id = '$post_id'");
-$fetch_content = $query_content->fetchRow();
-
-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.'" rows="10" cols="1" style="width: '.$width.'; height: '.$height.';">'.$content.'</textarea>';
-	}
-} else {
-	$id_list=array("short","long");
-	require(WB_PATH.'/modules/'.WYSIWYG_EDITOR.'/include.php');
-}
-
-// include jscalendar-setup
-$jscal_use_time = true; // whether to use a clock, too
-require_once(WB_PATH."/include/jscalendar/wb-setup.php");
-?>
-<h2><?php echo $TEXT['ADD'].'/'.$TEXT['MODIFY'].' '.$TEXT['POST']; ?></h2>
-<div class="jsadmin jcalendar hide"></div> 
-<form name="modify" action="<?php echo WB_URL; ?>/modules/news/save_post.php" method="post" style="margin: 0;">
-
-<input type="hidden" name="section_id" value="<?php echo $section_id; ?>" />
-<input type="hidden" name="page_id" value="<?php echo $page_id; ?>" />
-<input type="hidden" name="post_id" value="<?php echo $post_id; ?>" />
-<input type="hidden" name="link" value="<?php echo $fetch_content['link']; ?>" />
-<?php echo $admin->getFTAN(); ?>
-
-<table class="row_a" cellpadding="2" cellspacing="0" width="100%">
-<tr>
-	<td><?php echo $TEXT['TITLE']; ?>:</td>
-	<td width="80%">
-		<input type="text" name="title" value="<?php echo (htmlspecialchars($fetch_content['title'])); ?>" style="width: 98%;" maxlength="255" />
-	</td>
-</tr>
-<tr>
-	<td><?php echo $TEXT['GROUP']; ?>:</td>
-	<td>
-		<select name="group" style="width: 100%;">
-			<option value="0"><?php echo $TEXT['NONE']; ?></option>
-			<?php
-			$query = $database->query("SELECT group_id,title FROM ".TABLE_PREFIX."mod_news_groups WHERE section_id = '$section_id' ORDER BY position ASC");
-			if($query->numRows() > 0) {
-				// Loop through groups
-				while($group = $query->fetchRow()) {
-					?>
-					<option value="<?php echo $group['group_id']; ?>"<?php if($fetch_content['group_id'] == $group['group_id']) { echo ' selected="selected"'; } ?>><?php echo $group['title']; ?></option>
-					<?php
-				}
-			}
-			?>
-		</select>
-	</td>
-</tr>
-<tr>
-	<td><?php echo $TEXT['COMMENTING']; ?>:</td>
-	<td>
-		<select name="commenting" style="width: 100%;">
-			<option value="none"><?php echo $TEXT['DISABLED']; ?></option>
-			<option value="public" <?php if($fetch_content['commenting'] == 'public') { echo ' selected="selected"'; } ?>><?php echo $TEXT['PUBLIC']; ?></option>
-			<option value="private" <?php if($fetch_content['commenting'] == 'private') { echo ' selected="selected"'; } ?>><?php echo $TEXT['PRIVATE']; ?></option>
-		</select>
-	</td>
-</tr>
-<tr>
-	<td><?php echo $TEXT['ACTIVE']; ?>:</td>
-	<td>
-		<input type="radio" name="active" id="active_true" value="1" <?php if($fetch_content['active'] == 1) { echo ' checked="checked"'; } ?> />
-		<a href="#" onclick="javascript: document.getElementById('active_true').checked = true;">
-		<?php echo $TEXT['YES']; ?>
-		</a>
-		&nbsp;
-		<input type="radio" name="active" id="active_false" value="0" <?php if($fetch_content['active'] == 0) { echo ' checked="checked"'; } ?> />
-		<a href="#" onclick="javascript: document.getElementById('active_false').checked = true;">
-		<?php echo $TEXT['NO']; ?>
-		</a>
-	</td>
-</tr>
-<tr>
-	<td><?php echo $TEXT['PUBL_START_DATE']; ?>:</td>
-	<td>
-	<input type="text" id="publishdate" name="publishdate" value="<?php if($fetch_content['published_when']==0) print date($jscal_format, strtotime((date('Y-m-d H:i')))); else print date($jscal_format, $fetch_content['published_when']);?>" style="width: 120px;" />
-	<img src="<?php echo THEME_URL ?>/images/clock_16.png" id="publishdate_trigger" style="cursor: pointer;" title="<?php echo $TEXT['CALENDAR']; ?>" alt="<?php echo $TEXT['CALENDAR']; ?>" onmouseover="this.style.background='lightgrey';" onmouseout="this.style.background=''" />
-	<img src="<?php echo THEME_URL ?>/images/clock_del_16.png" style="cursor: pointer;" title="<?php echo $TEXT['DELETE_DATE']; ?>" alt="<?php echo $TEXT['DELETE_DATE']; ?>" onmouseover="this.style.background='lightgrey';" onmouseout="this.style.background=''" onclick="document.modify.publishdate.value=''" />
-	</td>
-</tr>
-<tr>
-	<td><?php echo $TEXT['PUBL_END_DATE']; ?>:</td>
-	<td>
-	<input type="text" id="enddate" name="enddate" value="<?php if($fetch_content['published_until']==0) print ""; else print date($jscal_format, $fetch_content['published_until'])?>" style="width: 120px;" />
-	<img src="<?php echo THEME_URL ?>/images/clock_16.png" id="enddate_trigger" style="cursor: pointer;" title="<?php echo $TEXT['CALENDAR']; ?>" alt="<?php echo $TEXT['CALENDAR']; ?>" onmouseover="this.style.background='lightgrey';" onmouseout="this.style.background=''" />
-	<img src="<?php echo THEME_URL ?>/images/clock_del_16.png" style="cursor: pointer;" title="<?php echo $TEXT['DELETE_DATE']; ?>" alt="<?php echo $TEXT['DELETE_DATE']; ?>" onmouseover="this.style.background='lightgrey';" onmouseout="this.style.background=''" onclick="document.modify.enddate.value=''" />
-	</td>
-</tr>
-</table>
-
-<table class="row_a" cellpadding="2" cellspacing="0" border="0" width="100%">
-<tr>
-	<td valign="top"><?php echo $TEXT['SHORT']; ?>:</td>
-</tr>
-<tr>
-	<td>
-	<?php
-	show_wysiwyg_editor("short","short",htmlspecialchars($fetch_content['content_short']),"100%","200px");
-	?>
-	</td>
-</tr>
-<tr>
-	<td valign="top"><?php echo $TEXT['LONG']; ?>:</td>
-</tr>
-<tr>
-	<td>
-	<?php
-	show_wysiwyg_editor("long","long",htmlspecialchars($fetch_content['content_long']),"100%","650px");
-	?>
-	</td>
-</tr>
-</table>
-
-<table cellpadding="2" cellspacing="0" border="0" width="100%">
-<tr>
-	<td align="left">
-		<input name="save" type="submit" value="<?php echo $TEXT['SAVE']; ?>" style="width: 100px; margin-top: 5px;" />
-	</td>
-	<td align="right">
-		<input type="button" value="<?php echo $TEXT['CANCEL']; ?>" onclick="javascript: window.location = '<?php echo ADMIN_URL; ?>/pages/modify.php?page_id=<?php echo $page_id; ?>';" style="width: 100px; margin-top: 5px;" />
-	</td>
-</tr>
-</table>
-</form>
-
-<script type="text/javascript">
-	Calendar.setup(
-		{
-			inputField  : "publishdate",
-			ifFormat    : "<?php echo $jscal_ifformat ?>",
-			button      : "publishdate_trigger",
-			firstDay    : <?php echo $jscal_firstday ?>,
-			<?php if(isset($jscal_use_time) && $jscal_use_time==TRUE)
-            { ?>
-				showsTime   : "true",
-				timeFormat  : "24",
-			<?php
-            } ?>
-			date        : "<?php echo $jscal_today ?>",
-			range       : [1970, 2037],
-			step        : 1
-		}
-	);
-	Calendar.setup(
-		{
-			inputField  : "enddate",
-			ifFormat    : "<?php echo $jscal_ifformat ?>",
-			button      : "enddate_trigger",
-			firstDay    : <?php echo $jscal_firstday ?>,
-			<?php if(isset($jscal_use_time) && $jscal_use_time==TRUE)
-            { ?>
-				showsTime   : "true",
-				timeFormat  : "24",
-			<?php
-            } ?>
-			date        : "<?php echo $jscal_today ?>",
-			range       : [1970, 2037],
-			step        : 1
-		}
-	);
-</script>
-
-<br />
-
-<h2><?php echo $TEXT['MODIFY'].'/'.$TEXT['DELETE'].' '.$TEXT['COMMENT']; ?></h2>
-
-<?php
-
-// Loop through existing posts
-$query_comments = $database->query("SELECT * FROM `".TABLE_PREFIX."mod_news_comments` WHERE section_id = '$section_id' AND post_id = '$post_id' ORDER BY commented_when DESC");
-if($query_comments->numRows() > 0) {
-	$row = 'a';
-	$pid = $admin->getIDKEY($post_id);
-	?>
-	<table cellpadding="2" cellspacing="0" border="0" width="100%">
-	<?php
-	while($comment = $query_comments->fetchRow()) {
-		$cid = $admin->getIDKEY($comment['comment_id']);
-		?>
-		<tr class="row_<?php echo $row; ?>" >
-			<td width="20" style="padding-left: 5px;">
-				<a href="<?php echo WB_URL; ?>/modules/news/modify_comment.php?page_id=<?php echo $page_id; ?>&amp;section_id=<?php
-					echo $section_id; ?>&amp;comment_id=<?php echo $cid; ?>" title="<?php echo $TEXT['MODIFY']; ?>">
-					<img src="<?php echo THEME_URL; ?>/images/modify_16.png" border="0" alt="^" />
-				</a>
-			</td>	
-			<td>
-				<a href="<?php echo WB_URL; ?>/modules/news/modify_comment.php?page_id=<?php echo $page_id; ?>&amp;section_id=<?php
-					echo $section_id; ?>&amp;comment_id=<?php echo $cid; ?>">
-					<?php echo $comment['title']; ?>
-				</a>
-			</td>
-			<td width="20">
-				<a href="javascript: confirm_link('<?php echo $TEXT['ARE_YOU_SURE']; ?>', '<?php
-					echo WB_URL; ?>/modules/news/delete_comment.php?page_id=<?php echo $page_id; ?>&amp;section_id=<?php
-					echo $section_id; ?>&amp;post_id=<?php echo $pid; ?>&amp;comment_id=<?php echo $cid; ?>');" title="<?php
-					echo $TEXT['DELETE']; ?>">
-					<img src="<?php echo THEME_URL; ?>/images/delete_16.png" border="0" alt="X" />
-				</a>
-			</td>
-		</tr>
-		<?php
-		// Alternate row color
-		if($row == 'a') {
-			$row = 'b';
-		} else {
-			$row = 'a';
-		}
-	}
-	?>
-	</table>
-	<?php
-} else {
-	echo $TEXT['NONE_FOUND'];
-}
-
-
-// Print admin footer
-$admin->print_footer();
-
+<?php
+/**
+ *
+ * @category        modules
+ * @package         news
+ * @author          WebsiteBaker Project
+ * @copyright       2004-2009, Ryan Djurovich
+ * @copyright       2009-2011, Website Baker Org. e.V.
+ * @link			http://www.websitebaker2.org/
+ * @license         http://www.gnu.org/licenses/gpl.html
+ * @platform        WebsiteBaker 2.8.x
+ * @requirements    PHP 5.2.2 and higher
+ * @version         $Id$
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
+ *
+ */
+
+require('../../config.php');
+
+// $admin_header = true;
+// Tells script to update when this page was last updated
+$update_when_modified = false;
+// show the info banner
+$print_info_banner = true;
+// Include WB admin wrapper script
+require(WB_PATH.'/modules/admin.php');
+
+$post_id = intval($admin->checkIDKEY('post_id', false, 'GET'));
+if (!$post_id) {
+	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL);
+}
+
+// Get header and footer
+$query_content = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_news_posts WHERE post_id = '$post_id'");
+$fetch_content = $query_content->fetchRow();
+
+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.'" rows="10" cols="1" style="width: '.$width.'; height: '.$height.';">'.$content.'</textarea>';
+	}
+} else {
+	$id_list=array("short","long");
+	require(WB_PATH.'/modules/'.WYSIWYG_EDITOR.'/include.php');
+}
+
+// include jscalendar-setup
+$jscal_use_time = true; // whether to use a clock, too
+require_once(WB_PATH."/include/jscalendar/wb-setup.php");
+?>
+<h2><?php echo $TEXT['ADD'].'/'.$TEXT['MODIFY'].' '.$TEXT['POST']; ?></h2>
+<div class="jsadmin jcalendar hide"></div> 
+<form name="modify" action="<?php echo WB_URL; ?>/modules/news/save_post.php" method="post" style="margin: 0;">
+
+<input type="hidden" name="section_id" value="<?php echo $section_id; ?>" />
+<input type="hidden" name="page_id" value="<?php echo $page_id; ?>" />
+<input type="hidden" name="post_id" value="<?php echo $post_id; ?>" />
+<input type="hidden" name="link" value="<?php echo $fetch_content['link']; ?>" />
+<?php echo $admin->getFTAN(); ?>
+
+<table class="row_a" cellpadding="2" cellspacing="0" width="100%">
+<tr>
+	<td><?php echo $TEXT['TITLE']; ?>:</td>
+	<td width="80%">
+		<input type="text" name="title" value="<?php echo (htmlspecialchars($fetch_content['title'])); ?>" style="width: 98%;" maxlength="255" />
+	</td>
+</tr>
+<tr>
+	<td><?php echo $TEXT['GROUP']; ?>:</td>
+	<td>
+		<select name="group" style="width: 100%;">
+			<option value="0"><?php echo $TEXT['NONE']; ?></option>
+			<?php
+			$query = $database->query("SELECT group_id,title FROM ".TABLE_PREFIX."mod_news_groups WHERE section_id = '$section_id' ORDER BY position ASC");
+			if($query->numRows() > 0) {
+				// Loop through groups
+				while($group = $query->fetchRow()) {
+					?>
+					<option value="<?php echo $group['group_id']; ?>"<?php if($fetch_content['group_id'] == $group['group_id']) { echo ' selected="selected"'; } ?>><?php echo $group['title']; ?></option>
+					<?php
+				}
+			}
+			?>
+		</select>
+	</td>
+</tr>
+<tr>
+	<td><?php echo $TEXT['COMMENTING']; ?>:</td>
+	<td>
+		<select name="commenting" style="width: 100%;">
+			<option value="none"><?php echo $TEXT['DISABLED']; ?></option>
+			<option value="public" <?php if($fetch_content['commenting'] == 'public') { echo ' selected="selected"'; } ?>><?php echo $TEXT['PUBLIC']; ?></option>
+			<option value="private" <?php if($fetch_content['commenting'] == 'private') { echo ' selected="selected"'; } ?>><?php echo $TEXT['PRIVATE']; ?></option>
+		</select>
+	</td>
+</tr>
+<tr>
+	<td><?php echo $TEXT['ACTIVE']; ?>:</td>
+	<td>
+		<input type="radio" name="active" id="active_true" value="1" <?php if($fetch_content['active'] == 1) { echo ' checked="checked"'; } ?> />
+		<a href="#" onclick="javascript: document.getElementById('active_true').checked = true;">
+		<?php echo $TEXT['YES']; ?>
+		</a>
+		&nbsp;
+		<input type="radio" name="active" id="active_false" value="0" <?php if($fetch_content['active'] == 0) { echo ' checked="checked"'; } ?> />
+		<a href="#" onclick="javascript: document.getElementById('active_false').checked = true;">
+		<?php echo $TEXT['NO']; ?>
+		</a>
+	</td>
+</tr>
+<tr>
+	<td><?php echo $TEXT['PUBL_START_DATE']; ?>:</td>
+	<td>
+	<input type="text" id="publishdate" name="publishdate" value="<?php if($fetch_content['published_when']==0) print date($jscal_format, strtotime((date('Y-m-d H:i')))); else print date($jscal_format, $fetch_content['published_when']);?>" style="width: 120px;" />
+	<img src="<?php echo THEME_URL ?>/images/clock_16.png" id="publishdate_trigger" style="cursor: pointer;" title="<?php echo $TEXT['CALENDAR']; ?>" alt="<?php echo $TEXT['CALENDAR']; ?>" onmouseover="this.style.background='lightgrey';" onmouseout="this.style.background=''" />
+	<img src="<?php echo THEME_URL ?>/images/clock_del_16.png" style="cursor: pointer;" title="<?php echo $TEXT['DELETE_DATE']; ?>" alt="<?php echo $TEXT['DELETE_DATE']; ?>" onmouseover="this.style.background='lightgrey';" onmouseout="this.style.background=''" onclick="document.modify.publishdate.value=''" />
+	</td>
+</tr>
+<tr>
+	<td><?php echo $TEXT['PUBL_END_DATE']; ?>:</td>
+	<td>
+	<input type="text" id="enddate" name="enddate" value="<?php if($fetch_content['published_until']==0) print ""; else print date($jscal_format, $fetch_content['published_until'])?>" style="width: 120px;" />
+	<img src="<?php echo THEME_URL ?>/images/clock_16.png" id="enddate_trigger" style="cursor: pointer;" title="<?php echo $TEXT['CALENDAR']; ?>" alt="<?php echo $TEXT['CALENDAR']; ?>" onmouseover="this.style.background='lightgrey';" onmouseout="this.style.background=''" />
+	<img src="<?php echo THEME_URL ?>/images/clock_del_16.png" style="cursor: pointer;" title="<?php echo $TEXT['DELETE_DATE']; ?>" alt="<?php echo $TEXT['DELETE_DATE']; ?>" onmouseover="this.style.background='lightgrey';" onmouseout="this.style.background=''" onclick="document.modify.enddate.value=''" />
+	</td>
+</tr>
+</table>
+
+<table class="row_a" cellpadding="2" cellspacing="0" border="0" width="100%">
+<tr>
+	<td valign="top"><?php echo $TEXT['SHORT']; ?>:</td>
+</tr>
+<tr>
+	<td>
+	<?php
+	show_wysiwyg_editor("short","short",htmlspecialchars($fetch_content['content_short']),"100%","200px");
+	?>
+	</td>
+</tr>
+<tr>
+	<td valign="top"><?php echo $TEXT['LONG']; ?>:</td>
+</tr>
+<tr>
+	<td>
+	<?php
+	show_wysiwyg_editor("long","long",htmlspecialchars($fetch_content['content_long']),"100%","650px");
+	?>
+	</td>
+</tr>
+</table>
+
+<table cellpadding="2" cellspacing="0" border="0" width="100%">
+<tr>
+	<td align="left">
+		<input name="save" type="submit" value="<?php echo $TEXT['SAVE']; ?>" style="width: 100px; margin-top: 5px;" />
+	</td>
+	<td align="right">
+		<input type="button" value="<?php echo $TEXT['CANCEL']; ?>" onclick="javascript: window.location = '<?php echo ADMIN_URL; ?>/pages/modify.php?page_id=<?php echo $page_id; ?>';" style="width: 100px; margin-top: 5px;" />
+	</td>
+</tr>
+</table>
+</form>
+
+<script type="text/javascript">
+	Calendar.setup(
+		{
+			inputField  : "publishdate",
+			ifFormat    : "<?php echo $jscal_ifformat ?>",
+			button      : "publishdate_trigger",
+			firstDay    : <?php echo $jscal_firstday ?>,
+			<?php if(isset($jscal_use_time) && $jscal_use_time==TRUE)
+            { ?>
+				showsTime   : "true",
+				timeFormat  : "24",
+			<?php
+            } ?>
+			date        : "<?php echo $jscal_today ?>",
+			range       : [1970, 2037],
+			step        : 1
+		}
+	);
+	Calendar.setup(
+		{
+			inputField  : "enddate",
+			ifFormat    : "<?php echo $jscal_ifformat ?>",
+			button      : "enddate_trigger",
+			firstDay    : <?php echo $jscal_firstday ?>,
+			<?php if(isset($jscal_use_time) && $jscal_use_time==TRUE)
+            { ?>
+				showsTime   : "true",
+				timeFormat  : "24",
+			<?php
+            } ?>
+			date        : "<?php echo $jscal_today ?>",
+			range       : [1970, 2037],
+			step        : 1
+		}
+	);
+</script>
+
+<br />
+
+<h2><?php echo $TEXT['MODIFY'].'/'.$TEXT['DELETE'].' '.$TEXT['COMMENT']; ?></h2>
+
+<?php
+
+// Loop through existing posts
+$query_comments = $database->query("SELECT * FROM `".TABLE_PREFIX."mod_news_comments` WHERE section_id = '$section_id' AND post_id = '$post_id' ORDER BY commented_when DESC");
+if($query_comments->numRows() > 0) {
+	$row = 'a';
+	$pid = $admin->getIDKEY($post_id);
+	?>
+	<table cellpadding="2" cellspacing="0" border="0" width="100%">
+	<?php
+	while($comment = $query_comments->fetchRow()) {
+		$cid = $admin->getIDKEY($comment['comment_id']);
+		?>
+		<tr class="row_<?php echo $row; ?>" >
+			<td width="20" style="padding-left: 5px;">
+				<a href="<?php echo WB_URL; ?>/modules/news/modify_comment.php?page_id=<?php echo $page_id; ?>&amp;section_id=<?php
+					echo $section_id; ?>&amp;comment_id=<?php echo $cid; ?>" title="<?php echo $TEXT['MODIFY']; ?>">
+					<img src="<?php echo THEME_URL; ?>/images/modify_16.png" border="0" alt="^" />
+				</a>
+			</td>	
+			<td>
+				<a href="<?php echo WB_URL; ?>/modules/news/modify_comment.php?page_id=<?php echo $page_id; ?>&amp;section_id=<?php
+					echo $section_id; ?>&amp;comment_id=<?php echo $cid; ?>">
+					<?php echo $comment['title']; ?>
+				</a>
+			</td>
+			<td width="20">
+				<a href="javascript: confirm_link('<?php echo $TEXT['ARE_YOU_SURE']; ?>', '<?php
+					echo WB_URL; ?>/modules/news/delete_comment.php?page_id=<?php echo $page_id; ?>&amp;section_id=<?php
+					echo $section_id; ?>&amp;post_id=<?php echo $pid; ?>&amp;comment_id=<?php echo $cid; ?>');" title="<?php
+					echo $TEXT['DELETE']; ?>">
+					<img src="<?php echo THEME_URL; ?>/images/delete_16.png" border="0" alt="X" />
+				</a>
+			</td>
+		</tr>
+		<?php
+		// Alternate row color
+		if($row == 'a') {
+			$row = 'b';
+		} else {
+			$row = 'a';
+		}
+	}
+	?>
+	</table>
+	<?php
+} else {
+	echo $TEXT['NONE_FOUND'];
+}
+
+
+// Print admin footer
+$admin->print_footer();
+
 ?>
\ No newline at end of file

Property changes on: branches/2.8.x/wb/modules/news/modify_post.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/news/move_down.php
===================================================================
--- branches/2.8.x/wb/modules/news/move_down.php	(revision 1456)
+++ branches/2.8.x/wb/modules/news/move_down.php	(revision 1457)
@@ -1,56 +1,54 @@
-<?php
-/**
- *
- * @category        modules
- * @package         news
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
- * @copyright       2009-2011, Website Baker Org. e.V.
- * @link			http://www.websitebaker2.org/
- * @license         http://www.gnu.org/licenses/gpl.html
- * @platform        WebsiteBaker 2.8.x
- * @requirements    PHP 5.2.2 and higher
- * @version         $Id$
- * @filesource		$HeadURL$
- * @lastmodified    $Date$
- *
- */
-
-require('../../config.php');
-
-// Include WB admin wrapper script
-require(WB_PATH.'/modules/admin.php');
-
-// Get id
-$pid = $admin->checkIDKEY('post_id', false, 'GET');
-$gid = $admin->checkIDKEY('group_id', false, 'GET');
-if (!$pid) {
-	if (!$gid) {
-		$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL);
-		exit();
-	} else {
-		$id = $gid;
-		$id_field = 'group_id';
-		$table = TABLE_PREFIX.'mod_news_groups';
-	}
-} else {
-	$id = $pid;
-	$id_field = 'post_id';
-	$table = TABLE_PREFIX.'mod_news_posts';
-}
-
-// Include the ordering class
-require(WB_PATH.'/framework/class.order.php');
-
-// Create new order object an reorder
-$order = new order($table, 'position', $id_field, 'section_id');
-if($order->move_down($id)) {
-	$admin->print_success($TEXT['SUCCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id);
-} else {
-	$admin->print_error($TEXT['ERROR'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id);
-}
-
-// Print admin footer
-$admin->print_footer();
-
-?>
\ No newline at end of file
+<?php
+/**
+ *
+ * @category        modules
+ * @package         news
+ * @author          WebsiteBaker Project
+ * @copyright       2004-2009, Ryan Djurovich
+ * @copyright       2009-2011, Website Baker Org. e.V.
+ * @link			http://www.websitebaker2.org/
+ * @license         http://www.gnu.org/licenses/gpl.html
+ * @platform        WebsiteBaker 2.8.x
+ * @requirements    PHP 5.2.2 and higher
+ * @version         $Id$
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
+ *
+ */
+
+require('../../config.php');
+
+// Include WB admin wrapper script
+require(WB_PATH.'/modules/admin.php');
+
+// Get id
+$pid = $admin->checkIDKEY('post_id', false, 'GET');
+$gid = $admin->checkIDKEY('group_id', false, 'GET');
+if (!$pid) {
+	if (!$gid) {
+		$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL);
+		exit();
+	} else {
+		$id = $gid;
+		$id_field = 'group_id';
+		$table = TABLE_PREFIX.'mod_news_groups';
+	}
+} else {
+	$id = $pid;
+	$id_field = 'post_id';
+	$table = TABLE_PREFIX.'mod_news_posts';
+}
+
+// Include the ordering class
+require(WB_PATH.'/framework/class.order.php');
+
+// Create new order object an reorder
+$order = new order($table, 'position', $id_field, 'section_id');
+if($order->move_down($id)) {
+	$admin->print_success($TEXT['SUCCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id);
+} else {
+	$admin->print_error($TEXT['ERROR'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id);
+}
+
+// Print admin footer
+$admin->print_footer();

Property changes on: branches/2.8.x/wb/modules/news/move_down.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/news/comment_page.php
===================================================================
--- branches/2.8.x/wb/modules/news/comment_page.php	(revision 1456)
+++ branches/2.8.x/wb/modules/news/comment_page.php	(revision 1457)
@@ -76,7 +76,7 @@
 	<input id="comment" name="comment" size="60" value="" /><br />
 	</p>
 	<?php }
-	echo $admin->getFTAN(); 
+	// echo $admin->getFTAN();
 	echo $TEXT['TITLE']; ?>:
 	<br />
 	<input type="text" name="title" maxlength="255" style="width: 90%;"<?php if(isset($_SESSION['comment_title'])) { echo ' value="'.$_SESSION['comment_title'].'"'; unset($_SESSION['comment_title']); } ?> />

Property changes on: branches/2.8.x/wb/modules/news/comment_page.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/news/delete.php
===================================================================
--- branches/2.8.x/wb/modules/news/delete.php	(revision 1456)
+++ branches/2.8.x/wb/modules/news/delete.php	(revision 1457)
@@ -1,49 +1,49 @@
-<?php
-/**
- *
- * @category        modules
- * @package         news
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
- * @copyright       2009-2011, Website Baker Org. e.V.
- * @link			http://www.websitebaker2.org/
- * @license         http://www.gnu.org/licenses/gpl.html
- * @platform        WebsiteBaker 2.8.x
- * @requirements    PHP 5.2.2 and higher
- * @version         $Id$
- * @filesource		$HeadURL$
- * @lastmodified    $Date$
- *
- */
-
-// Must include code to stop this file being access directly
-if(defined('WB_PATH') == false)
-{
-  exit("Cannot access this file directly");
-}
-
-//get and remove all php files created for the news section
-$query_details = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_news_posts WHERE section_id = '$section_id'");
-if($query_details->numRows() > 0) {
-	while($link = $query_details->fetchRow()) {
-		if(is_writable(WB_PATH.PAGES_DIRECTORY.$link['link'].PAGE_EXTENSION)) {
-		unlink(WB_PATH.PAGES_DIRECTORY.$link['link'].PAGE_EXTENSION);
-		}
-	}
-}
-//check to see if any other sections are part of the news page, if only 1 news is there delete it
-$query_details = $database->query("SELECT * FROM ".TABLE_PREFIX."sections WHERE page_id = '$page_id'");
-if($query_details->numRows() == 1) {
-	$query_details2 = $database->query("SELECT * FROM ".TABLE_PREFIX."pages WHERE page_id = '$page_id'");
-	$link = $query_details2->fetchRow();
-	if(is_writable(WB_PATH.PAGES_DIRECTORY.$link['link'].PAGE_EXTENSION)) {
-		unlink(WB_PATH.PAGES_DIRECTORY.$link['link'].PAGE_EXTENSION);
-	}
-}
-
-$database->query("DELETE FROM ".TABLE_PREFIX."mod_news_posts WHERE section_id = '$section_id'");
-$database->query("DELETE FROM ".TABLE_PREFIX."mod_news_groups WHERE section_id = '$section_id'");
-$database->query("DELETE FROM ".TABLE_PREFIX."mod_news_comments WHERE section_id = '$section_id'");
-$database->query("DELETE FROM ".TABLE_PREFIX."mod_news_settings WHERE section_id = '$section_id'");
-
+<?php
+/**
+ *
+ * @category        modules
+ * @package         news
+ * @author          WebsiteBaker Project
+ * @copyright       2004-2009, Ryan Djurovich
+ * @copyright       2009-2011, Website Baker Org. e.V.
+ * @link			http://www.websitebaker2.org/
+ * @license         http://www.gnu.org/licenses/gpl.html
+ * @platform        WebsiteBaker 2.8.x
+ * @requirements    PHP 5.2.2 and higher
+ * @version         $Id$
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
+ *
+ */
+
+// Must include code to stop this file being access directly
+if(defined('WB_PATH') == false)
+{
+  exit("Cannot access this file directly");
+}
+
+//get and remove all php files created for the news section
+$query_details = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_news_posts WHERE section_id = '$section_id'");
+if($query_details->numRows() > 0) {
+	while($link = $query_details->fetchRow()) {
+		if(is_writable(WB_PATH.PAGES_DIRECTORY.$link['link'].PAGE_EXTENSION)) {
+		unlink(WB_PATH.PAGES_DIRECTORY.$link['link'].PAGE_EXTENSION);
+		}
+	}
+}
+//check to see if any other sections are part of the news page, if only 1 news is there delete it
+$query_details = $database->query("SELECT * FROM ".TABLE_PREFIX."sections WHERE page_id = '$page_id'");
+if($query_details->numRows() == 1) {
+	$query_details2 = $database->query("SELECT * FROM ".TABLE_PREFIX."pages WHERE page_id = '$page_id'");
+	$link = $query_details2->fetchRow();
+	if(is_writable(WB_PATH.PAGES_DIRECTORY.$link['link'].PAGE_EXTENSION)) {
+		unlink(WB_PATH.PAGES_DIRECTORY.$link['link'].PAGE_EXTENSION);
+	}
+}
+
+$database->query("DELETE FROM ".TABLE_PREFIX."mod_news_posts WHERE section_id = '$section_id'");
+$database->query("DELETE FROM ".TABLE_PREFIX."mod_news_groups WHERE section_id = '$section_id'");
+$database->query("DELETE FROM ".TABLE_PREFIX."mod_news_comments WHERE section_id = '$section_id'");
+$database->query("DELETE FROM ".TABLE_PREFIX."mod_news_settings WHERE section_id = '$section_id'");
+
 ?>
\ No newline at end of file

Property changes on: branches/2.8.x/wb/modules/news/delete.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/news/comment.php
===================================================================
--- branches/2.8.x/wb/modules/news/comment.php	(revision 1456)
+++ branches/2.8.x/wb/modules/news/comment.php	(revision 1457)

Property changes on: branches/2.8.x/wb/modules/news/comment.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/news/modify_group.php
===================================================================
--- branches/2.8.x/wb/modules/news/modify_group.php	(revision 1456)
+++ branches/2.8.x/wb/modules/news/modify_group.php	(revision 1457)
@@ -18,13 +18,17 @@
 
 require('../../config.php');
 
+// $admin_header = true;
+// Tells script to update when this page was last updated
+$update_when_modified = false;
+// show the info banner
+$print_info_banner = true;
 // Include WB admin wrapper script
 require(WB_PATH.'/modules/admin.php');
 /* */
-$group_id = $admin->checkIDKEY('group_id', false, 'GET');
+$group_id = intval($admin->checkIDKEY('group_id', false, 'GET'));
 if (!$group_id) {
 	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], WB_URL.'/modules/news/modify_group.php?page_id='.$page_id.'&section_id='.$section_id.'&group_id='.$admin->getIDKEY($group_id));
-	exit();
 }
 
 // Get header and footer
@@ -95,5 +99,3 @@
 
 // Print admin footer
 $admin->print_footer();
-
-?>
\ No newline at end of file

Property changes on: branches/2.8.x/wb/modules/news/modify_group.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/news/save_post.php
===================================================================
--- branches/2.8.x/wb/modules/news/save_post.php	(revision 1456)
+++ branches/2.8.x/wb/modules/news/save_post.php	(revision 1457)
@@ -16,154 +16,132 @@
  *
  */
 
-require('../../config.php');
+	function createNewsAccessFile($newLink, $oldLink, $page_id, $section_id, $post_id)
+	{
+		global $admin, $MESSAGE;
+		$sPagesPath = WB_PATH.PAGES_DIRECTORY;
+		$sPostsPath = $sPagesPath.'/posts';
+	// create /posts/ - directory if not exists
+		if(!file_exists($sPostsPath)) {
+			if(is_writable($sPagesPath)) {
+				make_dir(WB_PATH.PAGES_DIRECTORY.'/posts/');
+			}else {
+				$admin->print_error($MESSAGE['PAGES_CANNOT_CREATE_ACCESS_FILE']);
+			}
+		}
+	// check if /posts/ - dir is writable
+		if(!is_writable($sPostsPath.'/')) {
+			$admin->print_error($MESSAGE['PAGES_CANNOT_CREATE_ACCESS_FILE']);
+		}
+	// delete old accessfile if link has changed
+		if(($newLink != $oldLink) && (is_writable($sPostsPath.$oldLink.PAGE_EXTENSION))) {
+			if(!unlink($sPostsPath.$oldLink.PAGE_EXTENSION)) {
+				$admin->print_error($MESSAGE['PAGES_CANNOT_DELETE_ACCESS_FILE'].' - '.$oldLink);
+			}
+		}
+	// all ok, now create new accessfile
+		$newFile = $sPagesPath.$newLink.PAGE_EXTENSION;
+		// $backSteps = preg_replace('/^'.preg_quote(WB_PATH).'/', '', $sPostsPath);
+		$backSteps = preg_replace('@^'.preg_quote(WB_PATH).'@', '', $sPostsPath);
+		$backSteps = str_repeat( '../', substr_count($backSteps, '/'));
+		$content =
+			'<?php'."\n".
+			'// *** This file is generated by WebsiteBaker Ver.'.WB_VERSION."\n".
+			'// *** Creation date: '.date('c')."\n".
+			'// *** Do not modify this file manually'."\n".
+			'// *** WB will rebuild this file from time to time!!'."\n".
+			'// *************************************************'."\n".
+			"\t".'$page_id      = '.$page_id.';'."\n".
+			"\t".'$section_id   = '.$section_id.';'."\n".
+			"\t".'$post_id      = '.$post_id.';'."\n".
+			"\t".'$post_section = '.$section_id.';'."\n".
+//			"\t".'define(\'POST_SECTION\', '.$section_id.');'."\n".
+//			"\t".'define(\'POST_ID\',      '.$post_id.');'."\n".
+			"\t".'require(\''.$backSteps.'index.php\');'."\n".
+			'// *************************************************'."\n";
+		if( file_put_contents($newFile, $content) !== false ) {
+		// Chmod the file
+			change_mode($newFile);
+		}else {
+			$admin->print_error($MESSAGE['PAGES_CANNOT_CREATE_ACCESS_FILE'],ADMIN_URL.'/pages/modify.php?page_id='.$page_id);
+			// $admin->print_error($MESSAGE['PAGES_CANNOT_CREATE_ACCESS_FILE'].': '.$newFile);
 
-require_once(WB_PATH."/include/jscalendar/jscalendar-functions.php");
+		}
+	} // end of function createNewsAccessFile
+/* ************************************************************************** */
+	require('../../config.php');
+	require_once(WB_PATH."/include/jscalendar/jscalendar-functions.php");
+// Get post_id
+	if(!isset($_POST['post_id']) OR !is_numeric($_POST['post_id'])) {
+		header("Location: ".ADMIN_URL."/pages/index.php");
+		exit( 0 );
+	}else {
+		$post_id = intval($_POST['post_id']);
+	}
 
-// Get id
-if(!isset($_POST['post_id']) OR !is_numeric($_POST['post_id']))
-{
-	header("Location: ".ADMIN_URL."/pages/index.php");
-	exit( 0 );
-}
-else
-{
-	$id = (int)$_POST['post_id'];
-	$post_id = $id;
-}
+	$admin_header = false;
+	// Tells script to update when this page was last updated
+	$update_when_modified = true;
+	// Include WB admin wrapper script
+	require(WB_PATH.'/modules/admin.php');
 
-// Include WB admin wrapper script
-$update_when_modified = true; // Tells script to update when this page was last updated
-require(WB_PATH.'/modules/admin.php');
-
-if (!$admin->checkFTAN())
-{
-	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id );
-	exit();
-}
-
-function create_file($filename, $filetime=NULL )
-{
-global $page_id, $section_id, $post_id;
-
-	// We need to create a new file
-	// First, delete old file if it exists
-	if(file_exists(WB_PATH.PAGES_DIRECTORY.$filename.PAGE_EXTENSION))
-    {
-        $filetime = isset($filetime) ? $filetime :  filemtime($filename);
-		unlink(WB_PATH.PAGES_DIRECTORY.$filename.PAGE_EXTENSION);
+	if (!$admin->checkFTAN()) {
+		$admin->print_header();
+		$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'],
+		                    ADMIN_URL.'/pages/modify.php?page_id='.$page_id );
 	}
-    else {
-        $filetime = isset($filetime) ? $filetime : time();
-    }
-	// The depth of the page directory in the directory hierarchy
-	// '/pages' is at depth 1
-	$pages_dir_depth = count(explode('/',PAGES_DIRECTORY))-1;
-	// Work-out how many ../'s we need to get to the index page
-	$index_location = '../';
-	for($i = 0; $i < $pages_dir_depth; $i++)
-    {
-		$index_location .= '../';
-	}
+	$admin->print_header();
 
-	// Write to the filename
-	$content = ''.
-'<?php
-$page_id = '.$page_id.';
-$section_id = '.$section_id.';
-$post_id = '.$post_id.';
-define("POST_SECTION", $section_id);
-define("POST_ID", $post_id);
-require("'.$index_location.'config.php");
-require(WB_PATH."/index.php");
-?>';
-	if($handle = fopen($filename, 'w+'))
-    {
-    	fwrite($handle, $content);
-    	fclose($handle);
-        if($filetime)
-        {
-        touch($filename, $filetime);
-        }
-    	change_mode($filename);
-    }
-
-}
-
 // Validate all fields
-if($admin->get_post('title') == '' AND $admin->get_post('url') == '')
-{
-	$admin->print_error($MESSAGE['GENERIC']['FILL_IN_ALL'], WB_URL.'/modules/news/modify_post.php?page_id='.$page_id.'&section_id='.$section_id.'&post_id='.$admin->getIDKEY($id));
-}
-else
-{
-	$title = $admin->get_post_escaped('title');
-	$short = $admin->get_post_escaped('short');
-	$long = $admin->get_post_escaped('long');
-	$commenting = $admin->get_post_escaped('commenting');
-	$active = $admin->get_post_escaped('active');
-	$old_link = $admin->get_post_escaped('link');
-	$group_id = $admin->get_post_escaped('group');
-}
-
+	if($admin->get_post('title') == '' AND $admin->get_post('url') == '') {
+        $recallUrl = WB_URL.'/modules/news/modify_post.php?page_id='.$page_id.
+		             '&section_id='.$section_id.'&post_id='.$admin->getIDKEY($post_id);
+		$admin->print_error($MESSAGE['GENERIC']['FILL_IN_ALL'], $recallUrl);
+	}else {
+		$title      = $admin->get_post_escaped('title');
+		$short      = $admin->get_post_escaped('short');
+		$long       = $admin->get_post_escaped('long');
+		$commenting = $admin->get_post_escaped('commenting');
+		$active     = $admin->get_post_escaped('active');
+		$old_link   = $admin->get_post_escaped('link');
+		$group_id   = $admin->get_post_escaped('group');
+	}
 // Get page link URL
-$query_page = $database->query("SELECT level,link FROM ".TABLE_PREFIX."pages WHERE page_id = '$page_id'");
-$page = $query_page->fetchRow();
-$page_level = $page['level'];
-$page_link = $page['link'];
-
+	$sql = 'SELECT `link` FROM `'.TABLE_PREFIX.'pages` WHERE `page_id`='.(int)$page_id;
+	$oldLink = $database->get_one($sql);
 // Include WB functions file
-require(WB_PATH.'/framework/functions.php');
-
+	require(WB_PATH.'/framework/functions.php');
 // Work-out what the link should be
-$post_link = '/posts/'.page_filename($title).PAGE_SPACER.$post_id;
-
-// Make sure the post link is set and exists
-// Make news post access files dir
-make_dir(WB_PATH.PAGES_DIRECTORY.'/posts/');
-$file_create_time = '';
-if(!is_writable(WB_PATH.PAGES_DIRECTORY.'/posts/'))
-{
-	$admin->print_error($MESSAGE['PAGES']['CANNOT_CREATE_ACCESS_FILE']);
-}
-elseif(($old_link != $post_link) OR !file_exists(WB_PATH.PAGES_DIRECTORY.$post_link.PAGE_EXTENSION))
-{
-	// We need to create a new file
-	// First, delete old file if it exists
-	if(file_exists(WB_PATH.PAGES_DIRECTORY.$old_link.PAGE_EXTENSION))
-    {
-        $file_create_time = filemtime($old_link.PAGE_EXTENSION);
-		unlink(WB_PATH.PAGES_DIRECTORY.$old_link.PAGE_EXTENSION);
-	}
-
-    // Specify the filename
-    $filename = WB_PATH.PAGES_DIRECTORY.'/'.$post_link.PAGE_EXTENSION;
-    create_file($filename, $file_create_time);
-}
-
-
+	$newLink = '/posts/'.page_filename($title).PAGE_SPACER.$post_id;
+// create new accessfile
+	createNewsAccessFile($newLink, $oldLink, $page_id, $section_id, $post_id);
 // get publisedwhen and publisheduntil
-$publishedwhen = jscalendar_to_timestamp($admin->get_post_escaped('publishdate'));
-if($publishedwhen == '' || $publishedwhen < 1)
-	$publishedwhen=0;
-$publisheduntil = jscalendar_to_timestamp($admin->get_post_escaped('enddate'), $publishedwhen);
-if($publisheduntil == '' || $publisheduntil < 1)
-	$publisheduntil=0;
-
+	$publishedwhen = jscalendar_to_timestamp($admin->get_post_escaped('publishdate'));
+	if($publishedwhen == '' || $publishedwhen < 1) { $publishedwhen=0; }
+	$publisheduntil = jscalendar_to_timestamp($admin->get_post_escaped('enddate'), $publishedwhen);
+	if($publisheduntil == '' || $publisheduntil < 1) { $publisheduntil=0; }
 // Update row
-$database->query("UPDATE ".TABLE_PREFIX."mod_news_posts SET group_id = '$group_id', title = '$title', link = '$post_link', content_short = '$short', content_long = '$long', commenting = '$commenting', active = '$active', published_when = '$publishedwhen', published_until = '$publisheduntil', posted_when = '".time()."', posted_by = '".$admin->get_user_id()."' WHERE post_id = '$post_id'");
-
+	$sql  = 'UPDATE `'.TABLE_PREFIX.'mod_news_posts` ';
+	$sql .= 'SET `group_id`='.(int)$group_id.', ';
+	$sql .=     '`title`=\''.$title.'\', ';
+	$sql .=     '`link`=\''.$newLink.'\', ';
+	$sql .=     '`content_short`=\''.$short.'\', ';
+	$sql .=     '`content_long`=\''.$long.'\', ';
+	$sql .=     '`commenting`=\''.$commenting.'\', ';
+	$sql .=     '`active`='.(int)$active.', ';
+	$sql .=     '`published_when`='.(int)$publishedwhen.', ';
+	$sql .=     '`published_until`='.(int)$publisheduntil.', ';
+	$sql .=     '`posted_when`='.time().', ';
+	$sql .=     '`posted_by`='.(int)$admin->get_user_id().' ';
+	$sql .= 'WHERE `post_id`='.(int)$post_id;
+	$database->query($sql);
 // Check if there is a db error, otherwise say successful
-if($database->is_error())
-{
-	$admin->print_error($database->get_error(), WB_URL.'/modules/news/modify_post.php?page_id='.$page_id.'&section_id='.$section_id.'&post_id='.$admin->getIDKEY($id));
-}
-else
-{
-	$admin->print_success($TEXT['SUCCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id);
-}
-
+	if($database->is_error()) {
+		$recallUrl = WB_URL.'/modules/news/modify_post.php?page_id='.$page_id.
+					 '&section_id='.$section_id.'&post_id='.$admin->getIDKEY($post_id);
+		$admin->print_error($database->get_error(), $recallUrl);
+	}else {
+		$admin->print_success($TEXT['SUCCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id);
+	}
 // Print admin footer
-$admin->print_footer();
-
-?>
\ No newline at end of file
+	$admin->print_footer();

Property changes on: branches/2.8.x/wb/modules/news/save_post.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/news/add_group.php
===================================================================
--- branches/2.8.x/wb/modules/news/add_group.php	(revision 1456)
+++ branches/2.8.x/wb/modules/news/add_group.php	(revision 1457)
@@ -42,5 +42,3 @@
 
 // Print admin footer
 $admin->print_footer();
-
-?>
\ No newline at end of file

Property changes on: branches/2.8.x/wb/modules/news/add_group.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/news/install.php
===================================================================
--- branches/2.8.x/wb/modules/news/install.php	(revision 1456)
+++ branches/2.8.x/wb/modules/news/install.php	(revision 1457)
@@ -1,172 +1,172 @@
-<?php
-/**
- *
- * @category        modules
- * @package         news
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
- * @copyright       2009-2011, Website Baker Org. e.V.
- * @link			http://www.websitebaker2.org/
- * @license         http://www.gnu.org/licenses/gpl.html
- * @platform        WebsiteBaker 2.8.x
- * @requirements    PHP 5.2.2 and higher
- * @version      	$Id$
- * @filesource		$HeadURL$
- * @lastmodified    $Date$
- *
- */
-
-if(defined('WB_URL'))
-{
-	
-	// $database->query("DROP TABLE IF EXISTS `".TABLE_PREFIX."mod_news_posts`");
-	$mod_news = 'CREATE TABLE IF NOT EXISTS `'.TABLE_PREFIX.'mod_news_posts` ( '
-					 . '`post_id` INT NOT NULL AUTO_INCREMENT,'
-					 . '`section_id` INT NOT NULL DEFAULT \'0\','
-					 . '`page_id` INT NOT NULL DEFAULT \'0\','
-					 . '`group_id` INT NOT NULL DEFAULT \'0\','
-					 . '`active` INT NOT NULL DEFAULT \'0\','
-					 . '`position` INT NOT NULL DEFAULT \'0\','
-					 . '`title` VARCHAR(255) NOT NULL DEFAULT \'\','
-					 . '`link` TEXT NOT NULL ,'
-					 . '`content_short` TEXT NOT NULL ,'
-					 . '`content_long` TEXT NOT NULL ,'
-					 . '`commenting` VARCHAR(7) NOT NULL DEFAULT \'\','
-					 . '`published_when` INT NOT NULL DEFAULT \'0\','
-					 . '`published_until` INT NOT NULL DEFAULT \'0\','
-					 . '`posted_when` INT NOT NULL DEFAULT \'0\','
-					 . '`posted_by` INT NOT NULL DEFAULT \'0\','
-					 . 'PRIMARY KEY (post_id)'
-					 . ' )';
-	$database->query($mod_news);
-	
-	// $database->query("DROP TABLE IF EXISTS `".TABLE_PREFIX."mod_news_groups`");
-	$mod_news = 'CREATE TABLE IF NOT EXISTS `'.TABLE_PREFIX.'mod_news_groups` ( '
-					 . '`group_id` INT NOT NULL AUTO_INCREMENT,'
-					 . '`section_id` INT NOT NULL DEFAULT \'0\','
-					 . '`page_id` INT NOT NULL DEFAULT \'0\','
-					 . '`active` INT NOT NULL DEFAULT \'0\','
-					 . '`position` INT NOT NULL DEFAULT \'0\','
-					 . '`title` VARCHAR(255) NOT NULL DEFAULT \'\','
-					 . 'PRIMARY KEY (group_id)'
-                . ' )';
-	$database->query($mod_news);
-	
-	// $database->query("DROP TABLE IF EXISTS `".TABLE_PREFIX."mod_news_comments`");
-	$mod_news = 'CREATE TABLE IF NOT EXISTS `'.TABLE_PREFIX.'mod_news_comments` ( '
-					 . '`comment_id` INT NOT NULL AUTO_INCREMENT,'
-					 . '`section_id` INT NOT NULL DEFAULT \'0\','
-					 . '`page_id` INT NOT NULL DEFAULT \'0\','
-					 . '`post_id` INT NOT NULL DEFAULT \'0\','
-					 . '`title` VARCHAR(255) NOT NULL DEFAULT \'\','
-					 . '`comment` TEXT NOT NULL ,'
-		   	    . '`commented_when` INT NOT NULL DEFAULT \'0\','
-					 . '`commented_by` INT NOT NULL DEFAULT \'0\','
-					 . 'PRIMARY KEY (comment_id)'
-                . ' )';
-
-	$database->query($mod_news);
-	
-	// $database->query("DROP TABLE IF EXISTS `".TABLE_PREFIX."mod_news_settings`");
-	$mod_news = 'CREATE TABLE IF NOT EXISTS `'.TABLE_PREFIX.'mod_news_settings` ( '
-					 . '`section_id` INT NOT NULL DEFAULT \'0\','
-					 . '`page_id` INT NOT NULL DEFAULT \'0\','
-					 . '`header` TEXT NOT NULL ,'
-					 . '`post_loop` TEXT NOT NULL ,'
-					 . '`footer` TEXT NOT NULL ,'
-					 . '`posts_per_page` INT NOT NULL DEFAULT \'0\','
-					 . '`post_header` TEXT NOT NULL,'
-					 . '`post_footer` TEXT NOT NULL,'
-					 . '`comments_header` TEXT NOT NULL,'
-					 . '`comments_loop` TEXT NOT NULL,'
-					 . '`comments_footer` TEXT NOT NULL,'
-					 . '`comments_page` TEXT NOT NULL,'
-					 . '`commenting` VARCHAR(7) NOT NULL DEFAULT \'\','
-					 . '`resize` INT NOT NULL DEFAULT \'0\','
-					 . ' `use_captcha` INT NOT NULL DEFAULT \'0\','
-					 . 'PRIMARY KEY (section_id)'
-                . ' )';
-
-	$database->query($mod_news);
-		
-    $mod_search = "SELECT * FROM ".TABLE_PREFIX."search WHERE value = 'news'";
-    $insert_search = $database->query($mod_search);
-    if( $insert_search->numRows() == 0 )
-    {
-    	// Insert info into the search table
-    	// Module query info
-    	$field_info = array();
-    	$field_info['page_id'] = 'page_id';
-    	$field_info['title'] = 'page_title';
-    	$field_info['link'] = 'link';
-    	$field_info['description'] = 'description';
-    	$field_info['modified_when'] = 'modified_when';
-    	$field_info['modified_by'] = 'modified_by';
-    	$field_info = serialize($field_info);
-    	$database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('module', 'news', '$field_info')");
-    	// Query start
-    	$query_start_code = "SELECT [TP]pages.page_id, [TP]pages.page_title,	[TP]pages.link, [TP]pages.description, [TP]pages.modified_when, [TP]pages.modified_by	FROM [TP]mod_news_posts, [TP]mod_news_groups, [TP]mod_news_comments, [TP]mod_news_settings, [TP]pages WHERE ";
-    	$database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('query_start', '$query_start_code', 'news')");
-    	// Query body
-    	$query_body_code = "
-    	[TP]pages.page_id = [TP]mod_news_posts.page_id AND [TP]mod_news_posts.title LIKE \'%[STRING]%\'
-    	OR [TP]pages.page_id = [TP]mod_news_posts.page_id AND [TP]mod_news_posts.content_short LIKE \'%[STRING]%\'
-    	OR [TP]pages.page_id = [TP]mod_news_posts.page_id AND [TP]mod_news_posts.content_long LIKE \'%[STRING]%\'
-    	OR [TP]pages.page_id = [TP]mod_news_comments.page_id AND [TP]mod_news_comments.title LIKE \'%[STRING]%\'
-    	OR [TP]pages.page_id = [TP]mod_news_comments.page_id AND [TP]mod_news_comments.comment LIKE \'%[STRING]%\'
-    	OR [TP]pages.page_id = [TP]mod_news_settings.page_id AND [TP]mod_news_settings.header LIKE \'%[STRING]%\'
-    	OR [TP]pages.page_id = [TP]mod_news_settings.page_id AND [TP]mod_news_settings.footer LIKE \'%[STRING]%\'
-    	OR [TP]pages.page_id = [TP]mod_news_settings.page_id AND [TP]mod_news_settings.post_header LIKE \'%[STRING]%\'
-    	OR [TP]pages.page_id = [TP]mod_news_settings.page_id AND [TP]mod_news_settings.post_footer LIKE \'%[STRING]%\'
-    	OR [TP]pages.page_id = [TP]mod_news_settings.page_id AND [TP]mod_news_settings.comments_header LIKE \'%[STRING]%\'
-    	OR [TP]pages.page_id = [TP]mod_news_settings.page_id AND [TP]mod_news_settings.comments_footer LIKE \'%[STRING]%\'";
-    	$database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('query_body', '$query_body_code', 'news')");
-    	// Query end
-    	$query_end_code = "";
-    	$database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('query_end', '$query_end_code', 'news')");
-
-    	// Insert blank row (there needs to be at least on row for the search to work)
-    	$database->query("INSERT INTO ".TABLE_PREFIX."mod_news_posts (section_id,page_id) VALUES ('0', '0')");
-    	$database->query("INSERT INTO ".TABLE_PREFIX."mod_news_groups (section_id,page_id) VALUES ('0', '0')");
-    	$database->query("INSERT INTO ".TABLE_PREFIX."mod_news_comments (section_id,page_id) VALUES ('0', '0')");
-    	$database->query("INSERT INTO ".TABLE_PREFIX."mod_news_settings (section_id,page_id) VALUES ('0', '0')");
-    }
-
-	// Make news post access files dir
-	require_once(WB_PATH.'/framework/functions.php');
-	if(make_dir(WB_PATH.PAGES_DIRECTORY.'/posts')) {
-		// Add a index.php file to prevent directory spoofing
-		$content = ''.
-"<?php
-
-/*
-
- Website Baker Project <http://www.websitebaker.org/>
- Copyright (C) 2004-2009, Ryan Djurovich
-
- Website Baker is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- Website Baker is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Website Baker; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-*/
-
-header('Location: ../');
-?>";
-		$handle = fopen(WB_PATH.PAGES_DIRECTORY.'/posts/index.php', 'w');
-		fwrite($handle, $content);
-		fclose($handle);
-		change_mode(WB_PATH.PAGES_DIRECTORY.'/posts/index.php', 'file');
-	}
-};
-
-?>
\ No newline at end of file
+<?php
+/**
+ *
+ * @category        modules
+ * @package         news
+ * @author          WebsiteBaker Project
+ * @copyright       2004-2009, Ryan Djurovich
+ * @copyright       2009-2011, Website Baker Org. e.V.
+ * @link			http://www.websitebaker2.org/
+ * @license         http://www.gnu.org/licenses/gpl.html
+ * @platform        WebsiteBaker 2.8.x
+ * @requirements    PHP 5.2.2 and higher
+ * @version      	$Id$
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
+ *
+ */
+
+if(defined('WB_URL'))
+{
+	
+	// $database->query("DROP TABLE IF EXISTS `".TABLE_PREFIX."mod_news_posts`");
+	$mod_news = 'CREATE TABLE IF NOT EXISTS `'.TABLE_PREFIX.'mod_news_posts` ( '
+					 . '`post_id` INT NOT NULL AUTO_INCREMENT,'
+					 . '`section_id` INT NOT NULL DEFAULT \'0\','
+					 . '`page_id` INT NOT NULL DEFAULT \'0\','
+					 . '`group_id` INT NOT NULL DEFAULT \'0\','
+					 . '`active` INT NOT NULL DEFAULT \'0\','
+					 . '`position` INT NOT NULL DEFAULT \'0\','
+					 . '`title` VARCHAR(255) NOT NULL DEFAULT \'\','
+					 . '`link` TEXT NOT NULL ,'
+					 . '`content_short` TEXT NOT NULL ,'
+					 . '`content_long` TEXT NOT NULL ,'
+					 . '`commenting` VARCHAR(7) NOT NULL DEFAULT \'\','
+					 . '`created_when` INT NOT NULL DEFAULT \'0\','
+					 . '`created_by` INT NOT NULL DEFAULT \'0\','
+					 . '`published_when` INT NOT NULL DEFAULT \'0\','
+					 . '`published_until` INT NOT NULL DEFAULT \'0\','
+					 . '`posted_when` INT NOT NULL DEFAULT \'0\','
+					 . '`posted_by` INT NOT NULL DEFAULT \'0\','
+					 . 'PRIMARY KEY (post_id)'
+					 . ' )';
+	$database->query($mod_news);
+	
+	// $database->query("DROP TABLE IF EXISTS `".TABLE_PREFIX."mod_news_groups`");
+	$mod_news = 'CREATE TABLE IF NOT EXISTS `'.TABLE_PREFIX.'mod_news_groups` ( '
+					 . '`group_id` INT NOT NULL AUTO_INCREMENT,'
+					 . '`section_id` INT NOT NULL DEFAULT \'0\','
+					 . '`page_id` INT NOT NULL DEFAULT \'0\','
+					 . '`active` INT NOT NULL DEFAULT \'0\','
+					 . '`position` INT NOT NULL DEFAULT \'0\','
+					 . '`title` VARCHAR(255) NOT NULL DEFAULT \'\','
+					 . 'PRIMARY KEY (group_id)'
+                . ' )';
+	$database->query($mod_news);
+	
+	// $database->query("DROP TABLE IF EXISTS `".TABLE_PREFIX."mod_news_comments`");
+	$mod_news = 'CREATE TABLE IF NOT EXISTS `'.TABLE_PREFIX.'mod_news_comments` ( '
+					 . '`comment_id` INT NOT NULL AUTO_INCREMENT,'
+					 . '`section_id` INT NOT NULL DEFAULT \'0\','
+					 . '`page_id` INT NOT NULL DEFAULT \'0\','
+					 . '`post_id` INT NOT NULL DEFAULT \'0\','
+					 . '`title` VARCHAR(255) NOT NULL DEFAULT \'\','
+					 . '`comment` TEXT NOT NULL ,'
+					 . '`commented_when` INT NOT NULL DEFAULT \'0\','
+					 . '`commented_by` INT NOT NULL DEFAULT \'0\','
+					 . 'PRIMARY KEY (comment_id)'
+                . ' )';
+
+	$database->query($mod_news);
+	
+	// $database->query("DROP TABLE IF EXISTS `".TABLE_PREFIX."mod_news_settings`");
+	$mod_news = 'CREATE TABLE IF NOT EXISTS `'.TABLE_PREFIX.'mod_news_settings` ( '
+					 . '`section_id` INT NOT NULL DEFAULT \'0\','
+					 . '`page_id` INT NOT NULL DEFAULT \'0\','
+					 . '`header` TEXT NOT NULL ,'
+					 . '`post_loop` TEXT NOT NULL ,'
+					 . '`footer` TEXT NOT NULL ,'
+					 . '`posts_per_page` INT NOT NULL DEFAULT \'0\','
+					 . '`post_header` TEXT NOT NULL,'
+					 . '`post_footer` TEXT NOT NULL,'
+					 . '`comments_header` TEXT NOT NULL,'
+					 . '`comments_loop` TEXT NOT NULL,'
+					 . '`comments_footer` TEXT NOT NULL,'
+					 . '`comments_page` TEXT NOT NULL,'
+					 . '`commenting` VARCHAR(7) NOT NULL DEFAULT \'\','
+					 . '`resize` INT NOT NULL DEFAULT \'0\','
+					 . ' `use_captcha` INT NOT NULL DEFAULT \'0\','
+					 . 'PRIMARY KEY (section_id)'
+                . ' )';
+
+	$database->query($mod_news);
+		
+    $mod_search = "SELECT * FROM ".TABLE_PREFIX."search WHERE value = 'news'";
+    $insert_search = $database->query($mod_search);
+    if( $insert_search->numRows() == 0 )
+    {
+    	// Insert info into the search table
+    	// Module query info
+    	$field_info = array();
+    	$field_info['page_id'] = 'page_id';
+    	$field_info['title'] = 'page_title';
+    	$field_info['link'] = 'link';
+    	$field_info['description'] = 'description';
+    	$field_info['modified_when'] = 'modified_when';
+    	$field_info['modified_by'] = 'modified_by';
+    	$field_info = serialize($field_info);
+    	$database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('module', 'news', '$field_info')");
+    	// Query start
+    	$query_start_code = "SELECT [TP]pages.page_id, [TP]pages.page_title,	[TP]pages.link, [TP]pages.description, [TP]pages.modified_when, [TP]pages.modified_by	FROM [TP]mod_news_posts, [TP]mod_news_groups, [TP]mod_news_comments, [TP]mod_news_settings, [TP]pages WHERE ";
+    	$database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('query_start', '$query_start_code', 'news')");
+    	// Query body
+    	$query_body_code = "
+    	[TP]pages.page_id = [TP]mod_news_posts.page_id AND [TP]mod_news_posts.title LIKE \'%[STRING]%\'
+    	OR [TP]pages.page_id = [TP]mod_news_posts.page_id AND [TP]mod_news_posts.content_short LIKE \'%[STRING]%\'
+    	OR [TP]pages.page_id = [TP]mod_news_posts.page_id AND [TP]mod_news_posts.content_long LIKE \'%[STRING]%\'
+    	OR [TP]pages.page_id = [TP]mod_news_comments.page_id AND [TP]mod_news_comments.title LIKE \'%[STRING]%\'
+    	OR [TP]pages.page_id = [TP]mod_news_comments.page_id AND [TP]mod_news_comments.comment LIKE \'%[STRING]%\'
+    	OR [TP]pages.page_id = [TP]mod_news_settings.page_id AND [TP]mod_news_settings.header LIKE \'%[STRING]%\'
+    	OR [TP]pages.page_id = [TP]mod_news_settings.page_id AND [TP]mod_news_settings.footer LIKE \'%[STRING]%\'
+    	OR [TP]pages.page_id = [TP]mod_news_settings.page_id AND [TP]mod_news_settings.post_header LIKE \'%[STRING]%\'
+    	OR [TP]pages.page_id = [TP]mod_news_settings.page_id AND [TP]mod_news_settings.post_footer LIKE \'%[STRING]%\'
+    	OR [TP]pages.page_id = [TP]mod_news_settings.page_id AND [TP]mod_news_settings.comments_header LIKE \'%[STRING]%\'
+    	OR [TP]pages.page_id = [TP]mod_news_settings.page_id AND [TP]mod_news_settings.comments_footer LIKE \'%[STRING]%\'";
+    	$database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('query_body', '$query_body_code', 'news')");
+    	// Query end
+    	$query_end_code = "";
+    	$database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('query_end', '$query_end_code', 'news')");
+
+    	// Insert blank row (there needs to be at least on row for the search to work)
+    	$database->query("INSERT INTO ".TABLE_PREFIX."mod_news_posts (section_id,page_id) VALUES ('0', '0')");
+    	$database->query("INSERT INTO ".TABLE_PREFIX."mod_news_groups (section_id,page_id) VALUES ('0', '0')");
+    	$database->query("INSERT INTO ".TABLE_PREFIX."mod_news_comments (section_id,page_id) VALUES ('0', '0')");
+    	$database->query("INSERT INTO ".TABLE_PREFIX."mod_news_settings (section_id,page_id) VALUES ('0', '0')");
+    }
+
+	// Make news post access files dir
+	require_once(WB_PATH.'/framework/functions.php');
+	if(make_dir(WB_PATH.PAGES_DIRECTORY.'/posts')) {
+		// Add a index.php file to prevent directory spoofing
+		$content = ''.
+"<?php
+
+/*
+
+ Website Baker Project <http://www.websitebaker.org/>
+ Copyright (C) 2004-2009, Ryan Djurovich
+
+ Website Baker is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ Website Baker is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Website Baker; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+*/
+
+header('Location: ../');
+?>";
+		$handle = fopen(WB_PATH.PAGES_DIRECTORY.'/posts/index.php', 'w');
+		fwrite($handle, $content);
+		fclose($handle);
+		change_mode(WB_PATH.PAGES_DIRECTORY.'/posts/index.php', 'file');
+	}
+};

Property changes on: branches/2.8.x/wb/modules/news/install.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/news/index.php
===================================================================
--- branches/2.8.x/wb/modules/news/index.php	(revision 1456)
+++ branches/2.8.x/wb/modules/news/index.php	(revision 1457)
@@ -1,20 +1,20 @@
-<?php
-/**
- *
- * @category        modules
- * @package         news
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
- * @copyright       2009-2011, Website Baker Org. e.V.
- * @link			http://www.websitebaker2.org/
- * @license         http://www.gnu.org/licenses/gpl.html
- * @platform        WebsiteBaker 2.8.x
- * @requirements    PHP 5.2.2 and higher
- * @version         $Id$
- * @filesource		$HeadURL$
- * @lastmodified    $Date$
- *
- */
-
-header("Location: ../../index.php");
+<?php
+/**
+ *
+ * @category        modules
+ * @package         news
+ * @author          WebsiteBaker Project
+ * @copyright       2004-2009, Ryan Djurovich
+ * @copyright       2009-2011, Website Baker Org. e.V.
+ * @link			http://www.websitebaker2.org/
+ * @license         http://www.gnu.org/licenses/gpl.html
+ * @platform        WebsiteBaker 2.8.x
+ * @requirements    PHP 5.2.2 and higher
+ * @version         $Id$
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
+ *
+ */
+
+header("Location: ../../index.php");
 ?>
\ No newline at end of file

Property changes on: branches/2.8.x/wb/modules/news/index.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/news/rss.php
===================================================================
--- branches/2.8.x/wb/modules/news/rss.php	(revision 1456)
+++ branches/2.8.x/wb/modules/news/rss.php	(revision 1457)
@@ -1,89 +1,89 @@
-<?php
-/**
- *
- * @category        modules
- * @package         news
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
- * @copyright       2009-2011, Website Baker Org. e.V.
- * @link			http://www.websitebaker2.org/
- * @license         http://www.gnu.org/licenses/gpl.html
- * @platform        WebsiteBaker 2.8.x
- * @requirements    PHP 5.2.2 and higher
- * @version         $Id$
- * @filesource		$HeadURL$
- * @lastmodified    $Date$
- *
- */
-
-// Check that GET values have been supplied
-if(isset($_GET['page_id']) AND is_numeric($_GET['page_id'])) {
-	$page_id = $_GET['page_id'];
-} else {
-	header('Location: /');
-	exit(0);
-}
-if(isset($_GET['group_id']) AND is_numeric($_GET['group_id'])) {
-	$group_id = $_GET['group_id'];
-	define('GROUP_ID', $group_id);
-}
-
-// Include WB files
-require_once('../../config.php');
-require_once(WB_PATH.'/framework/class.frontend.php');
-$wb = new frontend();
-$wb->page_id = $page_id;
-$wb->get_page_details();
-$wb->get_website_settings();
-
-//checkout if a charset is defined otherwise use UTF-8
-if(defined('DEFAULT_CHARSET')) {
-	$charset=DEFAULT_CHARSET;
-} else {
-	$charset='utf-8';
-}
-
-// Sending XML header
-header("Content-type: text/xml; charset=$charset" );
-
-// Header info
-// Required by CSS 2.0
-echo '<?xml version="1.0" encoding="'.$charset.'"?>';
-?> 
-<rss version="2.0">
-	<channel>
-		<title><?php echo PAGE_TITLE; ?></title>
-		<link>http://<?php echo $_SERVER['SERVER_NAME']; ?></link>
-		<description> <?php echo PAGE_DESCRIPTION; ?></description>
-<?php
-// Optional header info 
-?>
-		<language><?php echo strtolower(DEFAULT_LANGUAGE); ?></language>
-		<copyright><?php $thedate = date('Y'); $websitetitle = WEBSITE_TITLE; echo "Copyright {$thedate}, {$websitetitle}"; ?></copyright>
-		<managingEditor><?php echo SERVER_EMAIL; ?></managingEditor>
-		<webMaster><?php echo SERVER_EMAIL; ?></webMaster>
-		<category><?php echo WEBSITE_TITLE; ?></category>
-		<generator>WebsiteBaker Content Management System</generator>
-<?php
-// Get news items from database
-$t = TIME();
-$time_check_str= "(published_when = '0' OR published_when <= ".$t.") AND (published_until = 0 OR published_until >= ".$t.")";
-//Query
-if(isset($group_id)) {
-	$query = "SELECT * FROM ".TABLE_PREFIX."mod_news_posts WHERE group_id=".$group_id." AND page_id = ".$page_id." AND active=1 AND ".$time_check_str." ORDER BY posted_when DESC";
-} else {
-	$query = "SELECT * FROM ".TABLE_PREFIX."mod_news_posts WHERE page_id=".$page_id." AND active=1 AND ".$time_check_str." ORDER BY posted_when DESC";	
-}
-$result = $database->query($query);
-
-//Generating the news items
-while($item = $result->fetchRow()){ ?>
-		<item>
-			<title><![CDATA[<?php echo stripslashes($item["title"]); ?>]]></title>
-			<description><![CDATA[<?php echo stripslashes($item["content_short"]); ?>]]></description>
-			<guid><?php echo WB_URL.PAGES_DIRECTORY.$item["link"].PAGE_EXTENSION; ?></guid>
-			<link><?php echo WB_URL.PAGES_DIRECTORY.$item["link"].PAGE_EXTENSION; ?></link>
-		</item>
-<?php } ?>
-	</channel>
+<?php
+/**
+ *
+ * @category        modules
+ * @package         news
+ * @author          WebsiteBaker Project
+ * @copyright       2004-2009, Ryan Djurovich
+ * @copyright       2009-2011, Website Baker Org. e.V.
+ * @link			http://www.websitebaker2.org/
+ * @license         http://www.gnu.org/licenses/gpl.html
+ * @platform        WebsiteBaker 2.8.x
+ * @requirements    PHP 5.2.2 and higher
+ * @version         $Id$
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
+ *
+ */
+
+// Check that GET values have been supplied
+if(isset($_GET['page_id']) AND is_numeric($_GET['page_id'])) {
+	$page_id = $_GET['page_id'];
+} else {
+	header('Location: /');
+	exit(0);
+}
+if(isset($_GET['group_id']) AND is_numeric($_GET['group_id'])) {
+	$group_id = $_GET['group_id'];
+	define('GROUP_ID', $group_id);
+}
+
+// Include WB files
+require_once('../../config.php');
+require_once(WB_PATH.'/framework/class.frontend.php');
+$wb = new frontend();
+$wb->page_id = $page_id;
+$wb->get_page_details();
+$wb->get_website_settings();
+
+//checkout if a charset is defined otherwise use UTF-8
+if(defined('DEFAULT_CHARSET')) {
+	$charset=DEFAULT_CHARSET;
+} else {
+	$charset='utf-8';
+}
+
+// Sending XML header
+header("Content-type: text/xml; charset=$charset" );
+
+// Header info
+// Required by CSS 2.0
+echo '<?xml version="1.0" encoding="'.$charset.'"?>';
+?> 
+<rss version="2.0">
+	<channel>
+		<title><?php echo PAGE_TITLE; ?></title>
+		<link>http://<?php echo $_SERVER['SERVER_NAME']; ?></link>
+		<description> <?php echo PAGE_DESCRIPTION; ?></description>
+<?php
+// Optional header info 
+?>
+		<language><?php echo strtolower(DEFAULT_LANGUAGE); ?></language>
+		<copyright><?php $thedate = date('Y'); $websitetitle = WEBSITE_TITLE; echo "Copyright {$thedate}, {$websitetitle}"; ?></copyright>
+		<managingEditor><?php echo SERVER_EMAIL; ?></managingEditor>
+		<webMaster><?php echo SERVER_EMAIL; ?></webMaster>
+		<category><?php echo WEBSITE_TITLE; ?></category>
+		<generator>WebsiteBaker Content Management System</generator>
+<?php
+// Get news items from database
+$t = TIME();
+$time_check_str= "(published_when = '0' OR published_when <= ".$t.") AND (published_until = 0 OR published_until >= ".$t.")";
+//Query
+if(isset($group_id)) {
+	$query = "SELECT * FROM ".TABLE_PREFIX."mod_news_posts WHERE group_id=".$group_id." AND page_id = ".$page_id." AND active=1 AND ".$time_check_str." ORDER BY posted_when DESC";
+} else {
+	$query = "SELECT * FROM ".TABLE_PREFIX."mod_news_posts WHERE page_id=".$page_id." AND active=1 AND ".$time_check_str." ORDER BY posted_when DESC";	
+}
+$result = $database->query($query);
+
+//Generating the news items
+while($item = $result->fetchRow()){ ?>
+		<item>
+			<title><![CDATA[<?php echo stripslashes($item["title"]); ?>]]></title>
+			<description><![CDATA[<?php echo stripslashes($item["content_short"]); ?>]]></description>
+			<guid><?php echo WB_URL.PAGES_DIRECTORY.$item["link"].PAGE_EXTENSION; ?></guid>
+			<link><?php echo WB_URL.PAGES_DIRECTORY.$item["link"].PAGE_EXTENSION; ?></link>
+		</item>
+<?php } ?>
+	</channel>
 </rss>
\ No newline at end of file

Property changes on: branches/2.8.x/wb/modules/news/rss.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/news/delete_group.php
===================================================================
--- branches/2.8.x/wb/modules/news/delete_group.php	(revision 1456)
+++ branches/2.8.x/wb/modules/news/delete_group.php	(revision 1457)
@@ -18,17 +18,18 @@
 
 require('../../config.php');
 
+$admin_header = false;
+// Tells script to update when this page was last updated
+$update_when_modified = true;
 // Include WB admin wrapper script
-$update_when_modified = true; // Tells script to update when this page was last updated
 require(WB_PATH.'/modules/admin.php');
 
-$gid = $admin->checkIDKEY('group_id', false, 'GET');
-if (!$gid) {
+$group_id = intval($admin->checkIDKEY('group_id', false, 'GET'));
+if (!$group_id) {
+	$admin->print_header();
 	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id);
-	exit();
-} else {
-	$group_id = $gid;
 }
+$admin->print_header();
 
 $database->query("UPDATE ".TABLE_PREFIX."mod_news_posts SET group_id = '0' where group_id='$group_id'");
 // Update row

Property changes on: branches/2.8.x/wb/modules/news/delete_group.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/news/save_comment.php
===================================================================
--- branches/2.8.x/wb/modules/news/save_comment.php	(revision 1456)
+++ branches/2.8.x/wb/modules/news/save_comment.php	(revision 1457)
@@ -29,21 +29,26 @@
 	$comment_id = (int)$_POST['comment_id'];
 }
 
+$admin_header = false;
+// Tells script to update when this page was last updated
+$update_when_modified = true;
+// show the info banner
+// $print_info_banner = true;
 // Include WB admin wrapper script
-$update_when_modified = true; // Tells script to update when this page was last updated
 require(WB_PATH.'/modules/admin.php');
 
 if (!$admin->checkFTAN())
 {
+	$admin->print_header();
 	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id );
-	exit();
 }
 
-$id = $admin->getIDKEY($comment_id);
+$id = intval($admin->getIDKEY($comment_id));
 
 // Validate all fields
 if($admin->get_post('title') == '' AND $admin->get_post('comment') == '')
 {
+	$admin->print_header();
 	$admin->print_error($MESSAGE['GENERIC']['FILL_IN_ALL'], WB_URL.'/modules/news/modify_comment.php?page_id='.$page_id.'&section_id='.$section_id.'comment_id='.$id);
 }
 else
@@ -60,6 +65,7 @@
 // Update row
 $database->query("UPDATE ".TABLE_PREFIX."mod_news_comments SET title = '$title', comment = '$comment' WHERE comment_id = '$comment_id'");
 
+$admin->print_header();
 // Check if there is a db error, otherwise say successful
 if($database->is_error())
 {

Property changes on: branches/2.8.x/wb/modules/news/save_comment.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/news/submit_comment.php
===================================================================
--- branches/2.8.x/wb/modules/news/submit_comment.php	(revision 1456)
+++ branches/2.8.x/wb/modules/news/submit_comment.php	(revision 1457)
@@ -19,7 +19,8 @@
 // Include config file
 require('../../config.php');
 
-/*overwrite php.ini on Apache servers for valid SESSION ID Separator
+/*
+overwrite php.ini on Apache servers for valid SESSION ID Separator
 if(function_exists('ini_set')) {
 	ini_set('arg_separator.output', '&amp;');
 }
@@ -27,13 +28,24 @@
 
 require_once(WB_PATH.'/framework/class.wb.php');
 $wb = new wb;
+
+/*
 $post_id = (int)$_GET['post_id'];
 $section_id = (int)$_GET['section_id'];
 if (!$wb->checkFTAN())
 {
-	$wb->print_error('SC5::'.$MESSAGE['GENERIC_SECURITY_ACCESS'], WB_URL."/modules/news/comment.php?post_id=".$post_id."&section_id=".$section_id);
-	exit();
+	$wb->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], WB_URL."/modules/news/comment.php?post_id=".$post_id."&section_id=".$section_id);
 }
+ */
+// Get page id
+	$requestMethod = '_'.strtoupper($_SERVER['REQUEST_METHOD']);
+	$page_id = intval(isset(${$requestMethod}['page_id'])) ? ${$requestMethod}['page_id'] : (isset($page_id) ? intval($page_id) : 0);
+// Get post_id
+	$requestMethod = '_'.strtoupper($_SERVER['REQUEST_METHOD']);
+	$post_id = (intval(isset(${$requestMethod}['post_id'])) ? ${$requestMethod}['post_id'] : (isset($post_id) ? intval($post_id) : 0));
+// Get section id if there is one
+	$requestMethod = '_'.strtoupper($_SERVER['REQUEST_METHOD']);
+	$section_id = intval(isset(${$requestMethod}['section_id'])) ? ${$requestMethod}['section_id'] : (isset($section_id) ? intval($section_id) : 0);
 
 // Check if we should show the form or add a comment
 if(isset($_GET['page_id']) AND is_numeric($_GET['page_id'])
@@ -56,6 +68,7 @@
 	// do not allow droplets in user input!
 	$title = str_replace(array("[[", "]]"), array("&#91;&#91;", "&#93;&#93;"), $title);
 	$comment = str_replace(array("[[", "]]"), array("&#91;&#91;", "&#93;&#93;"), $comment);
+
 	$page_id = (int)$_GET['page_id'];
 	$section_id = (int)$_GET['section_id'];
 	$post_id = (int)$_GET['post_id'];
@@ -160,5 +173,3 @@
 	    exit( 0 );
     }
 }
-
-?>
\ No newline at end of file

Property changes on: branches/2.8.x/wb/modules/news/submit_comment.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/2.8.x/wb/modules/admin.php
===================================================================
--- branches/2.8.x/wb/modules/admin.php	(revision 1456)
+++ branches/2.8.x/wb/modules/admin.php	(revision 1457)
@@ -22,43 +22,29 @@
 	die('<head><title>Access denied</title></head><body><h2 style="color:red;margin:3em auto;text-align:center;">Cannot access this file directly</h2></body></html>');
 }
 
-// if admin is be call from admin modify core you have $page_id
-if(!isset($page_id)) {
-	// Get page id
-	if(isset($_GET['page_id']) && is_numeric($_GET['page_id'])) {
-		$page_id = (int)$_GET['page_id'];
-	} elseif(isset($_POST['page_id']) && is_numeric($_POST['page_id'])) {
-		$page_id = (int)$_POST['page_id'];
-	} else {
+// Get page id
+	$requestMethod = '_'.strtoupper($_SERVER['REQUEST_METHOD']);
+	$page_id = intval(isset(${$requestMethod}['page_id'])) ? ${$requestMethod}['page_id'] : (isset($page_id) ? intval($page_id) : 0);
+	if(	($page_id == 0)) {
 		header("Location: index.php");
 		exit(0);
 	}
-}
 
-// if admin is be call from admin modify core you have $section_id
-if(!isset($section_id)) {
 // Get section id if there is one
-	if(isset($_GET['section_id']) && is_numeric($_GET['section_id'])) {
-		$section_id = (int)$_GET['section_id'];
-	} elseif(isset($_POST['section_id']) && is_numeric($_POST['section_id'])) {
-		$section_id = (int)$_POST['section_id'];
-	} else {
-		// Check if we should redirect the user if there is no section id
-		if(!isset($section_required)) {
-			$section_id = 0;
-		} else {
-			header("Location: $section_required");
-			exit(0);
-		}
+	$requestMethod = '_'.strtoupper($_SERVER['REQUEST_METHOD']);
+	$section_id = intval(isset(${$requestMethod}['section_id'])) ? ${$requestMethod}['section_id'] : (isset($section_id) ? intval($section_id) : 0);
+	if(	($section_id == 0) && isset($section_required)) {
+		header("Location: $section_required");
+		exit(0);
 	}
-}
+/*
 // be sure is is numeric
 $page_id = intval($page_id);
 $section_id = intval($section_id);
-
+*/
 // Create js back link
 // $js_back = 'javascript: history.go(-1);';
-$js_back = ADMIN_URL.'/pages/sections.php?page_id='.(int)$page_id;
+$js_back = ADMIN_URL.'/pages/sections.php?page_id='.$page_id;
 // Create new admin object, you can set the next variable in your module
 // to print with or without header, default is with header
 // it is recommed to set the variable before including the /modules/admin.php
@@ -82,7 +68,7 @@
 
 if((!$in_group) && !is_numeric(array_search($admin->get_user_id(), $old_admin_users))) {
 	print $admin->get_group_id().$admin->get_user_id();
-	print_r ($old_admin_groups);
+	// print_r ($old_admin_groups);
 	$admin->print_error($MESSAGE['PAGES']['INSUFFICIENT_PERMISSIONS']);
 }
 
@@ -93,7 +79,7 @@
 	if (!$admin->get_permission($section['module'], 'module'))
 	{
 		$admin->print_error($MESSAGE['PAGES']['INSUFFICIENT_PERMISSIONS']);
-	}	
+	}
 }
 
 // Workout if the developer wants to show the info banner
@@ -178,13 +164,28 @@
 	// Parse and print header template
 	$template->parse('main', 'main_block', false);
 	$template->pparse('output', 'page');
-
 	// unset($print_info_banner);
 	unset($template);
-	print '<div id="wb_'.$section['section_id'].'"><b>' . $TEXT['BLOCK'] . ': </b>' . $section['block'];
-	print '<b>  Modul: </b>' . $section['module']." ";
-	print '<b>  ID: </b>' . $section_id."</div>\n";
 
+	if (SECTION_BLOCKS) {
+		if (isset($block[$section['block']]) && trim(strip_tags(($block[$section['block']]))) != '')
+                 {
+			$block_name = htmlentities(strip_tags($block[$section['block']]));
+		} else {
+			if ($section['block'] == 1)
+                     {
+				$block_name = $TEXT['MAIN'];
+			} else {
+				$block_name = '#' . (int) $section['block'];
+			}
+		}
+
+		$sec_anchor = (defined( 'SEC_ANCHOR' ) && ( SEC_ANCHOR != '' )  ? 'id="'.SEC_ANCHOR.$section['section_id'].'"' : '');
+		print '<div class="section-info" '.$sec_anchor.' ><b>' . $TEXT['BLOCK'] . ': </b>' . $block_name;
+		print '<b>  Modul: </b>' . $section['module']." ";
+		print '<b>  ID: </b>' . $section_id."</div>\n";
+	}
+
 } //
 
 // Work-out if the developer wants us to update the timestamp for when the page was last modified

Property changes on: branches/2.8.x/wb/modules/admin.php
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property