Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1918) +++ branches/2.8.x/CHANGELOG (revision 1919) @@ -12,8 +12,10 @@ =============================================================================== +07 Jun-2013 Build 1919 Dietmar Woellbrink (Luisehahne) +! /modules/form/ beginning recoding 07 Jun-2013 Build 1918 Dietmar Woellbrink (Luisehahne) -! /modules/news/ beginning beginning recoding +! /modules/news/ beginning recoding replacing absolute MediaUrl with place holder 07 Jun-2013 Build 1917 Dietmar Woellbrink (Luisehahne) ! /modules/show_menu2/ set to version 4.9.7 Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1918) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1919) @@ -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', '1918'); +if(!defined('REVISION')) define('REVISION', '1919'); 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 1918) +++ branches/2.8.x/wb/modules/form/modify_field.php (revision 1919) @@ -4,13 +4,13 @@ * @category module * @package Form * @author WebsiteBaker Project - * @copyright 2009-2011, Website Baker Org. e.V. - * @link http://www.websitebaker2.org/ + * @copyright 2009-2013, WebsiteBaker Org. e.V. + * @link http://www.websitebaker.org/ * @license http://www.gnu.org/licenses/gpl.html * @platform WebsiteBaker 2.8.x * @requirements PHP 5.2.2 and higher * @version $Id$ - * @filesource $HeadURL$ + * @filesource $HeadURL$ * @lastmodified $Date$ * @description */ @@ -23,12 +23,12 @@ // Include WB admin wrapper script require(WB_PATH.'/modules/admin.php'); -$sec_anchor = (defined( 'SEC_ANCHOR' ) && ( SEC_ANCHOR != '' ) ? '#'.SEC_ANCHOR.$section['section_id'] : 'section_'.$section_id ); +$sSectionIdPrefix = (defined( 'SEC_ANCHOR' ) && ( SEC_ANCHOR != '' ) ? SEC_ANCHOR : 'Sec' ); /* */ // Get id $field_id = intval($admin->checkIDKEY('field_id', false, 'GET')); if (!$field_id) { - $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id.$sec_anchor); + $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id.'#'.$sSectionIdPrefix.$section_id); } // load module language file $lang = (dirname(__FILE__)) . '/languages/' . LANGUAGE . '.php'; @@ -210,7 +210,7 @@ // end addition ?> - + Index: branches/2.8.x/wb/modules/form/add_field.php =================================================================== --- branches/2.8.x/wb/modules/form/add_field.php (revision 1918) +++ branches/2.8.x/wb/modules/form/add_field.php (revision 1919) @@ -4,24 +4,28 @@ * @category module * @package Form * @author WebsiteBaker Project - * @copyright 2009-2011, Website Baker Org. e.V. - * @link http://www.websitebaker2.org/ + * @copyright 2009-2013, WebsiteBaker Org. e.V. + * @link http://www.websitebaker.org/ * @license http://www.gnu.org/licenses/gpl.html * @platform WebsiteBaker 2.8.x * @requirements PHP 5.2.2 and higher * @version $Id$ - * @filesource $HeadURL$ + * @filesource $HeadURL$ * @lastmodified $Date$ * @description */ -require('../../config.php'); +// Include config file +$config_file = realpath('../../config.php'); +if(file_exists($config_file) && !defined('WB_URL')) +{ + require($config_file); +} + // Include WB admin wrapper script require(WB_PATH.'/modules/admin.php'); -$sec_anchor = '#'.(defined( 'SEC_ANCHOR' ) && ( SEC_ANCHOR != '' ) ? SEC_ANCHOR.$section_id : 'section_'.$section_id ); - // Include the ordering class require(WB_PATH.'/framework/class.order.php'); // Get new order @@ -28,18 +32,33 @@ $order = new order(TABLE_PREFIX.'mod_form_fields', 'position', 'field_id', 'section_id'); $position = $order->get_new($section_id); +$field_id = 0; +try { // Insert new row into database -$database->query("INSERT INTO ".TABLE_PREFIX."mod_form_fields (section_id,page_id,position,required) VALUES ('$section_id','$page_id','$position','0')"); + $sql = 'INSERT INTO `'.TABLE_PREFIX.'mod_form_fields` ' + . 'SET `section_id`='.$section_id.', ' + . '`page_id`='.$page_id.', ' + . '`position`='.$position.', ' + . '`required`=0'; + $database->query($sql); + $field_id = $database->LastInsertId; +} catch(WbDatabaseException $e) { + $admin->print_error($database->get_error(), WB_URL.'/modules/form/modify_field.php?page_id='.$page_id.'§ion_id='.$section_id.'&field_id='.$admin->getIDKEY($field_id)); +} +// Insert new row into database +//$database->query("INSERT INTO ".TABLE_PREFIX."mod_form_fields (section_id,page_id,position,required) VALUES ('$section_id','$page_id','$position','0')"); + // Get the id -$field_id = $database->get_one("SELECT LAST_INSERT_ID()"); +//$field_id = $database->get_one("SELECT LAST_INSERT_ID()"); // Say that a new record has been added, then redirect to modify page -if($database->is_error()) { - $admin->print_error($database->get_error(), WB_URL.'/modules/form/modify_field.php?page_id='.$page_id.'§ion_id='.$section_id.'&field_id='.$admin->getIDKEY($field_id)); -} else { - $admin->print_success($TEXT['SUCCESS'], WB_URL.'/modules/form/modify_field.php?page_id='.$page_id.'§ion_id='.$section_id.'&field_id='.$admin->getIDKEY($field_id)); -} +//if($database->is_error()) { +// $admin->print_error($database->get_error(), WB_URL.'/modules/form/modify_field.php?page_id='.$page_id.'§ion_id='.$section_id.'&field_id='.$admin->getIDKEY($field_id)); +//} else { +// $admin->print_success($TEXT['SUCCESS'], WB_URL.'/modules/form/modify_field.php?page_id='.$page_id.'§ion_id='.$section_id.'&field_id='.$admin->getIDKEY($field_id)); +//} +$admin->print_success($TEXT['SUCCESS'], WB_URL.'/modules/form/modify_field.php?page_id='.$page_id.'§ion_id='.$section_id.'&field_id='.$admin->getIDKEY($field_id)); // Print admin footer $admin->print_footer(); Index: branches/2.8.x/wb/modules/form/save_field.php =================================================================== --- branches/2.8.x/wb/modules/form/save_field.php (revision 1918) +++ branches/2.8.x/wb/modules/form/save_field.php (revision 1919) @@ -4,13 +4,13 @@ * @category module * @package Form * @author WebsiteBaker Project - * @copyright 2009-2012, WebsiteBaker Org. e.V. - * @link http://www.websitebaker2.org/ + * @copyright 2009-2013, WebsiteBaker Org. e.V. + * @link http://www.websitebaker.org/ * @license http://www.gnu.org/licenses/gpl.html * @platform WebsiteBaker 2.8.x * @requirements PHP 5.2.2 and higher * @version $Id$ - * @filesource $HeadURL$ + * @filesource $HeadURL$ * @lastmodified $Date$ * @description */ @@ -25,19 +25,19 @@ require(WB_PATH.'/modules/admin.php'); /* */ -$sec_anchor = (defined( 'SEC_ANCHOR' ) && ( SEC_ANCHOR != '' ) ? '#'.SEC_ANCHOR.$section['section_id'] : 'section_'.$section_id ); +$sSectionIdPrefix = (defined( 'SEC_ANCHOR' ) && ( SEC_ANCHOR != '' ) ? SEC_ANCHOR : 'Sec' ); // check FTAN if (!$admin->checkFTAN()) { $admin->print_header(); - $admin->print_error('::'.$MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id.$sec_anchor); + $admin->print_error('::'.$MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id.'#'.$sSectionIdPrefix.$section_id); } // Get id $field_id = intval($admin->checkIDKEY('field_id', false )); if (!$field_id) { - $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'].'::', ADMIN_URL.'/pages/modify.php?page_id='.$page_id.$sec_anchor); + $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'].'::', ADMIN_URL.'/pages/modify.php?page_id='.$page_id.'#'.$sSectionIdPrefix.$section_id); } // After check print the header to get a new FTAN $admin->print_header(); Index: branches/2.8.x/wb/modules/form/delete_field.php =================================================================== --- branches/2.8.x/wb/modules/form/delete_field.php (revision 1918) +++ branches/2.8.x/wb/modules/form/delete_field.php (revision 1919) @@ -4,13 +4,13 @@ * @category module * @package Form * @author WebsiteBaker Project - * @copyright 2009-2011, Website Baker Org. e.V. - * @link http://www.websitebaker2.org/ + * @copyright 2009-2013, WebsiteBaker Org. e.V. + * @link http://www.websitebaker.org/ * @license http://www.gnu.org/licenses/gpl.html * @platform WebsiteBaker 2.8.x * @requirements PHP 5.2.2 and higher * @version $Id$ - * @filesource $HeadURL$ + * @filesource $HeadURL$ * @lastmodified $Date$ * @description */ @@ -27,7 +27,7 @@ $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id); } -$sec_anchor = '#'.(defined( 'SEC_ANCHOR' ) && ( SEC_ANCHOR != '' ) ? SEC_ANCHOR.$section_id : 'section_'.$section_id ); +$sSectionIdPrefix = (defined( 'SEC_ANCHOR' ) && ( SEC_ANCHOR != '' ) ? SEC_ANCHOR : 'Sec' ); // Delete row $database->query("DELETE FROM ".TABLE_PREFIX."mod_form_fields WHERE field_id = '$field_id'"); @@ -39,9 +39,9 @@ $order = new order(TABLE_PREFIX.'mod_form_fields', 'position', 'field_id', 'section_id'); if(!$order->clean($section_id)) { - $admin->print_error($database->get_error(), ADMIN_URL.'/pages/modify.php?page_id='.$page_id.$sec_anchor); + $admin->print_error($database->get_error(), ADMIN_URL.'/pages/modify.php?page_id='.$page_id.'#'.$sSectionIdPrefix.$section_id); } else { - $admin->print_success($TEXT['SUCCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id.$sec_anchor); + $admin->print_success($TEXT['SUCCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id.'#'.$sSectionIdPrefix.$section_id); } // Print admin footer Index: branches/2.8.x/wb/modules/form/modify_settings.php =================================================================== --- branches/2.8.x/wb/modules/form/modify_settings.php (revision 1918) +++ branches/2.8.x/wb/modules/form/modify_settings.php (revision 1919) @@ -4,13 +4,13 @@ * @category module * @package Form * @author WebsiteBaker Project - * @copyright 2009-2011, Website Baker Org. e.V. - * @link http://www.websitebaker2.org/ + * @copyright 2009-2013, WebsiteBaker Org. e.V. + * @link http://www.websitebaker.org/ * @license http://www.gnu.org/licenses/gpl.html * @platform WebsiteBaker 2.8.x * @requirements PHP 5.2.2 and higher * @version $Id$ - * @filesource $HeadURL$ + * @filesource $HeadURL$ * @lastmodified $Date$ * @description */ @@ -38,7 +38,7 @@ $database->field_add($table_name, $field_name, $description); } -$sec_anchor = (defined( 'SEC_ANCHOR' ) && ( SEC_ANCHOR != '' ) ? '#'.SEC_ANCHOR.$section['section_id'] : 'section_'.$section_id ); +$sSectionIdPrefix = (defined( 'SEC_ANCHOR' ) && ( SEC_ANCHOR != '' ) ? SEC_ANCHOR : 'Sec' ); if (!function_exists('emailAdmin')) { function emailAdmin() { @@ -266,7 +266,7 @@ - + Index: branches/2.8.x/wb/modules/form/htt/submessage.htt =================================================================== --- branches/2.8.x/wb/modules/form/htt/submessage.htt (revision 1918) +++ branches/2.8.x/wb/modules/form/htt/submessage.htt (revision 1919) @@ -2,7 +2,7 @@
-{TEXT_PRINT_PAGE} +{TEXT_PRINT_PAGE}
@@ -13,8 +13,8 @@ - -

