Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1552) +++ branches/2.8.x/CHANGELOG (revision 1553) @@ -11,6 +11,8 @@ ! = Update/Change =========================== add small Features 2.8.2 ========================== +31 Dez-2011 Build 1553 Dietmar Woellbrink (Luisehahne) +! recoded formmodul, add dropdown email_fromname_field 31 Dez-2011 Build 1552 Dietmar Woellbrink (Luisehahne) # fix mdcr.js $scriptLink to absolute url ! change separator breadcrumb admintools Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1552) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1553) @@ -52,5 +52,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.2'); -if(!defined('REVISION')) define('REVISION', '1552'); +if(!defined('REVISION')) define('REVISION', '1553'); if(!defined('SP')) define('SP', 'SP2'); Index: branches/2.8.x/wb/modules/form/modify_field.php =================================================================== --- branches/2.8.x/wb/modules/form/modify_field.php (revision 1552) +++ branches/2.8.x/wb/modules/form/modify_field.php (revision 1553) @@ -22,22 +22,28 @@ $update_when_modified = false; // Include WB admin wrapper script require(WB_PATH.'/modules/admin.php'); + +$sec_anchor = (defined( 'SEC_ANCHOR' ) && ( SEC_ANCHOR != '' ) ? '#'.SEC_ANCHOR.$section['section_id'] : '' ); /* */ // Get id -$field_id = $admin->checkIDKEY('field_id', false, 'GET'); +$field_id = intval($admin->checkIDKEY('field_id', false, 'GET')); if (!$field_id) { - $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']." MF: $field_id :-(", ADMIN_URL.'/pages/modify.php?page_id='.$page_id); + $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id.$sec_anchor); } +// load module language file +$lang = (dirname(__FILE__)) . '/languages/' . LANGUAGE . '.php'; +require_once(!file_exists($lang) ? (dirname(__FILE__)) . '/languages/EN.php' : $lang ); +$type = 'none'; // Get header and footer -$query_content = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_form_fields WHERE field_id = '$field_id'"); -$form = $query_content->fetchRow(); -$type = $form['type']; -if($type == '') { - $type = 'none'; +$sql = 'SELECT * FROM `'.TABLE_PREFIX.'mod_form_fields` '; +$sql .= 'WHERE `field_id` = '.$field_id.''; +$sql .= ''; +if($query_content = $database->query($sql)) { + $form = $query_content->fetchRow(MYSQL_ASSOC); + $type = (($form['type'] == '') ? 'none' : $form['type']); } - -// set new token +// set new idkey for save_field $field_id = $admin->getIDKEY($form['field_id']); // Set raw html <'s and >'s to be replaced by friendly html code $raw = array('<', '>'); @@ -44,13 +50,13 @@ $friendly = array('<', '>'); ?> -
+ getFTAN(); ?> - +
@@ -66,11 +72,11 @@ @@ -107,6 +113,7 @@
: + -
-
: @@ -120,13 +126,11 @@
- -
: @@ -133,10 +137,10 @@
+
@@ -190,7 +194,7 @@ - +
@@ -200,13 +204,13 @@ if ($type<>'none') { ?> - + - +
Index: branches/2.8.x/wb/modules/form/add_field.php =================================================================== --- branches/2.8.x/wb/modules/form/add_field.php (revision 1552) +++ branches/2.8.x/wb/modules/form/add_field.php (revision 1553) @@ -20,6 +20,8 @@ // Include WB admin wrapper script require(WB_PATH.'/modules/admin.php'); +$sec_anchor = (defined( 'SEC_ANCHOR' ) && ( SEC_ANCHOR != '' ) ? '#'.SEC_ANCHOR.$section['section_id'] : '' ); + // Include the ordering class require(WB_PATH.'/framework/class.order.php'); // Get new order Index: branches/2.8.x/wb/modules/form/save_field.php =================================================================== --- branches/2.8.x/wb/modules/form/save_field.php (revision 1552) +++ branches/2.8.x/wb/modules/form/save_field.php (revision 1553) @@ -25,22 +25,23 @@ require(WB_PATH.'/modules/admin.php'); /* */ +$sec_anchor = (defined( 'SEC_ANCHOR' ) && ( SEC_ANCHOR != '' ) ? '#'.SEC_ANCHOR.$section['section_id'] : '' ); + // check FTAN if (!$admin->checkFTAN()) { $admin->print_header(); - $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_id='.$page_id.$sec_anchor); } -// After check print the header -$admin->print_header(); - -/* */ // Get id $field_id = intval($admin->checkIDKEY('field_id', false )); if (!$field_id) { - $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'].'::', ADMIN_URL.'/pages/modify.php?page_id='.$page_id); + $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'].'::', ADMIN_URL.'/pages/modify.php?page_id='.$page_id.$sec_anchor); } +// After check print the header to get a new FTAN +$admin->print_header(); + /* // Get id if(!isset($_POST['field_id']) OR !is_numeric($_POST['field_id'])) { @@ -69,7 +70,12 @@ $value = ''; // Update row -$database->query("UPDATE ".TABLE_PREFIX."mod_form_fields SET title = '$title', type = '$type', required = '$required' WHERE field_id = '$field_id'"); +$sql = 'UPDATE `'.TABLE_PREFIX.'mod_form_fields SET` '; +$sql .= 'title = \''.$title.'\', '; +$sql .= 'type = \''.$type.'\', '; +$sql .= 'required = \''.$required.'\' '; +$sql .= 'WHERE field_id = '.(int)$field_id.' '; +if($database->query($sql)) { } // If field type has multiple options, get all values and implode them $list_count = $admin->get_post('list_count'); @@ -93,7 +99,7 @@ $database->query("UPDATE ".TABLE_PREFIX."mod_form_fields SET value = '$value', extra = '' WHERE field_id = '$field_id'"); } elseif($admin->get_post('type') == 'heading') { $extra = str_replace(array("[[", "]]"), '', $admin->get_post('template')); - if(trim($extra) == '') $extra = '{TITLE}{FIELD}'; + if(trim($extra) == '') $extra = '{TITLE}{FIELD}'; $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') { Index: branches/2.8.x/wb/modules/form/delete_field.php =================================================================== --- branches/2.8.x/wb/modules/form/delete_field.php (revision 1552) +++ branches/2.8.x/wb/modules/form/delete_field.php (revision 1553) @@ -22,11 +22,13 @@ require(WB_PATH.'/modules/admin.php'); // Get id -$field_id = $admin->checkIDKEY('field_id', false, 'GET'); +$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 = (defined( 'SEC_ANCHOR' ) && ( SEC_ANCHOR != '' ) ? '#'.SEC_ANCHOR.$section['section_id'] : '' ); + // Delete row $database->query("DELETE FROM ".TABLE_PREFIX."mod_form_fields WHERE field_id = '$field_id'"); @@ -36,10 +38,10 @@ // Create new order object an reorder $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); +if(!$order->clean($section_id)) { + $admin->print_error($database->get_error(), ADMIN_URL.'/pages/modify.php?page_id='.$page_id.$sec_anchor); } else { - $admin->print_success($TEXT['SUCCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id); + $admin->print_success($TEXT['SUCCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id.$sec_anchor); } // 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 1552) +++ branches/2.8.x/wb/modules/form/modify_settings.php (revision 1553) @@ -30,10 +30,22 @@ $lang = (dirname(__FILE__)) . '/languages/' . LANGUAGE . '.php'; require_once(!file_exists($lang) ? (dirname(__FILE__)) . '/languages/EN.php' : $lang ); -// Get header and footer -$query_content = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_form_settings WHERE section_id = '$section_id'"); -$setting = $query_content->fetchRow(); +$sec_anchor = (defined( 'SEC_ANCHOR' ) && ( SEC_ANCHOR != '' ) ? '#'.SEC_ANCHOR.$section['section_id'] : '' ); +// Get Settings from DB +$sql = 'SELECT * FROM '.TABLE_PREFIX.'mod_form_settings '; +$sql .= 'WHERE `section_id` = '.(int)$section_id.''; +if($query_content = $database->query($sql)) { + $setting = $query_content->fetchRow(MYSQL_ASSOC); + $setting['email_to'] = ($setting['email_to'] != '' ? $setting['email_to'] : SERVER_EMAIL); + $setting['email_subject'] = ($setting['email_subject'] != '') ? $setting['email_subject'] : $MOD_FORM['EMAIL_SUBJECT']; + $setting['success_email_subject'] = ($setting['success_email_subject'] != '') ? $setting['success_email_subject'] : $MOD_FORM['SUCCESS_EMAIL_SUBJECT']; + $setting['success_email_from'] = ($setting['success_email_from'] != '' ? $setting['success_email_from'] : SERVER_EMAIL); + $setting['success_email_fromname'] = ($setting['success_email_fromname'] != '' ? $setting['success_email_fromname'] : WBMAILER_DEFAULT_SENDERNAME); + $setting['success_email_subject'] = ($setting['success_email_subject'] != '') ? $setting['success_email_subject'] : $MOD_FORM['SUCCESS_EMAIL_SUBJECT']; + +} + // Set raw html <'s and >'s to be replace by friendly html code $raw = array('<', '>'); $friendly = array('<', '>'); @@ -62,12 +74,12 @@ getFTAN(); ?> - +
- + - - + - - + - - + - - + - - +
:: /> @@ -76,62 +88,69 @@
: + :
: + :
: + :
: + :
: + :
- - + +
- - + - - + - - + - - +
: + :
: + :
: - + : + +
: + :
- - + +
- - + - - + - - + - - + - - + - - +
: + :
: + :
: + : +
: + :
: + :
: + :
- +
- +
Index: branches/2.8.x/wb/modules/form/save_field_new.php =================================================================== --- branches/2.8.x/wb/modules/form/save_field_new.php (nonexistent) +++ branches/2.8.x/wb/modules/form/save_field_new.php (revision 1553) @@ -0,0 +1,111 @@ +checkFTAN()) +{ + $admin->print_header(); + $admin->print_error('::'.$MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id.$sec_anchor); +} + +// Get id +$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); +} +// After check print the header to get a new FTAN +$admin->print_header(); + +// 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.'§ion_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')); + $required = (int) $admin->add_slashes($admin->get_post('required')); +} + +// If field type has multiple options, get all values and implode them + $value = $extra = ''; + $list_count = $admin->get_post('list_count'); + if(is_numeric($list_count)) { + $values = array(); + for($i = 1; $i <= $list_count; $i++) { + if($admin->get_post('value'.$i) != '') { + $values[] = str_replace(",",",",$admin->get_post('value'.$i)); + } + } + $value = implode(',', $values); + } +// prepare sql-update + switch($admin->get_post('type')): + case 'textfield': + $value = str_replace(array("[[", "]]"), '', $admin->get_post_escaped('value')); + $extra = $admin->get_post_escaped('length'); + break; + case 'textarea': + $value = str_replace(array("[[", "]]"), '', $admin->get_post_escaped('value')); + $extra = ''; + break; + case 'heading': + $extra = str_replace(array("[[", "]]"), '', $admin->get_post('template')); + if(trim($extra) == '') $extra = '{TITLE}{FIELD}'; + $extra = $admin->add_slashes($extra); + break; + case 'select': + $extra = $admin->get_post_escaped('size').','.$admin->get_post_escaped('multiselect'); + break; + case 'checkbox': + $extra = str_replace(array("[[", "]]"), '', $admin->get_post_escaped('seperator')); + break; + case 'radio': + $extra = str_replace(array("[[", "]]"), '', $admin->get_post_escaped('seperator')); + break; + default: + $value = ''; + $extra = ''; + break; + endswitch; +// Update row + $sql = 'UPDATE `'.TABLE_PREFIX.'mod_form_fields` '; + $sql .= 'SET `title`=\''.$title.'\', '; + $sql .= '`type`=\''.$type.'\', '; + $sql .= '`required`=\''.$required.'\', '; + $sql .= '`extra`=\''.$extra.'\', '; + $sql .= '`value`=\''.$value.'\' '; + $sql .= 'WHERE field_id = '.(int)$field_id.' '; + if( $database->query($sql) ) { + $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)); + }else { + $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)); + } +// Print admin footer + $admin->print_footer(); \ No newline at end of file Property changes on: branches/2.8.x/wb/modules/form/save_field_new.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.php =================================================================== --- branches/2.8.x/wb/modules/form/view.php (revision 1552) +++ branches/2.8.x/wb/modules/form/view.php (revision 1553) @@ -12,7 +12,7 @@ * @version $Id$ * @filesource $HeadURL$ * @lastmodified $Date$ - * @description + * @description */ // Must include code to stop this file being access directly @@ -24,69 +24,62 @@ } /* -------------------------------------------------------- */ -// check if frontend.css file needs to be included into the of view.php -if((!function_exists('register_frontend_modfiles') || !defined('MOD_FRONTEND_CSS_REGISTERED')) && - file_exists(WB_PATH .'/modules/form/frontend.css')) { - echo '\n"; -} - -require_once(WB_PATH.'/include/captcha/captcha.php'); - -// obtain the settings of the output filter module -if(file_exists(WB_PATH.'/modules/output_filter/filter-routines.php')) { - include_once(WB_PATH.'/modules/output_filter/filter-routines.php'); - $filter_settings = getOutputFilterSettings(); -} else { - // no output filter used, define default settings - $filter_settings['email_filter'] = 0; +// load module language file +$lang = (dirname(__FILE__)) . '/languages/' . LANGUAGE . '.php'; +require_once(!file_exists($lang) ? (dirname(__FILE__)) . '/languages/EN.php' : $lang ); +/* +function removebreaks($value) { + return trim(preg_replace('=((||0x0A/%0A|0x0D/%0D|\\n|\\r)\S).*=i', null, $value)); } - +function checkbreaks($value) { + return $value === removebreaks($value); +} +*/ // Function for generating an optionsfor a select field if (!function_exists('make_option')) { -function make_option(&$n, $k, $values) { - // start option group if it exists - if (substr($n,0,2) == '[=') { - $n = ''; - } elseif ($n == ']') { - $n = ''; - } else { - if(in_array($n, $values)) { - $n = ''; + function make_option(&$n, $k, $values) { + // start option group if it exists + if (substr($n,0,2) == '[=') { + $n = ''.PHP_EOL; + } elseif ($n == ']') { + $n = ''.PHP_EOL; } else { - $n = ''; + if(in_array($n, $values)) { + $n = ''.PHP_EOL; + } else { + $n = ''.PHP_EOL; + } } } } -} // Function for generating a checkbox if (!function_exists('make_checkbox')) { -function make_checkbox(&$n, $idx, $params) { - $field_id = $params[0][0]; - $seperator = $params[0][1]; - $label_id = 'wb_'.preg_replace('/[^a-z0-1]/i', '_', $n); - if(in_array($n, $params[1])) { - $n = ''.'