Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 1713)
+++ branches/2.8.x/CHANGELOG	(revision 1714)
@@ -13,6 +13,11 @@
 
 
 
+29 Aug-2012 Build 1714 Dietmar Woellbrink (Luisehahne)
+! update module form
+! not auth users get no confirmation mail, but can print message
+! add replyto to received messages, so answer is possible by e-mail client
+! add pagination to submissionlist
 29 Aug-2012 Build 1713 Dietmar Woellbrink (Luisehahne)
 ! remove html markup from code to a template
 29 Aug-2012 Build 1712 Dietmar Woellbrink (Luisehahne)
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php	(revision 1713)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 1714)
@@ -51,5 +51,5 @@
 
 // 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.3');
-if(!defined('REVISION')) define('REVISION', '1713');
+if(!defined('REVISION')) define('REVISION', '1714');
 if(!defined('SP')) define('SP', '');
Index: branches/2.8.x/wb/modules/form/modify_field.php
===================================================================
--- branches/2.8.x/wb/modules/form/modify_field.php	(revision 1713)
+++ branches/2.8.x/wb/modules/form/modify_field.php	(revision 1714)
@@ -12,7 +12,7 @@
  * @version         $Id$
  * @filesource		$HeadURL$
  * @lastmodified    $Date$
- * @description     
+ * @description
  */
 
 require('../../config.php');
@@ -157,12 +157,12 @@
 		<td><?php echo $TEXT['ALLOW_MULTIPLE_SELECTIONS']; ?>:</td>
 		<td>
 			<input type="radio" name="multiselect" id="multiselect_true" value="multiple" <?php if($form['extra'][1] == 'multiple') { echo ' checked="checked"'; } ?> />
-			<a href="#" onclick="javascript: document.getElementById('multiselect_true').checked = true;">
+			<a href="#" onclick="javascript:document.getElementById('multiselect_true').checked = true;">
 			<?php echo $TEXT['YES']; ?>
 			</a>
 			&nbsp;
 			<input type="radio" name="multiselect" id="multiselect_false" value="" <?php if($form['extra'][1] == '') { echo ' checked="checked"'; } ?> />
-			<a href="#" onclick="javascript: document.getElementById('multiselect_false').checked = true;">
+			<a href="#" onclick="javascript:document.getElementById('multiselect_false').checked = true;">
 			<?php echo $TEXT['NO']; ?>
 			</a>
 		</td>
@@ -206,7 +206,7 @@
 		<td align="center">
 			<input type="button" value="<?php echo $TEXT['ADD'].' '.$TEXT['FIELD']; ?>" onclick="javascript: window.location = '<?php echo WB_URL; ?>/modules/form/add_field.php?page_id=<?php echo $page_id; ?>&amp;section_id=<?php echo $section_id; ?>';" style="width: 200px; margin-top: 5px;" />
 		</td>
-		<?php } 
+		<?php }
 		// end addition
 		?>
 		<td align="right">
Index: branches/2.8.x/wb/modules/form/info.php
===================================================================
--- branches/2.8.x/wb/modules/form/info.php	(revision 1713)
+++ branches/2.8.x/wb/modules/form/info.php	(revision 1714)
@@ -4,7 +4,7 @@
  * @category        module
  * @package         Form
  * @author          WebsiteBaker Project
- * @copyright       2009-2012, Website Baker Org. e.V.
+ * @copyright       2009-2012, WebsiteBaker Org. e.V.
  * @link			http://www.websitebaker2.org/
  * @license         http://www.gnu.org/licenses/gpl.html
  * @platform        WebsiteBaker 2.8.3
@@ -12,7 +12,7 @@
  * @version         $Id$
  * @filesource		$HeadURL$
  * @lastmodified    $Date$
- * @description     
+ * @description
  */
 
 // Must include code to stop this file being access directly
@@ -24,7 +24,7 @@
 $module_directory = 'form';
 $module_name = 'Form';
 $module_function = 'page';
-$module_version = '2.8.5';
+$module_version = '2.9.0';
 $module_platform = '2.8.3';
 $module_author = 'Ryan Djurovich & Rudolph Lartey - additions John Maats - PCWacht, dev-team';
 $module_license = 'GNU General Public License';
Index: branches/2.8.x/wb/modules/form/save_field.php
===================================================================
--- branches/2.8.x/wb/modules/form/save_field.php	(revision 1713)
+++ branches/2.8.x/wb/modules/form/save_field.php	(revision 1714)
@@ -4,7 +4,7 @@
  * @category        module
  * @package         Form
  * @author          WebsiteBaker Project
- * @copyright       2009-2011, Website Baker Org. e.V.
+ * @copyright       2009-2012, WebsiteBaker Org. e.V.
  * @link			http://www.websitebaker2.org/
  * @license         http://www.gnu.org/licenses/gpl.html
  * @platform        WebsiteBaker 2.8.x
@@ -12,7 +12,7 @@
  * @version         $Id$
  * @filesource		$HeadURL$
  * @lastmodified    $Date$
- * @description     
+ * @description
  */
 
 require('../../config.php');