{SUCCESS_PRINT}

+ +

{SUCCESS_PRINT}

Index: branches/2.8.x/wb/modules/form/save_field_new.php =================================================================== --- branches/2.8.x/wb/modules/form/save_field_new.php (revision 1918) +++ branches/2.8.x/wb/modules/form/save_field_new.php (revision 1919) @@ -4,13 +4,13 @@ * @category module * @package Form * @author WebsiteBaker Project - * @copyright 2009-2012, WebsiteBaker Org. e.V. - * @link http://www.websitebaker2.org/ + * @copyright 2009-2013, WebsiteBaker Org. e.V. + * @link http://www.websitebaker.org/ * @license http://www.gnu.org/licenses/gpl.html * @platform WebsiteBaker 2.8.x * @requirements PHP 5.2.2 and higher * @version $Id$ - * @filesource $HeadURL$ + * @filesource $HeadURL$ * @lastmodified $Date$ * @description * http://devzone.zend.com/703/php-built-in-input-filtering/ @@ -26,13 +26,13 @@ require(WB_PATH.'/modules/admin.php'); /* */ -$sec_anchor = (defined( 'SEC_ANCHOR' ) && ( SEC_ANCHOR != '' ) ? '#'.SEC_ANCHOR.$section['section_id'] : 'section_'.$section_id ); +$sSectionIdPrefix = (defined( 'SEC_ANCHOR' ) && ( SEC_ANCHOR != '' ) ? SEC_ANCHOR : 'Sec' ); // check FTAN if (!$admin->checkFTAN()) { $admin->print_header(); - $admin->print_error('::'.$MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id.$sec_anchor); + $admin->print_error('::'.$MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id.'#'.$sSectionIdPrefix.$section_id); } // Get id @@ -39,7 +39,7 @@ $field_id = intval($admin->checkIDKEY('field_id', false )); if (!$field_id) { $admin->print_header(); - $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'].'::', ADMIN_URL.'/pages/modify.php?page_id='.$page_id.$sec_anchor); + $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'].'::', ADMIN_URL.'/pages/modify.php?page_id='.$page_id.'#'.$sSectionIdPrefix.$section_id); } // After check print the header to get a new FTAN $admin->print_header(); Index: branches/2.8.x/wb/modules/form/view.php =================================================================== --- branches/2.8.x/wb/modules/form/view.php (revision 1918) +++ branches/2.8.x/wb/modules/form/view.php (revision 1919) @@ -151,7 +151,6 @@ } // do not use sec_anchor, can destroy some layouts -//$sec_anchor = (defined( 'SEC_ANCHOR' ) && ( SEC_ANCHOR != '' ) ? '#'.SEC_ANCHOR.$fetch_settings['section_id'] : 'section_'.$section_id ); // Get list of fields $sql = 'SELECT * FROM `'.TABLE_PREFIX.'mod_form_fields` '; @@ -495,6 +494,7 @@ echo "\n"; echo '