@@ -103,7 +103,7 @@
 	$extra = $admin->add_slashes($extra);
 	$database->query("UPDATE ".TABLE_PREFIX."mod_form_fields SET value = '', extra = '$extra' WHERE field_id = '$field_id'");
 } elseif($admin->get_post('type') == 'select') {
-	$extra = $admin->get_post_escaped('size').','.$admin->get_post_escaped('multiselect');
+	$extra = intval($admin->get_post_escaped('size')).','.$admin->get_post_escaped('multiselect');
 	$database->query("UPDATE ".TABLE_PREFIX."mod_form_fields SET value = '$value', extra = '$extra' WHERE field_id = '$field_id'");
 } elseif($admin->get_post('type') == 'checkbox') {
 	$extra = str_replace(array("[[", "]]"), '', $admin->get_post_escaped('seperator'));
Index: branches/2.8.x/wb/modules/form/css/MsdnSearchStyle.css
===================================================================
--- branches/2.8.x/wb/modules/form/css/MsdnSearchStyle.css	(nonexistent)
+++ branches/2.8.x/wb/modules/form/css/MsdnSearchStyle.css	(revision 1714)
@@ -0,0 +1,12 @@
+/*
+Plugin Name: WP-Digg Style Paginator
+Plugin URI: http://www.mis-algoritmos.com/2007/09/09/wp-digg-style-pagination-plugin-v-10/
+Author: Victor De la Rocha
+Author URI: http://www.mis-algoritmos.com
+*/
+/*CSS MsdnSearchStyle pagination*/
+div.pagination { font-family :Verdana,Tahoma,Arial,Helvetica,Sans-Serif; font-size :13px; text-align :left; padding :4px 6px 4px 0; background-color :#ffffff; color :#313031; }
+div.pagination a { color :#0030ce; text-decoration :none; padding :5px 6px 4px 5px; margin :0 3px 0 3px; border :1px solid #b7d8ee; }
+div.pagination a:hover, div.pagination a:active { color :#0066a7; border :1px solid #b7d8ee; background-color :#d2eaf6; }
+div.pagination span.current { padding :5px 6px 4px 5px; margin :0 3px 0 3px; border :1px solid #b7d8ee; font-weight :bold; color :#444444; background-color :#d2eaf6; }
+div.pagination span.disabled { display :none; }

Property changes on: branches/2.8.x/wb/modules/form/css/MsdnSearchStyle.css
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id Revision HeadURL
\ No newline at end of property
Index: branches/2.8.x/wb/modules/form/css/DiggStyle.css
===================================================================
--- branches/2.8.x/wb/modules/form/css/DiggStyle.css	(nonexistent)
+++ branches/2.8.x/wb/modules/form/css/DiggStyle.css	(revision 1714)
@@ -0,0 +1,12 @@
+/*
+Plugin Name: WP-Digg Style Paginator
+Plugin URI: http://www.mis-algoritmos.com/2007/09/09/wp-digg-style-pagination-plugin-v-10/
+Author: Victor De la Rocha
+Author URI: http://www.mis-algoritmos.com
+*/
+/*CSS Digg style pagination*/
+	div.pagination { padding :3px; margin :3px; text-align :left; }
+	div.pagination a { padding :2px 5px 2px 5px; margin :2px; border :1px solid #aaaadd; text-decoration :none; /* no underline */ color :#000099; }
+	div.pagination a:hover, div.digg a:active { border :1px solid #000099; color :#000000; }
+	div.pagination span.current { padding :2px 5px 2px 5px; margin :2px; border :1px solid #000099; font-weight :bold; background-color :#000099; color :#ffffff; }
+	div.pagination span.disabled { padding :2px 5px 2px 5px; margin :2px; border :1px solid #eeeeee; color :#dddddd; }

Property changes on: branches/2.8.x/wb/modules/form/css/DiggStyle.css
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id Revision HeadURL
\ No newline at end of property
Index: branches/2.8.x/wb/modules/form/css/FlickrStyle.css
===================================================================
--- branches/2.8.x/wb/modules/form/css/FlickrStyle.css	(nonexistent)
+++ branches/2.8.x/wb/modules/form/css/FlickrStyle.css	(revision 1714)
@@ -0,0 +1,12 @@
+/*
+Plugin Name: WP-Digg Style Paginator
+Plugin URI: http://www.mis-algoritmos.com/2007/09/09/wp-digg-style-pagination-plugin-v-10/
+Author: Victor De la Rocha
+Author URI: http://www.mis-algoritmos.com
+*/
+/*CSS FlickrStyle pagination*/
+	div.pagination { padding :3px; margin :3px; text-align :left; }
+	div.pagination a { border :1px solid #dedfde; margin-right :3px; padding :2px 6px; background-position :bottom; text-decoration :none; color :#0061de; }
+	div.pagination a:hover, div.meneame a:active { border :1px solid #000000; background-image :none; background-color :#0061de; color :#ffffff; }
+	div.pagination span.current { margin-right :3px; padding :2px 6px; font-weight :bold; color :#ff0084; }
+	div.pagination span.disabled { margin-right :3px; padding :2px 6px; color :#adaaad; }

Property changes on: branches/2.8.x/wb/modules/form/css/FlickrStyle.css
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id Revision HeadURL
\ No newline at end of property
Index: branches/2.8.x/wb/modules/form/css/GrayRedStyle.css
===================================================================
--- branches/2.8.x/wb/modules/form/css/GrayRedStyle.css	(nonexistent)
+++ branches/2.8.x/wb/modules/form/css/GrayRedStyle.css	(revision 1714)
@@ -0,0 +1,12 @@
+/*
+Plugin Name: WP-Digg Style Paginator
+Plugin URI: http://www.mis-algoritmos.com/2007/09/09/wp-digg-style-pagination-plugin-v-10/
+Author: Victor De la Rocha
+Author URI: http://www.mis-algoritmos.com
+*/
+/*GrayRedStyle Pagination*/
+div.pagination { font-size :11px; font-family :Tahoma, Arial, Helvetica, Sans-serif; padding :2px; background-color :#c1c1c1; }
+div.pagination a { padding :2px 5px 2px 5px; margin :2px; background-color :#c1c1c1; text-decoration :none; /* no underline */ color :#000000; }
+div.pagination a:hover, div.pagination a:active { background-color :#99ffff; color :#000000; }
+div.pagination span.current { padding :2px 5px 2px 5px; margin :2px; font-weight :bold; background-color :#ffffff; color :#303030; }
+div.pagination span.disabled { padding :2px 5px 2px 5px; margin :2px; background-color :#c1c1c1; color :#797979; }

Property changes on: branches/2.8.x/wb/modules/form/css/GrayRedStyle.css
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id Revision HeadURL
\ No newline at end of property
Index: branches/2.8.x/wb/modules/form/css/invbar.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/2.8.x/wb/modules/form/css/invbar.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: branches/2.8.x/wb/modules/form/css/meneame.jpg
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/2.8.x/wb/modules/form/css/meneame.jpg
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: branches/2.8.x/wb/modules/form/css/YahooStyle.css
===================================================================
--- branches/2.8.x/wb/modules/form/css/YahooStyle.css	(nonexistent)
+++ branches/2.8.x/wb/modules/form/css/YahooStyle.css	(revision 1714)
@@ -0,0 +1,16 @@
+/*
+Plugin Name: WP-Digg Style Paginator
+Plugin URI: http://www.mis-algoritmos.com/2007/09/09/wp-digg-style-pagination-plugin-v-10/
+Author: Victor De la Rocha
+Author URI: http://www.mis-algoritmos.com
+*/
+/*CSS Yahoo new version style pagination*/
+	div.pagination { padding :3px; margin :3px; text-align :left; font-family :Tahoma,Helvetica,sans-serif; font-size :.85em; }
+	div.pagination a { border :1px solid #ccdbe4; margin-right :3px; padding :2px 8px; background-position :bottom; text-decoration :none; color :#0061de; }
+	div.pagination a:hover, div.pagination a:active { border :1px solid #2b55af; background-image :none; background-color :#3666d4; color :#ffffff; }
+	div.pagination span.current { margin-right :3px; padding :2px 6px; font-weight :bold; color :#000000; }
+	div.pagination span.disabled { display :none; }
+	div.pagination a.next{ border :2px solid #ccdbe4; margin :0 0 0 10px; }
+	div.pagination a.next:hover{ border :2px solid #2b55af; }
+	div.pagination a.prev{ border :2px solid #ccdbe4; margin :0 10px 0 0; }
+	div.pagination a.prev:hover{ border :2px solid #2b55af; }

Property changes on: branches/2.8.x/wb/modules/form/css/YahooStyle.css
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id Revision HeadURL
\ No newline at end of property
Index: branches/2.8.x/wb/modules/form/css/QuotesStyle.css
===================================================================
--- branches/2.8.x/wb/modules/form/css/QuotesStyle.css	(nonexistent)
+++ branches/2.8.x/wb/modules/form/css/QuotesStyle.css	(revision 1714)
@@ -0,0 +1,12 @@
+/*
+Plugin Name: WP-Digg Style Paginator
+Plugin URI: http://www.mis-algoritmos.com/2007/09/09/wp-digg-style-pagination-plugin-v-10/
+Author: Victor De la Rocha
+Author URI: http://www.mis-algoritmos.com
+*/
+/*QuotesStyle*/
+div.pagination { padding :3px; margin :3px; text-align :left; }
+div.pagination a { padding :2px 5px 2px 5px; margin-right :2px; border :1px solid #dddddd; text-decoration :none; color :#aaaaaa; }
+div.pagination a:hover, div.pagination a:active { padding :2px 5px 2px 5px; margin-right :2px; border :1px solid #a0a0a0; }
+div.pagination span.current { padding :2px 5px 2px 5px; margin-right :2px; border :1px solid #e0e0e0; font-weight :bold; background-color :#f0f0f0; color :#aaaaaa; }
+div.pagination span.disabled { padding :2px 5px 2px 5px; margin-right :2px; border :1px solid #f3f3f3; color :#cccccc; }

Property changes on: branches/2.8.x/wb/modules/form/css/QuotesStyle.css
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id Revision HeadURL
\ No newline at end of property
Index: branches/2.8.x/wb/modules/form/css/bar.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/2.8.x/wb/modules/form/css/bar.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: branches/2.8.x/wb/modules/form/css/SabrosusStyle.css
===================================================================
--- branches/2.8.x/wb/modules/form/css/SabrosusStyle.css	(nonexistent)
+++ branches/2.8.x/wb/modules/form/css/SabrosusStyle.css	(revision 1714)
@@ -0,0 +1,12 @@
+/*
+Plugin Name: WP-Digg Style Paginator
+Plugin URI: http://www.mis-algoritmos.com/2007/09/09/wp-digg-style-pagination-plugin-v-10/
+Author: Victor De la Rocha
+Author URI: http://www.mis-algoritmos.com
+*/
+/*CSS SabrosusStyle pagination*/
+div.pagination { padding :3px; margin :3px; text-align :left; }
+div.pagination a { padding :2px 5px 2px 5px; margin-right :2px; border :1px solid #9aafe5; text-decoration :none; color :#2e6ab1; }
+div.pagination a:hover, div.pagination a:active { border :1px solid #2b66a5; color :#000000; background-color :#ffffe0; }
+div.pagination span.current { padding :2px 5px 2px 5px; margin-right :2px; border :1px solid #000080; font-weight :bold; background-color :#2e6ab1; color :#ffffff; }
+div.pagination span.disabled { padding :2px 5px 2px 5px; margin-right :2px; border :1px solid #929292; color :#929292; }

Property changes on: branches/2.8.x/wb/modules/form/css/SabrosusStyle.css
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id Revision HeadURL
\ No newline at end of property
Index: branches/2.8.x/wb/modules/form/css/512megasStyle.css
===================================================================
--- branches/2.8.x/wb/modules/form/css/512megasStyle.css	(nonexistent)
+++ branches/2.8.x/wb/modules/form/css/512megasStyle.css	(revision 1714)
@@ -0,0 +1,12 @@
+/*
+Plugin Name: WP-Digg Style Paginator
+Plugin URI: http://www.mis-algoritmos.com/2007/09/09/wp-digg-style-pagination-plugin-v-10/
+Author: Victor De la Rocha
+Author URI: http://www.mis-algoritmos.com
+*/
+/* 512megasStyle   512megas.com */
+	div.pagination { padding :3px; margin :3px; text-align :left; }
+	div.pagination a { border :1px solid #dedfde; margin-right :3px; padding :2px 6px; background-position :bottom; text-decoration :none; color :#99210b; }
+	div.pagination a:hover, div.pagination a:active { border :1px solid #000000; background-image :none; background-color :#777777; color :#ffffff; }
+	div.pagination span.current { border :1px solid #000; margin-right :3px; padding :2px 6px; font-weight :bold; color :#000; }
+	div.pagination span.disabled { margin-right :3px; padding :2px 6px; color :#adaaad; }

Property changes on: branches/2.8.x/wb/modules/form/css/512megasStyle.css
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id Revision HeadURL
\ No newline at end of property
Index: branches/2.8.x/wb/modules/form/css/Black-RedStyle.css
===================================================================
--- branches/2.8.x/wb/modules/form/css/Black-RedStyle.css	(nonexistent)
+++ branches/2.8.x/wb/modules/form/css/Black-RedStyle.css	(revision 1714)
@@ -0,0 +1,11 @@
+/*
+Plugin Name: WP-Digg Style Paginator
+Plugin URI: http://www.mis-algoritmos.com/2007/09/09/wp-digg-style-pagination-plugin-v-10/
+Author: Victor De la Rocha
+Author URI: http://www.mis-algoritmos.com
+*/
+div.pagination { font-size :11px; font-family :Tahoma, Arial, Helvetica, Sans-serif; background-color :#3e3e3e; color :#ffffff; }
+div.pagination a { padding :2px 5px 2px 5px; margin :2px; background-color :#3e3e3e; text-decoration :none; /* no underline */ color :#ffffff; }
+div.pagination a:hover, div.pagination a:active { background-color :#ec5210; color :#ffffff; }
+div.pagination span.current { padding :2px 5px 2px 5px; margin :2px; font-weight :bold; background-color :#313131; color :#ffffff; }
+div.pagination span.disabled { padding :2px 5px 2px 5px; margin :2px; background-color :#3e3e3e; color :#868686; }

Property changes on: branches/2.8.x/wb/modules/form/css/Black-RedStyle.css
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id Revision HeadURL
\ No newline at end of property
Index: branches/2.8.x/wb/modules/form/install.php
===================================================================
--- branches/2.8.x/wb/modules/form/install.php	(revision 1713)
+++ branches/2.8.x/wb/modules/form/install.php	(revision 1714)
@@ -17,7 +17,7 @@
 
 if(defined('WB_URL'))
 {
-		
+
 	// $database->query("DROP TABLE IF EXISTS `".TABLE_PREFIX."mod_form_fields`");
 	// $database->query("DROP TABLE IF EXISTS `".TABLE_PREFIX."mod_form_submissions`");
 	// $database->query("DROP TABLE IF EXISTS `".TABLE_PREFIX."mod_form_settings`");
@@ -54,11 +54,12 @@
 		. ' `success_email_subject` VARCHAR(255) NOT NULL DEFAULT \'\' ,'
 		. ' `stored_submissions` INT NOT NULL DEFAULT \'0\' ,'
 		. ' `max_submissions` INT NOT NULL DEFAULT \'0\' ,'
+		. ' `perpage_submissions` INT NOT NULL DEFAULT \'10\' ,'
 		. ' `use_captcha` INT NOT NULL DEFAULT \'0\' ,'
 		. ' PRIMARY KEY ( `section_id` ) '
 		. ' ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci';
 	$database->query($mod_form);
-	
+
 	$mod_form = 'CREATE TABLE IF NOT EXISTS `'.TABLE_PREFIX.'mod_form_submissions` ( `submission_id` INT NOT NULL AUTO_INCREMENT,'
 		. ' `section_id` INT NOT NULL DEFAULT \'0\' ,'
 		. ' `page_id` INT NOT NULL DEFAULT \'0\' ,'
@@ -68,7 +69,7 @@
 		. ' PRIMARY KEY ( `submission_id` ) '
 		. ' ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci';
 	$database->query($mod_form);
-		
+
     $mod_search = "SELECT * FROM ".TABLE_PREFIX."search  WHERE value = 'form'";
     $insert_search = $database->query($mod_search);
     if( $insert_search->numRows() == 0 )
Index: branches/2.8.x/wb/modules/form/modify_settings.php
===================================================================
--- branches/2.8.x/wb/modules/form/modify_settings.php	(revision 1713)
+++ branches/2.8.x/wb/modules/form/modify_settings.php	(revision 1714)
@@ -12,7 +12,7 @@
  * @version         $Id$
  * @filesource		$HeadURL$
  * @lastmodified    $Date$
- * @description     
+ * @description
  */
 
 require('../../config.php');
@@ -30,6 +30,14 @@
 $lang = (dirname(__FILE__)) . '/languages/' . LANGUAGE . '.php';
 require_once(!file_exists($lang) ? (dirname(__FILE__)) . '/languages/EN.php' : $lang );
 
+// later in upgrade.php
+$table_name = TABLE_PREFIX.'mod_form_settings';
+$field_name = 'perpage_submissions';
+$description = "INT NOT NULL DEFAULT '10' AFTER `max_submissions`";
+if(!$database->field_exists($table_name,$field_name)) {
+	$database->field_add($table_name, $field_name, $description);
+}
+
 $sec_anchor = (defined( 'SEC_ANCHOR' ) && ( SEC_ANCHOR != '' )  ? '#'.SEC_ANCHOR.$section['section_id'] : '' );
 
 if (!function_exists('emailAdmin')) {
@@ -113,6 +121,12 @@
 		</td>
 	</tr>
 	<tr>
+		<td class="frm-setting_name"><?php echo $TEXT['SUBMISSIONS_PERPAGE']; ?>:</td>
+		<td class="frm-setting_value">
+			<input type="text" name="perpage_submissions" style="width: 30px;" maxlength="255" value="<?php echo str_replace($raw, $friendly, ($setting['perpage_submissions'])); ?>" />
+		</td>
+	</tr>
+	<tr>
 		<td class="frm-setting_name"><?php echo $TEXT['HEADER']; ?>:</td>
 		<td class="frm-setting_value">
 			<textarea name="header" cols="80" rows="6" style="width: 98%; height: 80px;"><?php echo ($setting['header']); ?></textarea>
@@ -130,7 +144,7 @@
 			<textarea name="footer" cols="80" rows="6" style="width: 98%; height: 80px;"><?php echo str_replace($raw, $friendly, ($setting['footer'])); ?></textarea>
 		</td>
 	</tr>
-</table>	
+</table>
 <!-- E-Mail Optionen -->
 <table summary="<?php echo $TEXT['EMAIL'].' '.$TEXT['SETTINGS']; ?>" class="row_a" cellpadding="2" cellspacing="0" border="0" width="100%" style="margin-top: 3px;">
 	<tr>
@@ -169,8 +183,36 @@
 		<td class="frm-setting_name"><?php echo $TEXT['EMAIL'].' '.$MOD_FORM['TO']; ?>:</td>
 		<td class="frm-setting_value"><?php echo  $MOD_FORM['RECIPIENT'] ?>	</td>
 	</tr>
-
 	<tr>
+		<td colspan="2"><p class="frm-warning"><?php echo $MOD_FORM['SPAM']; ?></p></td>
+	</tr>
+	<tr>
+		<td class="frm-setting_name"><?php echo $MOD_FORM['REPLYTO']; ?>:</td>
+		<td class="frm-setting_value">
+			<select name="success_email_to" style="width: 98%;">
+			<option value="" onclick="javascript: document.getElementById('success_email_to').style.display = 'block';"><?php echo $TEXT['NONE']; ?></option>
+			<?php
+			$success_email_to = str_replace($raw, $friendly, ($setting['success_email_to']));
+			$sql  = 'SELECT `field_id`, `title` FROM `'.TABLE_PREFIX.'mod_form_fields` ';
+			$sql .= 'WHERE `section_id` = '.(int)$section_id.' ';
+			$sql .= '  AND  `type` = \'email\' ';
+			$sql .= 'ORDER BY `position` ASC ';
+			if($query_email_fields = $database->query($sql)) {
+				if($query_email_fields->numRows() > 0) {
+					while($field = $query_email_fields->fetchRow(MYSQL_ASSOC)) {
+						?>
+						<option value="field<?php echo $field['field_id']; ?>"<?php if($success_email_to == 'field'.$field['field_id']) { echo ' selected'; $selected = true; } ?> onclick="javascript: document.getElementById('email_from').style.display = 'none';">
+							<?php echo $TEXT['FIELD'].': '.$field['title']; ?>
+						</option>
+						<?php
+					}
+				}
+			}
+			?>
+			</select>
+		</td>
+	</tr>
+	<tr>
 		<td class="frm-setting_name"><?php echo $TEXT['DISPLAY_NAME']; ?>:</td>
 		<td class="frm-setting_value">
 			<?php $setting['success_email_fromname'] = ($setting['success_email_fromname'] != '' ? $setting['success_email_fromname'] : WBMAILER_DEFAULT_SENDERNAME); ?>
@@ -195,13 +237,13 @@
 		<td class="frm-newsection">
 			<select name="success_page">
 			<option value="none"><?php echo $TEXT['NONE']; ?></option>
-			<?php 
+			<?php
 			// Get exisiting pages and show the pagenames
 			$query = $database->query("SELECT * FROM ".TABLE_PREFIX."pages WHERE visibility <> 'deleted'");
 			while($mail_page = $query->fetchRow(MYSQL_ASSOC)) {
 				if(!$admin->page_is_visible($mail_page))
 					continue;
-				$mail_pagename = $mail_page['menu_title'];		
+				$mail_pagename = $mail_page['menu_title'];
 				$success_page = $mail_page['page_id'];
 			  //	echo $success_page.':'.$setting['success_page'].':'; not vailde
 				if($setting['success_page'] == $success_page) {
Index: branches/2.8.x/wb/modules/form/htt/OverviewSubmission.htt
===================================================================
--- branches/2.8.x/wb/modules/form/htt/OverviewSubmission.htt	(nonexistent)
+++ branches/2.8.x/wb/modules/form/htt/OverviewSubmission.htt	(revision 1714)
@@ -0,0 +1,53 @@
+<!-- BEGIN main_block -->
+<br /><br />
+<h2 id="submissions">{TEXT_SUBMISSIONS}</h2>
+<table summary="" width="100%" cellpadding="2" cellspacing="0" border="0" class="">
+<thead>
+<tr style="background-color: #dddddd; font-weight: bold;">
+	<th width="23" style="text-align: center;">&nbsp;</th>
+	<th width="33" style="text-align: right;"> ID </th>
+	<th width="200" style="padding-left: 10px;">{TEXT_SUBMITTED}</th>
+	<th width="200" style="padding-left: 10px;">{TEXT_USER}</th>
+	<th width="350">{TEXT_EMAIL} {MOD_FORM_FROM}</th>
+	<th width="20">&nbsp;</th>
+	<th width="20">&nbsp;</th>
+	<th width="20">&nbsp;</th>
+	<th width="20">&nbsp;</th>
+</tr>
+</thead>
+<tfoot class="frm-pagination">
+    <tr style="background-color: #dddddd; font-weight: bold;">
+    	<td colspan="9" style="text-align: left;">
+{PAGINATION}
+		</td>
+	</tr>
+</tfoot>
+<tbody>
+<!-- BEGIN loop_submmission_block -->
+<tr class="row_{ROW_BIT}">
+	<td width="20" style="padding-left: 5px;text-align: center;">
+		<a href="{WB_URL}/modules/form/view_submission.php?{QUERYSTR}" title="{TEXT_OPEN}">
+			<img src="{THEME_URL}/images/folder_16.png" alt="{TEXT_OPEN}" />
+		</a>
+	</td>
+	<td width="30" style="padding-right: 5px;text-align: right;">{SUBMISSION_ID}</td>
+	<td width="200" style="padding-left: 10px;">{SUBMISSION_CREATE_WHEN}</td>
+	<td width="200" style="padding-left: 10px;">{SUBMISSION_BY}</td>
+	<td width="350">{SUBMISSION_EMAIL}</td>
+	<td width="20" style="text-align: center;">&nbsp;</td>
+	<td width="20">&nbsp;</td>
+	<td width="20" style="text-align: center;">
+		<a href="javascript:confirm_link('{TEXT_ARE_YOU_SURE}','{WB_URL}/modules/form/delete_submission.php?{QUERYSTR}');" title="{TEXT_DELETE}">
+			<img src="{THEME_URL}/images/delete_16.png" alt="X" />
+		</a>
+	</td>
+	<td width="20">&nbsp;</td>
+</tr>
+<!-- END loop_submmission_block -->
+
+<tr><td colspan="9">{TEXT_NONE_FOUND}</td></tr>
+
+</tbody>
+</table>
+
+<!-- END main_block -->
\ No newline at end of file

Property changes on: branches/2.8.x/wb/modules/form/htt/OverviewSubmission.htt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id Revision HeadURL
\ No newline at end of property
Index: branches/2.8.x/wb/modules/form/htt/print.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/2.8.x/wb/modules/form/htt/print.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: branches/2.8.x/wb/modules/form/htt/submessage.htt
===================================================================
--- branches/2.8.x/wb/modules/form/htt/submessage.htt	(nonexistent)
+++ branches/2.8.x/wb/modules/form/htt/submessage.htt	(revision 1714)
@@ -0,0 +1,37 @@
+<!-- BEGIN main_block -->
+
+<div class="previewPrintTop">
+<a title="{TEXT_PRINT_PAGE} ({TEXT_REQUIRED_JS})" href="javascript:window.print()">
+{TEXT_PRINT_PAGE}<img width="16px" height="14px" alt="" src="{MODULE_URL}/htt/print.gif" />
+</a>
+</div>
+
+<table class="frm-submission print-email">
+<tr>
+	<td colspan="2">{SUCCESS_EMAIL_TEXT}</td>
+</tr>
+<tr>
+	<td colspan="2"><p class="frm-warning {NIX_HIER}">{SUCCESS_PRINT}</p></td>
+</tr>
+
+<tr>
+	<td>{TEXT_SUBMISSION_ID}:</td>
+	<td>{submission_submission_id}</td>
+</tr>
+<tr>
+	<td>{TEXT_SUBMITTED}:</td>
+	<td>{submission_submitted_when}</td>
+</tr>
+<tr>
+	<td>{TEXT_USER}:</td>
+	<td>{user_display_name} ({user_username})</td>
+</tr>
+<tr>
+	<td colspan="2"><hr /></td>
+</tr>
+<tr>
+	<td colspan="2">{submission_body}</td>
+</tr>
+</table>
+
+<!-- END main_block -->
\ No newline at end of file

Property changes on: branches/2.8.x/wb/modules/form/htt/submessage.htt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id Revision HeadURL
\ No newline at end of property
Index: branches/2.8.x/wb/modules/form/htt
===================================================================
--- branches/2.8.x/wb/modules/form/htt	(nonexistent)
+++ branches/2.8.x/wb/modules/form/htt	(revision 1714)

Property changes on: branches/2.8.x/wb/modules/form/htt
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,2 ##
+print.gif
+view.htt
Index: branches/2.8.x/wb/modules/form/save_field_new.php
===================================================================
--- branches/2.8.x/wb/modules/form/save_field_new.php	(revision 1713)
+++ branches/2.8.x/wb/modules/form/save_field_new.php	(revision 1714)
@@ -4,7 +4,7 @@
  * @category        module
  * @package         Form
  * @author          WebsiteBaker Project
- * @copyright       2009-2011, Website Baker Org. e.V.
+ * @copyright       2009-2012, WebsiteBaker Org. e.V.
  * @link			http://www.websitebaker2.org/
  * @license         http://www.gnu.org/licenses/gpl.html
  * @platform        WebsiteBaker 2.8.x
@@ -46,7 +46,7 @@
 
 // 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));
+	$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));
 } else {
 	$title = str_replace(array("[[", "]]"), '', htmlspecialchars($admin->get_post_escaped('title'), ENT_QUOTES));
 	$type = $admin->add_slashes($admin->get_post('type'));
@@ -54,7 +54,7 @@
 }
 
 // If field type has multiple options, get all values and implode them
-	 $value = $extra = '';
+	$value = $extra = '';
 	$list_count = $admin->get_post('list_count');
 	if(is_numeric($list_count)) {
 		$values = array();
@@ -81,7 +81,7 @@
 			$extra = $admin->add_slashes($extra);
 			break;
 		case 'select':
-			$extra = $admin->get_post_escaped('size').','.$admin->get_post_escaped('multiselect');
+			$extra = intval($admin->get_post_escaped('size')).','.$admin->get_post_escaped('multiselect');
 			break;
 		case 'checkbox':
 			$extra = str_replace(array("[[", "]]"), '', $admin->get_post_escaped('seperator'));
Index: branches/2.8.x/wb/modules/form/view.php
===================================================================
--- branches/2.8.x/wb/modules/form/view.php	(revision 1713)
+++ branches/2.8.x/wb/modules/form/view.php	(revision 1714)
@@ -4,7 +4,7 @@
  * @category        module
  * @package         Form
  * @author          WebsiteBaker Project
- * @copyright       2009-2011, Website Baker Org. e.V.
+ * @copyright       2009-2012, WebsiteBaker Org. e.V.
  * @link			http://www.websitebaker2.org/
  * @license         http://www.gnu.org/licenses/gpl.html
  * @platform        WebsiteBaker 2.8.x
@@ -20,7 +20,7 @@
 if(defined('WB_PATH') == false)
 {
 	// Stop this file being access directly
-		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>');
+		die('<h2 style="color:red;margin:3em auto;text-align:center;">Cannot access this file directly</h2>');
 }
 /* -------------------------------------------------------- */
 
@@ -42,7 +42,7 @@
 	return $value === removebreaks($value);
 }
 */
-
+$aSuccess =array();
 if (!function_exists('emailAdmin')) {
 	function emailAdmin() {
 		global $database,$admin;
@@ -151,7 +151,7 @@
 	}
 
 // do not use sec_anchor, can destroy some layouts
-$sec_anchor = (defined( 'SEC_ANCHOR' ) && ( SEC_ANCHOR != '' )  ? '#'.SEC_ANCHOR.$section['section_id'] : '' );
+$sec_anchor = (defined( 'SEC_ANCHOR' ) && ( SEC_ANCHOR != '' )  ? '#'.SEC_ANCHOR.$fetch_settings['section_id'] : '' );
 
 	// Get list of fields
 	$sql  = 'SELECT * FROM `'.TABLE_PREFIX.'mod_form_fields` ';
@@ -174,7 +174,7 @@
 				if(ENABLED_ASP) { // first add some honeypot-fields
 				?>
 					<input type="hidden" name="submitted_when" value="<?php $t=time(); echo $t; $_SESSION['submitted_when']=$t; ?>" />
-					<p class="frm-nixhier">
+					<p class="nixhier">
 					email address:
 					<label for="email">Leave this field email-address blank:</label>
 					<input id="email" name="email" size="56" value="" /><br />
@@ -221,6 +221,7 @@
 					$options = explode(',', $value);
 					array_walk($options, 'make_option', (isset($_SESSION['field'.$field_id])?$_SESSION['field'.$field_id]:array()));
 					$field['extra'] = explode(',',$field['extra']);
+					$field['extra'][1] = ($field['extra'][1]='multiple') ? $field['extra'][1].'="'.$field['extra'][1].'"' : '';
 					$values[] = '<select name="field'.$field_id.'[]" id="field'.$field_id.'" size="'.$field['extra'][0].'" '.$field['extra'][1].' class="frm-select">'.implode($options).'</select>'.PHP_EOL;
 				} elseif($field['type'] == 'heading') {
 					$vars[] = '{FIELD}';
@@ -296,7 +297,7 @@
 			(!isset($_POST['url']) OR $_POST['url'])
 		)) {
 			// spam
-			header("Location: ".WB_URL.PAGES_DIRECTORY."");
+			header("Location: ".WB_URL."");
             exit();
 		}
 		// Submit form data
@@ -303,13 +304,15 @@
 		// First start message settings
 		$sql  = 'SELECT * FROM `'.TABLE_PREFIX.'mod_form_settings` ';
 		$sql .= 'WHERE `section_id` = '.(int)$section_id.'';
-		if($query_settings = $database->query($sql) ) {
-			if($query_settings->numRows() > 0) {
+		if($query_settings = $database->query($sql) )
+		{
+			if($query_settings->numRows() > 0)
+			{
 				$fetch_settings = $query_settings->fetchRow(MYSQL_ASSOC);
 
 				// $email_to = $fetch_settings['email_to'];
 				$email_to = (($fetch_settings['email_to'] != '') ? $fetch_settings['email_to'] : emailAdmin());
-				$email_from = $admin->add_slashes(SERVER_EMAIL);
+				$email_from = $wb->add_slashes(SERVER_EMAIL);
 /*
 				if(substr($email_from, 0, 5) == 'field') {
 					// Set the email from field to what the user entered in the specified field
@@ -317,8 +320,8 @@
 				}
 */
 				$email_fromname = $fetch_settings['email_fromname'];
-// 				$email_fromname = (($mail_replyName='') ? $fetch_settings['email_fromname'] : $mail_replyName);
- 				$email_fromname = (($mail_replyName='') ? htmlspecialchars($wb->add_slashes($fetch_settings['email_fromname'])) : $mail_replyName);
+ 				$email_fromname = (($mail_replyName='') ? $fetch_settings['email_fromname'] : $mail_replyName);
+// 				$email_fromname = (($mail_replyName='') ? htmlspecialchars($wb->add_slashes($fetch_settings['email_fromname'])) : $mail_replyName);
 
 				if(substr($email_fromname, 0, 5) == 'field') {
 					// Set the email_fromname to field to what the user entered in the specified field
@@ -328,15 +331,22 @@
 				$email_subject = (($fetch_settings['email_subject'] != '') ? $fetch_settings['email_subject'] : $MOD_FORM['EMAIL_SUBJECT']);
 				$success_page = $fetch_settings['success_page'];
 				$success_email_to = $mail_replyto;
+				$success_email_from = $wb->add_slashes(SERVER_EMAIL);
+				$success_email_fromname = $fetch_settings['success_email_fromname'];
 /*
-				$success_email_to = (($fetch_settings['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]));
+*/
+				if($mail_replyto == '') {
+					$success_email_to = (($fetch_settings['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
+						 $mail_replyto = $success_email_to = htmlspecialchars($wb->add_slashes($_POST[$success_email_to]));
+					}
+					$success_email_to = '';
+					$email_fromname = $TEXT['UNKNOWN'];
+//					$success_email_fromname = $TEXT['UNKNOWN'];
+//					$email_from = $TEXT['UNKNOWN'];
 				}
-*/
-				$success_email_from = $admin->add_slashes(SERVER_EMAIL);
-				$success_email_fromname = $fetch_settings['success_email_fromname'];
+
 				$success_email_text = htmlspecialchars($wb->add_slashes($fetch_settings['success_email_text']));
 				$success_email_text = (($success_email_text != '') ? $success_email_text : $MOD_FORM['SUCCESS_EMAIL_TEXT']);
 				$success_email_subject = (($fetch_settings['success_email_subject'] != '') ? $fetch_settings['success_email_subject'] : $MOD_FORM['SUCCESS_EMAIL_SUBJECT']);
@@ -388,7 +398,7 @@
 								$_SESSION['field'.$field['field_id']] = str_replace(array("[[", "]]"), array("&#91;&#91;", "&#93;&#93;"), htmlspecialchars($wb->strip_slashes($_POST['field'.$field['field_id']])));
 							}
 
-							if($field['type'] == 'email' AND $admin->validate_email($_POST['field'.$field['field_id']]) == false) {
+							if($field['type'] == 'email' AND $wb->validate_email($_POST['field'.$field['field_id']]) == false) {
 								$email_error = $MESSAGE['USERS_INVALID_EMAIL'];
 								$required[]= '';
 							}
@@ -420,7 +430,7 @@
 			} else {
 				echo '<h3>'.$MESSAGE['MOD_FORM_REQUIRED_FIELDS'].'</h3>';
 			}
-			echo "<ul>\n";
+			echo "<ol class=\"warning\">\n";
 			foreach($required AS $field_title) {
 				if($field_title!=''){
 					echo '<li>'.$field_title."</li>\n";
@@ -436,19 +446,19 @@
 			}
 			// Create blank "required" array
 			$required = array();
-			echo "</ul>\n";
+			echo "</ol>\n";
 
 			echo '<p>&nbsp;</p>'."\n".'<p><a href="'.htmlspecialchars(strip_tags($_SERVER['SCRIPT_NAME'])).'">'.$TEXT['BACK'].'</a></p>'."\n";
 		} else {
 			if(isset($email_error)) {
-				echo '<br /><ul>'."\n";
+				echo '<br /><ol class=\"warning\">'."\n";
 				echo '<li>'.$email_error.'</li>'."\n";
-				echo '</ul>'."\n";
+				echo '</ol>'."\n";
 				echo '<a href="'.htmlspecialchars(strip_tags($_SERVER['SCRIPT_NAME'])).'">'.$TEXT['BACK'].'</a>';
 			} elseif(isset($captcha_error)) {
-				echo '<br /><ul>'."\n";
+				echo '<br /><ol class=\"warning\">'."\n";
 				echo '<li>'.$captcha_error.'</li>'."\n";
-				echo '</ul>'."\n";
+				echo '</ol>'."\n";
 				echo '<p>&nbsp;</p>'."\n".'<p><a href="'.htmlspecialchars(strip_tags($_SERVER['SCRIPT_NAME'])).'">'.$TEXT['BACK'].'</a></p>'."\n";
 			} else {
 				// Check how many times form has been submitted in last hour
@@ -474,7 +484,8 @@
 						$email_fromname = preg_replace( "/(content-type:|bcc:|cc:|to:|from:)/im", "", $recipient );
 						$email_body = preg_replace( "/(content-type:|bcc:|cc:|to:|from:)/im", "", $email_body );
 
-						if($email_to != '') {
+						if($mail_replyto != '') {
+
 							if($email_from != '') {
 								$success = $wb->mail(SERVER_EMAIL,$email_to,$email_subject,$email_body,$email_fromname,$mail_replyto);
 							} else {
@@ -487,11 +498,13 @@
 							$recipient = preg_replace( "/[^a-z0-9 !?:;,.\/_\-=+@#$&\*\(\)]/im", "", $success_email_fromname );
 							$success_email_fromname = preg_replace( "/(content-type:|bcc:|cc:|to:|from:)/im", "", $recipient );
 							$success_email_text = preg_replace( "/(content-type:|bcc:|cc:|to:|from:)/im", "", $success_email_text );
-							if($success_email_to != '') {
-								if($success_email_from != '') {
-									$success = $wb->mail(SERVER_EMAIL,$success_email_to,$success_email_subject,($success_email_text).$MOD_FORM['SUCCESS_EMAIL_TEXT_GENERATED'],$success_email_fromname,$mail_replyto);
+							if($success_email_to != '')
+							{
+								if($success_email_from != '')
+								{
+									$success = $wb->mail(SERVER_EMAIL,$success_email_to,$success_email_subject,($success_email_text).'<br /><br />'.($email_body).$MOD_FORM['SUCCESS_EMAIL_TEXT_GENERATED'],$success_email_fromname);
 								} else {
-									$success = $wb->mail('',$success_email_to,$success_email_subject,($success_email_text).$MOD_FORM['SUCCESS_EMAIL_TEXT_GENERATED'],$success_email_fromname,$mail_replyto);
+									$success = $wb->mail('',$success_email_to,$success_email_subject,($success_email_text).'<br /><br />'.($email_body).$MOD_FORM['SUCCESS_EMAIL_TEXT_GENERATED'],$success_email_fromname);
 								}
 							}
 						}
@@ -498,9 +511,10 @@
 
 						if($success==true)
 						{
+							$aSuccess[] .= 'INSERT INTO '.TABLE_PREFIX.'mod_form_submissions<br /> ';;
 							// Write submission to database
-							if(isset($admin) AND $admin->is_authenticated() AND $admin->get_user_id() > 0) {
-								$submitted_by = $admin->get_user_id();
+							if(isset($wb) AND $wb->is_authenticated() AND $wb->get_user_id() > 0) {
+								$submitted_by = $wb->get_user_id();
 							} else {
 								$submitted_by = 0;
 							}
@@ -514,6 +528,9 @@
 							$sql .= 'body=\''.$email_body.'\' ';
 							if($database->query($sql))
 							{
+								// Get the page id
+								$iSubmissionId = intval($database->get_one("SELECT LAST_INSERT_ID()"));
+
 								if(!$database->is_error()) {
 									$success = true;
 								}
@@ -556,8 +573,66 @@
 	if(isset($success) && $success == true)
 	{
 	   if ($success_page=='none') {
-			echo str_replace("\n","<br />",($success_email_text));
-			echo '<p>&nbsp;</p>'.PHP_EOL.'<p><a href="'.htmlspecialchars(strip_tags($_SERVER['SCRIPT_NAME'])).'">'.$TEXT['BACK'].'</a></p>'.PHP_EOL;
+
+			// Get submission details
+			$sql  = 'SELECT * FROM `'.TABLE_PREFIX.'mod_form_submissions` ';
+			$sql .= 'WHERE submission_id = '.$iSubmissionId.' ';
+			if($query_content = $database->query($sql)) {
+				$submission = $query_content->fetchRow(MYSQL_ASSOC);
+			}
+			$Message = '';
+			$NixHier = 'nixhier';
+			// Get the user details of whoever did this submission
+			$sql  = 'SELECT `username`,`display_name` FROM `'.TABLE_PREFIX.'users` ';
+			$sql .= 'WHERE `user_id` = '.$submission['submitted_by'];
+			if($get_user = $database->query($sql))
+			{
+				if($get_user->numRows() != 0) {
+					$user = $get_user->fetchRow(MYSQL_ASSOC);
+				} else {
+					$Message = $MOD_FORM['PRINT'];
+					$NixHier = '';
+					$user['display_name'] = $TEXT['GUEST'];
+					$user['username'] = $TEXT['UNKNOWN'];
+				}
+			}
+
+			$aSubSuccess = array();
+			// set template file and assign module and template block
+			$oTpl = new Template(WB_PATH.'/modules/form/htt','keep');
+			// $tpl = new Template(dirname($admin->correct_theme_source('switchform.htt')),'keep');
+			$oTpl->set_file('page', 'submessage.htt');
+			$oTpl->debug = false; // false, true
+			$oTpl->set_block('page', 'main_block', 'main');
+            $oTpl->set_var(array(
+            		'ADMIN_URL' => ADMIN_URL,
+            		'THEME_URL' => THEME_URL,
+            		'MODULE_URL' => dirname(__FILE__),
+            		'WB_URL' => WB_URL
+            	)
+            );
+			$oTpl->set_var(array(
+					'SUCCESS_EMAIL_TEXT' => $success_email_text,
+					'TEXT_SUBMISSION_ID' => $TEXT['SUBMISSION_ID'],
+					'submission_submission_id' => $submission['submission_id'],
+					'TEXT_SUBMITTED' => $TEXT['SUBMITTED'],
+					'submission_submitted_when' => gmdate( DATE_FORMAT .', '.TIME_FORMAT, $submission['submitted_when']+TIMEZONE ),
+					'NIX_HIER' => $NixHier,
+					'TEXT_USER' => $TEXT['USER'],
+					'TEXT_PRINT_PAGE' => $TEXT['PRINT_PAGE'],
+					'TEXT_REQUIRED_JS' => $TEXT['REQUIRED_JS'],
+					'user_display_name' => $user['display_name'],
+					'user_username' => $user['username'],
+					'SUCCESS_PRINT' => $Message,
+					'submission_body' => nl2br($submission['body'])
+					)
+				);
+
+			$oTpl->parse('main', 'main_block', false);
+			$output = $oTpl->finish($oTpl->parse('output', 'page'));
+			unset($oTpl);
+			print $output;
+
   		} else {
 			echo "<script type='text/javascript'>location.href='".$sSuccessLink."';</script>";
 		}
Index: branches/2.8.x/wb/modules/form/save_settings.php
===================================================================
--- branches/2.8.x/wb/modules/form/save_settings.php	(revision 1713)
+++ branches/2.8.x/wb/modules/form/save_settings.php	(revision 1714)
@@ -4,7 +4,7 @@
  * @category        module
  * @package         Form
  * @author          WebsiteBaker Project
- * @copyright       2009-2011, Website Baker Org. e.V.
+ * @copyright       2009-2012, WebsiteBaker Org. e.V.
  * @link			http://www.websitebaker2.org/
  * @license         http://www.gnu.org/licenses/gpl.html
  * @platform        WebsiteBaker 2.8.x
@@ -12,7 +12,7 @@
  * @version         $Id$
  * @filesource		$HeadURL$
  * @lastmodified    $Date$
- * @description     
+ * @description
  */
 
 require('../../config.php');
@@ -48,15 +48,23 @@
 // load module language file
 $lang = (dirname(__FILE__)) . '/languages/' . LANGUAGE . '.php';
 require_once(!file_exists($lang) ? (dirname(__FILE__)) . '/languages/EN.php' : $lang );
+// later in upgrade.php
+$table_name = TABLE_PREFIX.'mod_form_settings';
+$field_name = 'perpage_submissions';
+$description = "INT NOT NULL DEFAULT '10' AFTER `max_submissions`";
+if(!$database->field_exists($table_name,$field_name)) {
+	$database->field_add($table_name, $field_name, $description);
+}
 
+
 // This code removes any <?php tags and adds slashes
 $friendly = array('&lt;', '&gt;', '?php');
 $raw = array('<', '>', '');
-$header = $admin->add_slashes($_POST['header']);
+$header     = $admin->add_slashes($_POST['header']);
 $field_loop = $admin->add_slashes($_POST['field_loop']);
-$footer = $admin->add_slashes($_POST['footer']);
-$email_to = $admin->add_slashes($_POST['email_to']);
-$email_to = ($email_to != '' ? $email_to : emailAdmin());
+$footer     = $admin->add_slashes($_POST['footer']);
+$email_to   = $admin->add_slashes($_POST['email_to']);
+$email_to   = ($email_to != '' ? $email_to : emailAdmin());
 $email_from = $admin->add_slashes(SERVER_EMAIL);
 $use_captcha = $admin->add_slashes($_POST['use_captcha']);
 /*
@@ -84,6 +92,9 @@
 $success_email_subject = $admin->add_slashes($_POST['success_email_subject']);
 $success_email_subject = (($success_email_subject  != '') ? $success_email_subject : '');
 
+//print '<pre style="text-align: left;"><strong>function '.__FUNCTION__.'( '.''.' );</strong>  basename: '.basename(__FILE__).'  line: '.__LINE__.' -> <br />';
+//print_r( $_POST ); print '</pre>';
+
 if(!is_numeric($_POST['max_submissions'])) {
 	$max_submissions = 50;
 } else {
@@ -94,6 +105,11 @@
 } else {
 	$stored_submissions = $_POST['stored_submissions'];
 }
+if(!is_numeric($_POST['perpage_submissions'])) {
+	$perpage_submissions = 10;
+} else {
+	$perpage_submissions = $_POST['perpage_submissions'];
+}
 // Make sure max submissions is not greater than stored submissions if stored_submissions <>0
 if($max_submissions > $stored_submissions) {
 	$max_submissions = $stored_submissions;
@@ -117,6 +133,7 @@
 $sql .= '`success_email_subject` = \''.$success_email_subject.'\', ';
 $sql .= '`max_submissions` = \''.$max_submissions.'\', ';
 $sql .= '`stored_submissions` = \''.$stored_submissions.'\', ';
+$sql .= '`perpage_submissions` = \''.$perpage_submissions.'\', ';
 $sql .= '`use_captcha` = \''.$use_captcha.'\' ';
 $sql .= 'WHERE `section_id` = '.(int)$section_id.' ';
 $sql .= '';
Index: branches/2.8.x/wb/modules/form/languages/NL.php
===================================================================
--- branches/2.8.x/wb/modules/form/languages/NL.php	(revision 1713)
+++ branches/2.8.x/wb/modules/form/languages/NL.php	(revision 1714)
@@ -32,7 +32,9 @@
 $MOD_FORM['EMAIL_SUBJECT'] = 'Delivering a message from {{WEBSITE_TITLE}}';
 $MOD_FORM['SUCCESS_EMAIL_SUBJECT'] = 'You have submitted a message by {{WEBSITE_TITLE}}';
 
-$MOD_FORM['SUCCESS_EMAIL_TEXT'] = 'Thank you for sending your message to {{WEBSITE_TITLE}}';
+$MOD_FORM['SUCCESS_EMAIL_TEXT'] = 'Thank you for sending your message to {{WEBSITE_TITLE}}! ';
+$MOD_FORM['SUCCESS_EMAIL_TEXT'] .= 'We will be going to contact you as soon as possible';
+
 $MOD_FORM['SUCCESS_EMAIL_TEXT_GENERATED'] = "\n\n\n"
 ."****************************************************************************\n"
 ."This is an automatically generated e-mail. The sender\'s address of this e-mail\n"
@@ -40,11 +42,22 @@
 ."If you have received this e-mail by mistake, please contact us and delete this message\n"
 ."****************************************************************************\n";
 
+$MOD_FORM['REPLYTO'] = 'E-Mail reply to';
 $MOD_FORM['FROM'] = 'Sender';
 $MOD_FORM['TO'] = 'Recipient';
 
 $MOD_FORM['EXCESS_SUBMISSIONS'] = 'Sorry, this form has been submitted too many times so far this hour. Please retry in the next hour.';
 $MOD_FORM['INCORRECT_CAPTCHA'] = 'The verification number (also known as Captcha) that you entered is incorrect. If you are having problems reading the Captcha, please email to the <a href="mailto:{{webmaster_email}}">webmaster</a>';
+
+$MOD_FORM['PRINT']  = 'E-mail confirmation occurs only to valid e-mail address of the user announced in each case! Dispatch to unchecked addresses is not possible! ';
+$MOD_FORM['PRINT'] .= 'Please print this message!';
+
 $MOD_FORM['REQUIRED_FIELDS'] = 'You must enter details for the following fields';
 $MOD_FORM['RECIPIENT'] = 'E-mail confirmation occurs only to valid e-mail address of the user announced in each case! Dispatch to unchecked addresses is not possible!';
 $MOD_FORM['ERROR'] = 'E-Mail could not send!!';
+
+$TEXT['GUEST'] = 'Guest';
+$TEXT['PRINT_PAGE'] = 'Print page';
+$TEXT['REQUIRED_JS'] = 'Required Javascript';
+$TEXT['SUBMISSIONS_PERPAGE'] = 'Show submissions rows per page';
+$TEXT['UNKNOWN'] = 'Unknown';
Index: branches/2.8.x/wb/modules/form/languages/NO.php
===================================================================
--- branches/2.8.x/wb/modules/form/languages/NO.php	(revision 1713)
+++ branches/2.8.x/wb/modules/form/languages/NO.php	(revision 1714)
@@ -32,7 +32,9 @@
 $MOD_FORM['EMAIL_SUBJECT'] = 'Delivering a message from {{WEBSITE_TITLE}}';
 $MOD_FORM['SUCCESS_EMAIL_SUBJECT'] = 'You have submitted a message by {{WEBSITE_TITLE}}';
 
-$MOD_FORM['SUCCESS_EMAIL_TEXT'] = 'Thank you for sending your message to {{WEBSITE_TITLE}}';
+$MOD_FORM['SUCCESS_EMAIL_TEXT'] = 'Thank you for sending your message to {{WEBSITE_TITLE}}! ';
+$MOD_FORM['SUCCESS_EMAIL_TEXT'] .= 'We will be going to contact you as soon as possible';
+
 $MOD_FORM['SUCCESS_EMAIL_TEXT_GENERATED'] = "\n\n\n"
 ."****************************************************************************\n"
 ."This is an automatically generated e-mail. The sender\'s address of this e-mail\n"
@@ -40,11 +42,22 @@
 ."If you have received this e-mail by mistake, please contact us and delete this message\n"
 ."****************************************************************************\n";
 
+$MOD_FORM['REPLYTO'] = 'E-Mail reply to';
 $MOD_FORM['FROM'] = 'Sender';
 $MOD_FORM['TO'] = 'Recipient';
 
 $MOD_FORM['EXCESS_SUBMISSIONS'] = 'Sorry, this form has been submitted too many times so far this hour. Please retry in the next hour.';
 $MOD_FORM['INCORRECT_CAPTCHA'] = 'The verification number (also known as Captcha) that you entered is incorrect. If you are having problems reading the Captcha, please email to the <a href="mailto:{{webmaster_email}}">webmaster</a>';
+
+$MOD_FORM['PRINT']  = 'E-mail confirmation occurs only to valid e-mail address of the user announced in each case! Dispatch to unchecked addresses is not possible! ';
+$MOD_FORM['PRINT'] .= 'Please print this message!';
+
 $MOD_FORM['REQUIRED_FIELDS'] = 'You must enter details for the following fields';
 $MOD_FORM['RECIPIENT'] = 'E-mail confirmation occurs only to valid e-mail address of the user announced in each case! Dispatch to unchecked addresses is not possible!';
 $MOD_FORM['ERROR'] = 'E-Mail could not send!!';
+
+$TEXT['GUEST'] = 'Guest';
+$TEXT['PRINT_PAGE'] = 'Print page';
+$TEXT['REQUIRED_JS'] = 'Required Javascript';
+$TEXT['SUBMISSIONS_PERPAGE'] = 'Show submissions rows per page';
+$TEXT['UNKNOWN'] = 'Unknown';
Index: branches/2.8.x/wb/modules/form/languages/EN.php
===================================================================
--- branches/2.8.x/wb/modules/form/languages/EN.php	(revision 1713)
+++ branches/2.8.x/wb/modules/form/languages/EN.php	(revision 1714)
@@ -4,7 +4,7 @@
  * @category        module
  * @package         Form
  * @author          WebsiteBaker Project
- * @copyright       2009-2011, Website Baker Org. e.V.
+ * @copyright       2009-2012, WebsiteBaker Org. e.V.
  * @link			http://www.websitebaker2.org/
  * @license         http://www.gnu.org/licenses/gpl.html
  * @platform        WebsiteBaker 2.8.x
@@ -32,7 +32,9 @@
 $MOD_FORM['EMAIL_SUBJECT'] = 'Delivering a message from {{WEBSITE_TITLE}}';
 $MOD_FORM['SUCCESS_EMAIL_SUBJECT'] = 'You have submitted a message by {{WEBSITE_TITLE}}';
 
-$MOD_FORM['SUCCESS_EMAIL_TEXT'] = 'Thank you for sending your message to {{WEBSITE_TITLE}}';
+$MOD_FORM['SUCCESS_EMAIL_TEXT'] = 'Thank you for sending your message to {{WEBSITE_TITLE}}! ';
+$MOD_FORM['SUCCESS_EMAIL_TEXT'] .= 'We will be going to contact you as soon as possible';
+
 $MOD_FORM['SUCCESS_EMAIL_TEXT_GENERATED'] = "\n\n\n"
 ."****************************************************************************\n"
 ."This is an automatically generated e-mail. The sender\'s address of this e-mail\n"
@@ -40,11 +42,22 @@
 ."If you have received this e-mail by mistake, please contact us and delete this message\n"
 ."****************************************************************************\n";
 
+$MOD_FORM['REPLYTO'] = 'E-Mail reply to';
 $MOD_FORM['FROM'] = 'Sender';
 $MOD_FORM['TO'] = 'Recipient';
 
 $MOD_FORM['EXCESS_SUBMISSIONS'] = 'Sorry, this form has been submitted too many times so far this hour. Please retry in the next hour.';
 $MOD_FORM['INCORRECT_CAPTCHA'] = 'The verification number (also known as Captcha) that you entered is incorrect. If you are having problems reading the Captcha, please email to the <a href="mailto:{{webmaster_email}}">webmaster</a>';
+
+$MOD_FORM['PRINT']  = 'E-mail confirmation occurs only to valid e-mail address of the user announced in each case! Dispatch to unchecked addresses is not possible! ';
+$MOD_FORM['PRINT'] .= 'Please print this message!';
+
 $MOD_FORM['REQUIRED_FIELDS'] = 'You must enter details for the following fields';
 $MOD_FORM['RECIPIENT'] = 'E-mail confirmation occurs only to valid e-mail address of the user announced in each case! Dispatch to unchecked addresses is not possible!';
 $MOD_FORM['ERROR'] = 'E-Mail could not send!!';
+
+$TEXT['GUEST'] = 'Guest';
+$TEXT['PRINT_PAGE'] = 'Print page';
+$TEXT['REQUIRED_JS'] = 'Required Javascript';
+$TEXT['SUBMISSIONS_PERPAGE'] = 'Show submissions rows per page';
+$TEXT['UNKNOWN'] = 'Unknown';
Index: branches/2.8.x/wb/modules/form/languages/DA.php
===================================================================
--- branches/2.8.x/wb/modules/form/languages/DA.php	(revision 1713)
+++ branches/2.8.x/wb/modules/form/languages/DA.php	(revision 1714)
@@ -32,7 +32,9 @@
 $MOD_FORM['EMAIL_SUBJECT'] = 'Delivering a message from {{WEBSITE_TITLE}}';
 $MOD_FORM['SUCCESS_EMAIL_SUBJECT'] = 'You have submitted a message by {{WEBSITE_TITLE}}';
 
-$MOD_FORM['SUCCESS_EMAIL_TEXT'] = 'Thank you for sending your message to {{WEBSITE_TITLE}}';
+$MOD_FORM['SUCCESS_EMAIL_TEXT'] = 'Thank you for sending your message to {{WEBSITE_TITLE}}! ';
+$MOD_FORM['SUCCESS_EMAIL_TEXT'] .= 'We will be going to contact you as soon as possible';
+
 $MOD_FORM['SUCCESS_EMAIL_TEXT_GENERATED'] = "\n\n\n"
 ."****************************************************************************\n"
 ."This is an automatically generated e-mail. The sender\'s address of this e-mail\n"
@@ -40,11 +42,22 @@
 ."If you have received this e-mail by mistake, please contact us and delete this message\n"
 ."****************************************************************************\n";
 
+$MOD_FORM['REPLYTO'] = 'E-Mail reply to';
 $MOD_FORM['FROM'] = 'Sender';
 $MOD_FORM['TO'] = 'Recipient';
 
 $MOD_FORM['EXCESS_SUBMISSIONS'] = 'Sorry, this form has been submitted too many times so far this hour. Please retry in the next hour.';
 $MOD_FORM['INCORRECT_CAPTCHA'] = 'The verification number (also known as Captcha) that you entered is incorrect. If you are having problems reading the Captcha, please email to the <a href="mailto:{{webmaster_email}}">webmaster</a>';
+
+$MOD_FORM['PRINT']  = 'E-mail confirmation occurs only to valid e-mail address of the user announced in each case! Dispatch to unchecked addresses is not possible! ';
+$MOD_FORM['PRINT'] .= 'Please print this message!';
+
 $MOD_FORM['REQUIRED_FIELDS'] = 'You must enter details for the following fields';
 $MOD_FORM['RECIPIENT'] = 'E-mail confirmation occurs only to valid e-mail address of the user announced in each case! Dispatch to unchecked addresses is not possible!';
 $MOD_FORM['ERROR'] = 'E-Mail could not send!!';
+
+$TEXT['GUEST'] = 'Guest';
+$TEXT['PRINT_PAGE'] = 'Print page';
+$TEXT['REQUIRED_JS'] = 'Required Javascript';
+$TEXT['SUBMISSIONS_PERPAGE'] = 'Show submissions rows per page';
+$TEXT['UNKNOWN'] = 'Unknown';
Index: branches/2.8.x/wb/modules/form/languages/RU.php
===================================================================
--- branches/2.8.x/wb/modules/form/languages/RU.php	(revision 1713)
+++ branches/2.8.x/wb/modules/form/languages/RU.php	(revision 1714)
@@ -23,7 +23,6 @@
 /* -------------------------------------------------------- */
 
 //Modul Description
-$module_description = '&#1052;&#1086;&#1076;&#1091;&#1083;&#1100; &#1087;&#1086;&#1079;&#1074;&#1086;&#1083;&#1103;&#1077;&#1090; &#1089;&#1086;&#1079;&#1076;&#1072;&#1074;&#1072;&#1090;&#1100; &#1088;&#1072;&#1079;&#1083;&#1080;&#1095;&#1085;&#1099;&#1077; &#1085;&#1072;&#1089;&#1090;&#1088;&#1072;&#1080;&#1074;&#1072;&#1077;&#1084;&#1099;&#1077; &#1092;&#1086;&#1088;&#1084;&#1099;, &#1085;&#1072;&#1087;&#1088;&#1080;&#1084;&#1077;&#1088; &#1092;&#1086;&#1088;&#1084;&#1099; &#1086;&#1073;&#1088;&#1072;&#1090;&#1085;&#1086;&#1081; &#1089;&#1074;&#1103;&#1079;&#1080;. Rudolph Lartey &#1087;&#1086;&#1084;&#1086;&#1075; &#1091;&#1083;&#1091;&#1095;&#1096;&#1080;&#1090;&#1100; &#1076;&#1072;&#1085;&#1085;&#1099;&#1081; &#1084;&#1086;&#1076;&#1091;&#1083;&#1100;.';
 
 //Variables for the  backend
 $MOD_FORM['SETTINGS'] = 'Form Settings';
@@ -32,7 +31,9 @@
 $MOD_FORM['EMAIL_SUBJECT'] = 'Delivering a message from {{WEBSITE_TITLE}}';
 $MOD_FORM['SUCCESS_EMAIL_SUBJECT'] = 'You have submitted a message by {{WEBSITE_TITLE}}';
 
-$MOD_FORM['SUCCESS_EMAIL_TEXT'] = 'Thank you for sending your message to {{WEBSITE_TITLE}}';
+$MOD_FORM['SUCCESS_EMAIL_TEXT'] = 'Thank you for sending your message to {{WEBSITE_TITLE}}! ';
+$MOD_FORM['SUCCESS_EMAIL_TEXT'] .= 'We will be going to contact you as soon as possible';
+
 $MOD_FORM['SUCCESS_EMAIL_TEXT_GENERATED'] = "\n\n\n"
 ."****************************************************************************\n"
 ."This is an automatically generated e-mail. The sender\'s address of this e-mail\n"
@@ -40,11 +41,22 @@
 ."If you have received this e-mail by mistake, please contact us and delete this message\n"
 ."****************************************************************************\n";
 
+$MOD_FORM['REPLYTO'] = 'E-Mail reply to';
 $MOD_FORM['FROM'] = 'Sender';
 $MOD_FORM['TO'] = 'Recipient';
 
 $MOD_FORM['EXCESS_SUBMISSIONS'] = 'Sorry, this form has been submitted too many times so far this hour. Please retry in the next hour.';
 $MOD_FORM['INCORRECT_CAPTCHA'] = 'The verification number (also known as Captcha) that you entered is incorrect. If you are having problems reading the Captcha, please email to the <a href="mailto:{{webmaster_email}}">webmaster</a>';
+
+$MOD_FORM['PRINT']  = 'E-mail confirmation occurs only to valid e-mail address of the user announced in each case! Dispatch to unchecked addresses is not possible! ';
+$MOD_FORM['PRINT'] .= 'Please print this message!';
+
 $MOD_FORM['REQUIRED_FIELDS'] = 'You must enter details for the following fields';
 $MOD_FORM['RECIPIENT'] = 'E-mail confirmation occurs only to valid e-mail address of the user announced in each case! Dispatch to unchecked addresses is not possible!';
 $MOD_FORM['ERROR'] = 'E-Mail could not send!!';
+
+$TEXT['GUEST'] = 'Guest';
+$TEXT['PRINT_PAGE'] = 'Print page';
+$TEXT['REQUIRED_JS'] = 'Required Javascript';
+$TEXT['SUBMISSIONS_PERPAGE'] = 'Show submissions rows per page';
+$TEXT['UNKNOWN'] = 'Unknown';
Index: branches/2.8.x/wb/modules/form/languages/FR.php
===================================================================
--- branches/2.8.x/wb/modules/form/languages/FR.php	(revision 1713)
+++ branches/2.8.x/wb/modules/form/languages/FR.php	(revision 1714)
@@ -4,7 +4,7 @@
  * @category        module
  * @package         Form
  * @author          WebsiteBaker Project
- * @copyright       2009-2011, Website Baker Org. e.V.
+ * @copyright       2009-2012, WebsiteBaker Org. e.V.
  * @link			http://www.websitebaker2.org/
  * @license         http://www.gnu.org/licenses/gpl.html
  * @platform        WebsiteBaker 2.8.x
@@ -32,7 +32,9 @@
 $MOD_FORM['EMAIL_SUBJECT'] = 'Delivering a message from {{WEBSITE_TITLE}}';
 $MOD_FORM['SUCCESS_EMAIL_SUBJECT'] = 'You have submitted a message by {{WEBSITE_TITLE}}';
 
-$MOD_FORM['SUCCESS_EMAIL_TEXT'] = 'Thank you for sending your message to {{WEBSITE_TITLE}}';
+$MOD_FORM['SUCCESS_EMAIL_TEXT'] = 'Thank you for sending your message to {{WEBSITE_TITLE}}! ';
+$MOD_FORM['SUCCESS_EMAIL_TEXT'] .= 'We will be going to contact you as soon as possible';
+
 $MOD_FORM['SUCCESS_EMAIL_TEXT_GENERATED'] = "\n\n\n"
 ."****************************************************************************\n"
 ."This is an automatically generated e-mail. The sender\'s address of this e-mail\n"
@@ -40,11 +42,22 @@
 ."If you have received this e-mail by mistake, please contact us and delete this message\n"
 ."****************************************************************************\n";
 
+$MOD_FORM['REPLYTO'] = 'E-Mail reply to';
 $MOD_FORM['FROM'] = 'Sender';
 $MOD_FORM['TO'] = 'Recipient';
 
 $MOD_FORM['EXCESS_SUBMISSIONS'] = 'Sorry, this form has been submitted too many times so far this hour. Please retry in the next hour.';
 $MOD_FORM['INCORRECT_CAPTCHA'] = 'The verification number (also known as Captcha) that you entered is incorrect. If you are having problems reading the Captcha, please email to the <a href="mailto:{{webmaster_email}}">webmaster</a>';
+
+$MOD_FORM['PRINT']  = 'E-mail confirmation occurs only to valid e-mail address of the user announced in each case! Dispatch to unchecked addresses is not possible! ';
+$MOD_FORM['PRINT'] .= 'Please print this message!';
+
 $MOD_FORM['REQUIRED_FIELDS'] = 'You must enter details for the following fields';
 $MOD_FORM['RECIPIENT'] = 'E-mail confirmation occurs only to valid e-mail address of the user announced in each case! Dispatch to unchecked addresses is not possible!';
 $MOD_FORM['ERROR'] = 'E-Mail could not send!!';
+
+$TEXT['GUEST'] = 'Guest';
+$TEXT['PRINT_PAGE'] = 'Print page';
+$TEXT['REQUIRED_JS'] = 'Required Javascript';
+$TEXT['SUBMISSIONS_PERPAGE'] = 'Show submissions rows per page';
+$TEXT['UNKNOWN'] = 'Unknown';
Index: branches/2.8.x/wb/modules/form/languages/DE.php
===================================================================
--- branches/2.8.x/wb/modules/form/languages/DE.php	(revision 1713)
+++ branches/2.8.x/wb/modules/form/languages/DE.php	(revision 1714)
@@ -4,7 +4,7 @@
  * @category        module
  * @package         Form
  * @author          WebsiteBaker Project
- * @copyright       2009-2011, Website Baker Org. e.V.
+ * @copyright       2009-2012, WebsiteBaker Org. e.V.
  * @link			http://www.websitebaker2.org/
  * @license         http://www.gnu.org/licenses/gpl.html
  * @platform        WebsiteBaker 2.8.x
@@ -32,20 +32,34 @@
 $MOD_FORM['EMAIL_SUBJECT'] = 'Sie haben eine Nachricht über {{WEBSITE_TITLE}} erhalten';
 $MOD_FORM['SUCCESS_EMAIL_SUBJECT'] = 'Sie haben ein Forumlar über {{WEBSITE_TITLE}} gesendet';
 
-$MOD_FORM['SUCCESS_EMAIL_TEXT'] = 'Vielen Dank f&uuml;r die &Uuml;bermittlung Ihrer Nachricht an {{WEBSITE_TITLE}}';
+$MOD_FORM['SUCCESS_EMAIL_TEXT']  = 'Vielen Dank f&uuml;r die &Uuml;bermittlung Ihrer Nachricht an {{WEBSITE_TITLE}} ';
+$MOD_FORM['SUCCESS_EMAIL_TEXT'] .= 'Wir setzen uns schnellstens mit Ihnen in Verbindung';
+
 $MOD_FORM['SUCCESS_EMAIL_TEXT_GENERATED'] = "\n\n\n"
 ."**************************************************************\n"
 ."Dies ist eine automatisch generierte E-Mail. Die Absenderadresse dieser E-Mail\n"
 ."ist nur zum Versand, und nicht zum Empfang von Nachrichten eingerichtet!\n"
 ."Falls Sie diese E-Mail versehentlich erhalten haben, setzen Sie sich bitte\n"
-."mit uns in Verbindung und l&ouml;schen diese Nachricht von Ihrem Computer.\n"
+."mit uns in Verbindung und löschen diese Nachricht von Ihrem Computer.\n"
 ."**************************************************************\n";
 
+$MOD_FORM['REPLYTO'] = 'E-Mail beantworten';
 $MOD_FORM['FROM'] = 'Absender';
 $MOD_FORM['TO'] = 'Empf&auml;nger';
 
 $MOD_FORM['EXCESS_SUBMISSIONS'] = 'Dieses Formular wurde zu oft aufgerufen. Bitte versuchen Sie es in einer Stunde noch einmal.';
+$MOD_FORM['ERROR'] = 'E-Mail konnte nicht gesendet werden!!';
 $MOD_FORM['INCORRECT_CAPTCHA'] = 'Die eingegebene Pr&uuml;fziffer stimmt nicht &uuml;berein. Wenn Sie Probleme mit dem Lesen der Pr&uuml;fziffer haben, bitte schreiben Sie eine E-Mail an den <a href="mailto:{{webmaster_email}}">Webmaster</a>';
+
+$MOD_FORM['PRINT']  = 'E-Mail Best&auml;tigung erfolgt nur an die g&uuml;ltige E-Mail Adresse eines jeweils angemeldeten Benutzers! Versand an ungepr&uuml;fte Adressen ist nicht m&ouml;glich! ';
+$MOD_FORM['PRINT'] .= 'Drucken Sie bitte diese Nachricht aus!';
+
 $MOD_FORM['REQUIRED_FIELDS'] = 'Bitte folgende Angaben erg&auml;nzen';
-$MOD_FORM['RECIPIENT'] = 'E-Mail Best&auml;tigung erfolgt nur an die g&uuml;ltige E-Mail Adresse des jeweils angemeldeten Benutzers! Versand an ungepr&uuml;fte Adressen ist nicht m&ouml;glich! ';
-$MOD_FORM['ERROR'] = 'E-Mail konnte nicht gesendet werden!!';
+$MOD_FORM['RECIPIENT'] = 'E-Mail Best&auml;tigung erfolgt nur an die g&uuml;ltige E-Mail Adresse des jeweils angemeldeten Benutzers! Versand an ungepr&uuml;fte Adressen ist nicht m&ouml;glich!';
+$MOD_FORM['SPAM'] = 'ACHTUNG! Beantworten einer ungeprüften E-Mail kann als Spam abgemahnt werden! ';
+
+$TEXT['GUEST'] = 'Gast';
+$TEXT['PRINT_PAGE'] = 'Seite drucken';
+$TEXT['REQUIRED_JS'] = 'Javascript erforderlich';
+$TEXT['SUBMISSIONS_PERPAGE'] = 'Anzeige gespeicherte Einträge pro Seite';
+$TEXT['UNKNOWN'] = 'Unbekannt';
Index: branches/2.8.x/wb/modules/form/frontend.css
===================================================================
--- branches/2.8.x/wb/modules/form/frontend.css	(revision 1713)
+++ branches/2.8.x/wb/modules/form/frontend.css	(revision 1714)
@@ -10,5 +10,11 @@
 .frm-radio_label { font-size :11px; cursor :pointer; }
 .frm-email { font-size :12px; width : 90%; }
 /*** Don't remove the class nixhier, this is required for ASP ***/
+.nixhier,
 .frm-nixhier { display :none; }
-.frm-submission { margin :0 auto; position :relative; width :auto; }		
\ No newline at end of file
+.frm-submission { margin :0 auto; position :relative; width :auto; }
+.print-email { font-size :0.8em; color :#000; margin :10px auto; }	
+.frm-warning { background :#ffeeee; border :0.2em #884444 solid; color :#e10000; margin-bottom :1em; padding :0.8em; font-size :1.2em; font-weight :bold; }
+.frm-note { background :#eeffee; border :0.2em #448844 solid; color :#004400; margin-bottom :1em; padding :0.8em; font-size :1.2em; font-weight :bold; }
+.previewPrintTop { text-align :right; font-size :0.9em; }
+.previewPrintTop img { padding-left :16px; }
\ No newline at end of file
Index: branches/2.8.x/wb/modules/form/DiggPagination.php
===================================================================
--- branches/2.8.x/wb/modules/form/DiggPagination.php	(nonexistent)
+++ branches/2.8.x/wb/modules/form/DiggPagination.php	(revision 1714)
@@ -0,0 +1,130 @@
+<?php
+
+class m_form_DiggPagination
+{
+
+/**
+ * Builds & returns a variable containing the HTML code to display pagination links based on given params
+ *
+ * @param int $page - the current page
+ * @param int $totalitems - the number of items to paginate (not total number of pages)
+ * @param int $limit - the number of items per page
+ * @param int $adjacents - the number of page links to put adjacent to the current page
+ * @param string $targetpage - URL to the web page requiring pagination links
+ * @param string $pagestring - the URL params to pass the new page value e.g. page/ (the number is inserted at the end of the string)
+ * @param string $cssClass - the class of the containing DIV tag for the returned pagination
+ * @return void
+ * @author Stranger Studios, adapted by Rich Milns
+ * @see http://www.strangerstudios.com/sandbox/pagination/diggstyle.php
+ */
+  static public function Pager( $page = 1, $totalitems, $limit = 15, $adjacents = 1, $targetpage = null,
+    $pagestring = "?page=", $cssClass = 'pagination')
+  {
+    $script_name = $_SERVER['SCRIPT_NAME'];
+    $query_string = '&amp;' . preg_replace( "/page=[0-9]{0,10}&/", "", $_SERVER['QUERY_STRING']) . '#submissions';
+    //$query_string = $_SERVER['QUERY_STRING'];
+
+    //defaults
+    if ( !$adjacents) { $adjacents = 1; }
+    if ( !$limit) { $limit = 15; }
+    if ( !$page) { $page = 1; }
+    if ( !$targetpage) { $targetpage = $script_name; }
+    if ( !isset( $margin)) { $margin = 5; }
+    if ( !isset( $padding)) { $padding = 1; }
+    //other vars
+    $prev = $page - 1; //previous page is page - 1
+    $next = $page + 1; //next page is page + 1
+    $lastpage = ceil( $totalitems / $limit); //lastpage is = total items / items per page, rounded up.
+    $lpm1 = $lastpage - 1; //last page minus 1
+
+    /*
+    Now we apply our rules and draw the pagination object.
+    We're actually saving the code to a variable in case we want to draw it more than once.
+    */
+    $pagination = "";
+    if ( $lastpage > 1) {
+      $pagination .= "<div class=\"" . $cssClass . "\"";
+      if ( $margin || $padding) {
+        $pagination .= " style=\"";
+        if ( $margin) { $pagination .= "margin: $margin;"; }
+        if ( $padding) { $pagination .= "padding: $padding;"; }
+        $pagination .= "\"";
+      }
+      $pagination .= ">";
+
+      //previous button
+      if ( $page > 1) {
+        $pagination .= "<a href=\"$targetpage$pagestring$prev$query_string\">« prev</a>";
+      } else {
+        $pagination .= "<span class=\"disabled\">« prev</span>";
+      }
+
+      //pages
+      if ( $lastpage < ( $adjacents * 2) + 7) //not enough pages to bother breaking it up
+        {
+        for ( $counter = 1; $counter <= $lastpage; $counter++) {
+          if ( $counter == $page) {
+            $pagination .= "<span class=\"current\">$counter</span>";
+          } else {
+            $pagination .= "<a href=\"" . $targetpage . $pagestring . $counter . $query_string . "\">$counter</a>";
+          }
+        }
+      } elseif ( $lastpage >= ( $adjacents * 2) + 7) //enough pages to hide some
+      {
+        //close to beginning; only hide later pages
+        if ( $page < 1 + ( $adjacents * 3)) {
+          for ( $counter = 1; $counter < 4 + ( $adjacents * 2); $counter++) {
+            if ( $counter == $page) {
+              $pagination .= "<span class=\"current\">$counter</span>";
+            } else {
+              $pagination .= "<a href=\"" . $targetpage . $pagestring . $counter . $query_string . "\">$counter</a>";
+            }
+          }
+          $pagination .= "<span class=\"elipses\">...</span>";
+          $pagination .= "<a href=\"" . $targetpage . $pagestring . $lpm1 . $query_string . "\">$lpm1</a>";
+          $pagination .= "<a href=\"" . $targetpage . $pagestring . $lastpage . $query_string . "\">$lastpage</a>";
+        }
+        //in middle; hide some front and some back
+        elseif ( $lastpage - ( $adjacents * 2) > $page && $page > ( $adjacents * 2)) {
+          $pagination .= "<a href=\"" . $targetpage . $pagestring . "1$query_string\">1</a>";
+          $pagination .= "<a href=\"" . $targetpage . $pagestring . "2$query_string\">2</a>";
+          $pagination .= "<span class=\"elipses\">...</span>";
+          for ( $counter = $page - $adjacents; $counter <= $page + $adjacents; $counter++) {
+            if ( $counter == $page) {
+              $pagination .= "<span class=\"current\">$counter</span>";
+            } else {
+              $pagination .= "<a href=\"" . $targetpage . $pagestring . $counter . $query_string . "\">$counter</a>";
+            }
+          }
+          $pagination .= "...";
+          $pagination .= "<a href=\"" . $targetpage . $pagestring . $lpm1 . $query_string . "\">$lpm1</a>";
+          $pagination .= "<a href=\"" . $targetpage . $pagestring . $lastpage . $query_string . "\">$lastpage</a>";
+        }
+        //close to end; only hide early pages
+        else {
+          $pagination .= "<a href=\"" . $targetpage . $pagestring . "1$query_string\">1</a>";
+          $pagination .= "<a href=\"" . $targetpage . $pagestring . "2$query_string\">2</a>";
+          $pagination .= "<span class=\"elipses\">...</span>";
+          for ( $counter = $lastpage - ( 1 + ( $adjacents * 3)); $counter <= $lastpage; $counter++) {
+            if ( $counter == $page) {
+              $pagination .= "<span class=\"current\">$counter</span>";
+            } else {
+              $pagination .= "<a href=\"" . $targetpage . $pagestring . $counter . $query_string . "\">$counter</a>";
+            }
+          }
+        }
+      }
+
+      //next button
+      if ( $page < $lastpage - 0) {
+        $pagination .= "<a href=\"" . $targetpage . $pagestring . $next . $query_string . "\">next »</a>";
+      } else {
+        $pagination .= "<span class=\"disabled\">next »</span>";
+      }
+      $pagination .= "</div>\n";
+    }
+
+    return $pagination;
+
+  }
+}

Property changes on: branches/2.8.x/wb/modules/form/DiggPagination.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id Revision HeadURL
\ 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 1713)
+++ branches/2.8.x/wb/modules/form/view_submission.php	(revision 1714)
@@ -3,9 +3,8 @@
  *
  * @category        module
  * @package         Form
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
- * @copyright       2009-2011, Website Baker Org. e.V.
+ * @author          Ryan Djurovich, WebsiteBaker Project
+ * @copyright       2009-2012, WebsiteBaker Org. e.V.
  * @link			http://www.websitebaker2.org/
  * @license         http://www.gnu.org/licenses/gpl.html
  * @platform        WebsiteBaker 2.8.x
@@ -13,7 +12,7 @@
  * @version         $Id$
  * @filesource		$HeadURL$
  * @lastmodified    $Date$
- * @description     
+ * @description
  */
 
 require('../../config.php');
@@ -22,18 +21,27 @@
 require(WB_PATH.'/modules/admin.php');
 /* */
 include_once (WB_PATH.'/framework/functions.php');
+// Get page
+$requestMethod = '_'.strtoupper($_SERVER['REQUEST_METHOD']);
+$page = intval(isset(${$requestMethod}['page'])) ? ${$requestMethod}['page'] : 1;
+
 // Get id
 $submission_id = intval($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);
+ $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL.'/pages/modify.php?page='.$page.'&amp;page_id='.$page_id.'#submissions');
 }
 
 // Get submission details
 $sql  = 'SELECT * FROM `'.TABLE_PREFIX.'mod_form_submissions` ';
-$sql .= 'WHERE submission_id = '.$submission_id.' ';
+$sql .= 'WHERE `submission_id` = '.$submission_id.' ';
 if($query_content = $database->query($sql)) {
+
 	$submission = $query_content->fetchRow(MYSQL_ASSOC);
 }
+
+//print '<pre style="text-align: left;"><strong>function '.__FUNCTION__.'( '.''.' );</strong>  basename: '.basename(__FILE__).'  line: '.__LINE__.' -> <br />';
+//print_r( $page ); print '</pre>';
+
 // Get the user details of whoever did this submission
 $sql  = 'SELECT `username`,`display_name` FROM `'.TABLE_PREFIX.'users` ';
 $sql .= 'WHERE `user_id` = '.$submission['submitted_by'];
@@ -45,7 +53,8 @@
 		$user['username'] = 'unknown';
 	}
 }
-$sec_anchor = (defined( 'SEC_ANCHOR' ) && ( SEC_ANCHOR != '' )  ? '#'.SEC_ANCHOR.$section['section_id'] : '' );
+//$sec_anchor = (defined( 'SEC_ANCHOR' ) && ( SEC_ANCHOR != '' )  ? '#'.SEC_ANCHOR.$section['section_id'] : '' );
+$sec_anchor = '#submissions';
 ?>
 <table class="frm-submission" summary="" cellpadding="0" cellspacing="0" border="0">
 <tr>
@@ -74,8 +83,8 @@
 
 <br />
 
-<input type="button" value="<?php echo $TEXT['CLOSE']; ?>" onclick="javascript: window.location = '<?php echo ADMIN_URL; ?>/pages/modify.php?page_id=<?php echo $page_id.$sec_anchor; ?>';" style="width: 150px; margin-top: 5px;" />
-<input type="button" value="<?php echo $TEXT['DELETE']; ?>" onclick="javascript: confirm_link('<?php echo $TEXT['ARE_YOU_SURE']; ?>', '<?php echo WB_URL; ?>/modules/form/delete_submission.php?page_id=<?php echo $page_id; ?>&section_id=<?php echo $section_id; ?>&submission_id=<?php echo $admin->getIDKEY($submission_id); ?>');" style="width: 150px; margin-top: 5px;" />
+<input type="button" value="<?php echo $TEXT['CLOSE']; ?>" onclick="javascript: window.location = '<?php echo ADMIN_URL; ?>/pages/modify.php?page=<?php echo $page?>&amp;page_id=<?php echo $page_id.$sec_anchor; ?>';" style="width: 150px; margin-top: 5px;" />
+<input type="button" value="<?php echo $TEXT['DELETE']; ?>" onclick="javascript: confirm_link('<?php echo $TEXT['ARE_YOU_SURE']; ?>', '<?php echo WB_URL; ?>/modules/form/delete_submission.php?page_id=<?php echo $page_id; ?>&section_id=<?php echo $section_id; ?>&submission_id=<?php echo $admin->getIDKEY($submission_id).$sec_anchor; ?>');" style="width: 150px; margin-top: 5px;" />
 <?php
 
 // Print admin footer
Index: branches/2.8.x/wb/modules/form/modify.php
===================================================================
--- branches/2.8.x/wb/modules/form/modify.php	(revision 1713)
+++ branches/2.8.x/wb/modules/form/modify.php	(revision 1714)
@@ -4,7 +4,7 @@
  * @category        module
  * @package         Form
  * @author          WebsiteBaker Project
- * @copyright       2009-2011, Website Baker Org. e.V.
+ * @copyright       2009-2012, WebsiteBaker Org. e.V.
  * @link			http://www.websitebaker2.org/
  * @license         http://www.gnu.org/licenses/gpl.html
  * @platform        WebsiteBaker 2.8.x
@@ -12,7 +12,7 @@
  * @version         $Id$
  * @filesource		$HeadURL$
  * @lastmodified    $Date$
- * @description     
+ * @description
  */
 
 // Must include code to stop this file being access directly
@@ -20,7 +20,7 @@
 if(defined('WB_PATH') == false)
 {
 	// Stop this file being access directly
-		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>');
+		die('<h2 style="color:red;margin:3em auto;text-align:center;">Cannot access this file directly</h2>');
 }
 /* -------------------------------------------------------- */
 
@@ -46,6 +46,7 @@
 // error msg
 }
 
+
 ?>
 <table summary="" width="100%" cellpadding="0" cellspacing="0" border="0">
 <tr>
@@ -164,7 +165,7 @@
 <?php
 				$url = (WB_URL.'/modules/form/delete_field.php?page_id='.$page_id.'&amp;section_id='.$section_id.'&amp;field_id='.$admin->getIDKEY($field['field_id']))
 ?>
-					<a href="javascript: confirm_link('<?php echo url_encode($TEXT['ARE_YOU_SURE']); ?>', '<?php echo $url; ?>');" title="<?php echo $TEXT['DELETE']; ?>">
+					<a href="javascript:confirm_link('<?php echo url_encode($TEXT['ARE_YOU_SURE']); ?>','<?php echo $url; ?>');" title="<?php echo $TEXT['DELETE']; ?>">
 						<img src="<?php echo THEME_URL; ?>/images/delete_16.png" border="0" alt="X" />
 					</a>
 				</td>
@@ -185,49 +186,74 @@
 		echo $TEXT['NONE_FOUND'];
 	}
 }
-?>
+// Query overview submissions table
+/*
+*/
+$sql  = 'SELECT `perpage_submissions` FROM `'.TABLE_PREFIX.'mod_form_settings`  ';
+$sql .= 'WHERE `section_id` = '.(int)$section_id.' ';
+//$sql .= 'ORDER BY `submitted_when` ASC ';
+$limit = $database->get_one($sql);
 
-<br /><br />
+$page = 1;
+if(isset($_GET['page']) && is_numeric(trim($_GET['page'])))
+{
+	$page = intval(mysql_real_escape_string($_GET['page']));
+}
 
-<h2><?php echo $TEXT['SUBMISSIONS']; ?></h2>
+// How many adjacent pages should be shown on each side?
+$adjacents = 1;
 
-<?php
-// Query submissions table
-/*
-$sql  = 'SELECT * FROM `'.TABLE_PREFIX.'mod_form_submissions`  ';
-$sql .= 'WHERE `section_id` = '.(int)$section_id.' ';
-$sql .= 'ORDER BY `submitted_when` ASC ';
-*/
+$startrow = ($page * $limit) - ($limit);
+
 $sql  = 'SELECT s.*, u.`display_name`, u.`email` ';
 $sql .=            'FROM `'.TABLE_PREFIX.'mod_form_submissions` s ';
 $sql .= 'LEFT OUTER JOIN `'.TABLE_PREFIX.'users` u ';
 $sql .= 'ON u.`user_id` = s.`submitted_by` ';
 $sql .= 'WHERE s.`section_id` = '.(int)$section_id.' ';
-$sql .= 'ORDER BY s.`submitted_when` ASC ';
+$sql .= 'ORDER BY s.`submitted_when` DESC ';
+//$sql .= "LIMIT $startrow,$limit ";
 
 if($query_submissions = $database->query($sql)) {
-?>
-<!-- submissions -->
-		<table summary="" width="100%" cellpadding="2" cellspacing="0" border="0" class="" id="frm-ScrollTable" >
-		<thead>
-		<tr style="background-color: #dddddd; font-weight: bold;">
-			<th width="23" style="text-align: center;">&nbsp;</th>
-			<th width="33" style="text-align: right;"> ID </th>
-			<th width="200" style="padding-left: 10px;"><?php echo $TEXT['SUBMITTED'] ?></th>
-			<th width="200" style="padding-left: 10px;"><?php echo $TEXT['USER']; ?></th>
-			<th width="350"><?php echo $TEXT['EMAIL'].' '.$MOD_FORM['FROM'] ?></th>
-			<th width="20">&nbsp;</th>
-			<th width="20">&nbsp;</th>
-			<th width="20">&nbsp;</th>
-			<th width="20">&nbsp;</th>
-		</tr>
-		</thead>
-		<tbody>
-<?php
+    $totalrows = $query_submissions->numRows();
+
+// set template file and assign module and template block
+	$oTpl = new Template(dirname(__FILE__).'/htt','keep');
+	$oTpl->set_file('page', 'OverviewSubmission.htt');
+	$oTpl->debug = false; // false, true
+	$oTpl->set_block('page', 'main_block', 'main');
+// generell vars
+	$oTpl->set_var(array(
+		'TEXT_SUBMISSIONS' => $TEXT['SUBMISSIONS'],
+		'WB_URL' => WB_URL,
+		'THEME_URL' => THEME_URL,
+		'MESSAGE_VALUE' => '',
+		'PAGINATION' => '',
+		'PAGE_ID' => $page_id,
+		'SECTION_ID' => $section_id,
+		'TEXT_SUBMITTED' => $TEXT['SUBMITTED'],
+		'TEXT_USER' => $TEXT['USER'],
+		'TEXT_EMAIL' => $TEXT['EMAIL'],
+		'MOD_FORM_FROM' => $MOD_FORM['FROM'],
+		'TEXT_NONE_FOUND' => '',
+		)
+	);
+
+	$oTpl->set_block('main_block', 'language_list_block', 'language_list');
 	if($query_submissions->numRows() > 0) {
+//print '<pre style="text-align: left;"><strong>function '.__FUNCTION__.'( '.''.' );</strong>  basename: '.basename(__FILE__).'  line: '.__LINE__.' -> <br />';
+//print_r( $_SERVER ); print '</pre>'; // flush ();sleep(10); die();
+		if($startrow > 0  ){
+			$query_submissions->seekRow($startrow);
+		} else {
+			$query_submissions->rewind();
+		}
 		// List submissions
+        $currentrow = 0;
 		$row = 'a';
-		while($submission = $query_submissions->fetchRow(MYSQL_ASSOC)) {
+    	$oTpl->set_block('main_block', 'loop_submmission_block', 'loop_submmission');
+		while($submission = $query_submissions->fetchRow(MYSQL_ASSOC) )
+        {
+			$currentrow++;
 	        $submission['display_name'] = (($submission['display_name']!=null) ? $submission['display_name'] : '');
 			$sBody = $submission['body'];
 			$regex = "/[a-z0-9\-_]?[a-z0-9.\-_]+[a-z0-9\-_]?@[a-z0-9.-]+\.[a-z]{2,}/iU";
@@ -234,60 +260,45 @@
 			preg_match ($regex, $sBody, $output);
 // workout if output is empty
 			$submission['email'] = (isset($output['0']) ? $output['0'] : '');
-?>
-			<tr class="row_<?php echo $row; ?>">
-				<td width="20" style="padding-left: 5px;text-align: center;">
-					<a href="<?php echo WB_URL; ?>/modules/form/view_submission.php?page_id=<?php echo $page_id; ?>&amp;section_id=<?php echo $section_id; ?>&amp;submission_id=<?php echo $admin->getIDKEY($submission['submission_id']); ?>" title="<?php echo $TEXT['OPEN']; ?>">
-						<img src="<?php echo THEME_URL; ?>/images/folder_16.png" alt="<?php echo $TEXT['OPEN']; ?>" border="0" />
-					</a>
-				</td>
-				<td width="30" style="padding-right: 5px;text-align: right;"><?php echo $submission['submission_id']; ?></td>
-				<td width="200" style="padding-left: 10px;"><?php echo gmdate(DATE_FORMAT.', '.TIME_FORMAT, $submission['submitted_when']+TIMEZONE ); ?></td>
-				<td width="200" style="padding-left: 10px;"><?php echo $submission['display_name']; ?></td>
-				<td width="350"><?php echo $submission['email']; ?></td>
-				<td width="20" style="text-align: center;">&nbsp;</td>
-				<td width="20">&nbsp;</td>
-				<td width="20" style="text-align: center;">
-<?php
-				$url = (WB_URL.'/modules/form/delete_submission.php?page_id='.$page_id.'&amp;section_id='.$section_id.'&amp;submission_id='.$admin->getIDKEY($submission['submission_id']))
-?>
-					<a href="javascript: confirm_link('<?php echo url_encode($TEXT['ARE_YOU_SURE']); ?>', '<?php echo $url; ?>');" title="<?php echo $TEXT['DELETE']; ?>">
-						<img src="<?php echo THEME_URL; ?>/images/delete_16.png" border="0" alt="X" />
-					</a>
-				</td>
-				<td width="20">&nbsp;</td>
-			</tr>
-<?php
-			// Alternate row color
-			if($row == 'a') {
-				$row = 'b';
-			} else {
-				$row = 'a';
-			}
+			$querystr = 'page='.$page.'&amp;page_id='.$page_id.'&amp;section_id='.$section_id.'&amp;submission_id='.$admin->getIDKEY($submission['submission_id']);
+			$row = $row=='a' ? 'b' : 'a';
+
+			$oTpl->set_var('ROW_BIT',$row);
+			$oTpl->set_var('QUERYSTR', $querystr);
+			$oTpl->set_var('TEXT_ARE_YOU_SURE', url_encode($TEXT['ARE_YOU_SURE']));
+			$oTpl->set_var('SUBMISSION_IDKEY', $admin->getIDKEY($submission['submission_id']));
+			$oTpl->set_var('TEXT_DELETE', $TEXT['DELETE']);
+			$oTpl->set_var('PAGE', $page);
+			$oTpl->set_var('TEXT_OPEN', $TEXT['OPEN']);
+			$oTpl->set_var('SUBMISSION_ID', $submission['submission_id']);
+			$oTpl->set_var('SUBMISSION_CREATE_WHEN', gmdate(DATE_FORMAT.', '.TIME_FORMAT, $submission['submitted_when']+TIMEZONE ));
+			$oTpl->set_var('SUBMISSION_BY', $submission['display_name']);
+			$oTpl->set_var('SUBMISSION_EMAIL', $submission['email']);
+
+			$oTpl->parse('loop_submmission', 'loop_submmission_block', true);
+
+			if ($currentrow==$limit) { break;}
 		}
+        $script_name = $_SERVER['SCRIPT_NAME'];
+        //include_once((dirname(__FILE__)) .'/DiggPagination.php');
+        $pagination = m_form_DiggPagination::Pager($page,$totalrows,$limit,$adjacents,$script_name);
+    	$oTpl->set_var(array(
+    		'PAGINATION' => $pagination,
+    		)
+    	);
+
 	} else {
-?>
-<tr><td colspan="8"><?php echo $TEXT['NONE_FOUND'] ?></td></tr>
-<?php
-	}
-?>
-		</tbody>
-		<tfoot>
-		<tr style="background-color: #dddddd; font-weight: bold;">
-			<th width="23" style="text-align: center;">&nbsp;</th>
-			<th width="33" style="text-align: right;"> ID </th>
-			<th width="200" style="padding-left: 10px;"><?php echo $TEXT['SUBMITTED'] ?></th>
-			<th width="200" style="padding-left: 10px;"><?php echo $TEXT['USER']; ?></th>
-			<th width="350"><?php echo $TEXT['EMAIL'].' '.$MOD_FORM['FROM'] ?></th>
-			<th width="20">&nbsp;</th>
-			<th width="20">&nbsp;</th>
-			<th width="20">&nbsp;</th>
-			<th width="20">&nbsp;</th>
-		</tr>
-		</tfoot>
-		</table>
-<?php
+			$oTpl->set_var('TEXT_NONE_FOUND', $TEXT['NONE_FOUND']);
+    }
 } else {
 	echo $database->get_error().'<br />';
 	echo $sql;
+
 }
+
+// Parse template object
+$oTpl->parse('main', 'main_block', false);
+$output = $oTpl->finish($oTpl->parse('output', 'page'));
+unset($oTpl);
+print $output;
+$output = '';
Index: branches/2.8.x/wb/modules/form/upgrade.php
===================================================================
--- branches/2.8.x/wb/modules/form/upgrade.php	(revision 1713)
+++ branches/2.8.x/wb/modules/form/upgrade.php	(revision 1714)
@@ -4,7 +4,7 @@
  * @category        module
  * @package         Form
  * @author          WebsiteBaker Project
- * @copyright       2009-2011, Website Baker Org. e.V.
+ * @copyright       2009-2012, Website Baker Org. e.V.
  * @link			http://www.websitebaker2.org/
  * @license         http://www.gnu.org/licenses/gpl.html
  * @platform        WebsiteBaker 2.8.x
@@ -20,7 +20,7 @@
 if(defined('WB_PATH') == false)
 {
 	// Stop this file being access directly
-		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>');
+		die('<h2 style="color:red;margin:3em auto;text-align:center;">Cannot access this file directly</h2><');
 }
 /* -------------------------------------------------------- */
 
@@ -37,4 +37,12 @@
 		$msg[] = $database->get_error();
 	}
 }
+
+// later in upgrade.php
+$table_name = TABLE_PREFIX.'mod_form_settings';
+$field_name = 'perpage_submissions';
+$description = "INT NOT NULL DEFAULT '10' AFTER `max_submissions`";
+if(!$database->field_exists($table_name,$field_name)) {
+	$database->field_add($table_name, $field_name, $description);
+}
 // ------------------------------------
Index: branches/2.8.x/wb/modules/form/backend.css
===================================================================
--- branches/2.8.x/wb/modules/form/backend.css	(revision 1713)
+++ branches/2.8.x/wb/modules/form/backend.css	(revision 1714)
@@ -1,19 +1,13 @@
+@import url("css/SabrosusStyle.css") screen;
 .frm-setting_name { vertical-align :top; width :30%; white-space :nowrap; }
 .frm-setting_value { vertical-align :top; width :70%; }
 .frm-newsection { border-top :1px dashed #ffffff; }
-.row_a { background : transparent; }
-.row_b { background : #dfebff; }
+.row_a { background :transparent; }
+.row_b { background :#dfebff; }
+.frm-warning { background :#ffeeee; border :0.2em #884444 solid; color :#440000; margin-bottom :1em; padding :0.8em; }
+.frm-note { background :#eeffee; border :0.2em #448844 solid; color :#004400; margin-bottom :1em; padding :0.8em; }
 /* 
   The definitions below provide the style for the edit CSS button 
   Required CSS class name: input.mod_moduledirectory_edit_css
 */
 input.mod_form_edit_css { color :#000000; background-color :#f0f0f0; border :1px solid #808080; padding :2px; margin :0; margin-left :625px; margin-top :-20px; margin-bottom :5px; width :110px; }
-
-/*
-  table#frm-ScrollTable { text-align :left; font-size :12px; border :1px ridge #dadada; font-family :verdana; background :transparent; color :#0066ff; }
-  table#frm-ScrollTable thead  { cursor :pointer; }
-  table#frm-ScrollTable thead tr,
-  table#frm-ScrollTable tfoot tr { background :transparent; }
-  table#frm-ScrollTable tbody tr {  }
-  td, th { border :0px ridge #dadada; }
-*/
\ No newline at end of file