'.$TEXT['BACK'].'

'."\n"; } else { + $success = false; // Check how many times form has been submitted in last hour $last_hour = time()-3600; $sql = 'SELECT `submission_id` FROM `'.TABLE_PREFIX.'mod_form_submissions` '; Index: branches/2.8.x/wb/modules/form/save_settings.php =================================================================== --- branches/2.8.x/wb/modules/form/save_settings.php (revision 1918) +++ branches/2.8.x/wb/modules/form/save_settings.php (revision 1919) @@ -4,13 +4,13 @@ * @category module * @package Form * @author WebsiteBaker Project - * @copyright 2009-2012, WebsiteBaker Org. e.V. - * @link http://www.websitebaker2.org/ + * @copyright 2009-2013, WebsiteBaker Org. e.V. + * @link http://www.websitebaker.org/ * @license http://www.gnu.org/licenses/gpl.html * @platform WebsiteBaker 2.8.x * @requirements PHP 5.2.2 and higher * @version $Id$ - * @filesource $HeadURL$ + * @filesource $HeadURL$ * @lastmodified $Date$ * @description */ @@ -30,8 +30,6 @@ } $admin->print_header(); -$sec_anchor = (defined( 'SEC_ANCHOR' ) && ( SEC_ANCHOR != '' ) ? '#'.SEC_ANCHOR.$section['section_id'] : 'section_'.$section_id ); - if (!function_exists('emailAdmin')) { function emailAdmin() { global $database,$admin; @@ -109,7 +107,7 @@ if($max_submissions > $stored_submissions) { $max_submissions = $stored_submissions; } -$sec_anchor = (defined( 'SEC_ANCHOR' ) && ( SEC_ANCHOR != '' ) ? '#'.SEC_ANCHOR.$section['section_id'] : 'section_'.$section_id ); +$sSectionIdPrefix = (defined( 'SEC_ANCHOR' ) && ( SEC_ANCHOR != '' ) ? SEC_ANCHOR : 'Sec' ); // Update settings $sql = 'UPDATE `'.TABLE_PREFIX.'mod_form_settings` SET '; @@ -133,11 +131,11 @@ $sql .= 'WHERE `section_id` = '.(int)$section_id.' '; $sql .= ''; if($database->query($sql)) { - $admin->print_success($TEXT['SUCCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id.$sec_anchor); + $admin->print_success($TEXT['SUCCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id.'#'.$sSectionIdPrefix.$section_id); } // Check if there is a db error, otherwise say successful if($database->is_error()) { - $admin->print_error($database->get_error(), ADMIN_URL.'/pages/modify.php?page_id='.$page_id.$sec_anchor); + $admin->print_error($database->get_error(), ADMIN_URL.'/pages/modify.php?page_id='.$page_id.'#'.$sSectionIdPrefix.$section_id); } // Print admin footer $admin->print_footer(); Index: branches/2.8.x/wb/modules/form/languages/DE.php =================================================================== --- branches/2.8.x/wb/modules/form/languages/DE.php (revision 1918) +++ branches/2.8.x/wb/modules/form/languages/DE.php (revision 1919) @@ -32,8 +32,8 @@ $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ür die Übermittlung Ihrer Nachricht an {{WEBSITE_TITLE}} '; -$MOD_FORM['SUCCESS_EMAIL_TEXT'] .= 'Wir setzen uns schnellstens mit Ihnen in Verbindung'; +$MOD_FORM['SUCCESS_EMAIL_TEXT'] = 'Vielen Dank für die Ü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" Index: branches/2.8.x/wb/modules/form/frontend.css =================================================================== --- branches/2.8.x/wb/modules/form/frontend.css (revision 1918) +++ branches/2.8.x/wb/modules/form/frontend.css (revision 1919) @@ -29,4 +29,7 @@ .frm-field_table input[type="submit"] { padding :0.1em 0.8em; } .frm-warning a, p.frm-warning a { background :transparent; padding-left :0; } -fieldset.frm-fieldset { border :none; } \ No newline at end of file +fieldset.frm-fieldset { border :none; margin :0%; padding :0%; } +.frm-warning-success-email { display :block; } +.previewPrintTop { float :right; } +.previewPrintTop span { display : none; } Index: branches/2.8.x/wb/modules/form/view_submission.php =================================================================== --- branches/2.8.x/wb/modules/form/view_submission.php (revision 1918) +++ branches/2.8.x/wb/modules/form/view_submission.php (revision 1919) @@ -4,13 +4,13 @@ * @category module * @package Form * @author Ryan Djurovich, WebsiteBaker Project - * @copyright 2009-2012, WebsiteBaker Org. e.V. - * @link http://www.websitebaker2.org/ + * @copyright 2009-2013, WebsiteBaker Org. e.V. + * @link http://www.websitebaker.org/ * @license http://www.gnu.org/licenses/gpl.html * @platform WebsiteBaker 2.8.x * @requirements PHP 5.2.2 and higher * @version $Id$ - * @filesource $HeadURL$ + * @filesource $HeadURL$ * @lastmodified $Date$ * @description */ @@ -58,8 +58,8 @@ $user['username'] = $TEXT['UNKNOWN']; } } -//$sec_anchor = (defined( 'SEC_ANCHOR' ) && ( SEC_ANCHOR != '' ) ? '#'.SEC_ANCHOR.$section['section_id'] : '' ); -$sec_anchor = '#submissions'; +//$sSectionIdPrefix = ( defined( 'SEC_ANCHOR' ) && ( SEC_ANCHOR != '' ) ? '#'.SEC_ANCHOR : 'Sec' ); +$sSectionIdPrefix = 'submissions'; ?> @@ -88,8 +88,8 @@
- - + +query($sql)) { - // $admin->print_success($TEXT['SUCCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id.$sec_anchor); + } }