Revision 789
Added by doc over 16 years ago
| trunk/CHANGELOG | ||
|---|---|---|
| 12 | 12 |
|
| 13 | 13 |
------------------------------------- 2.7.0 ------------------------------------- |
| 14 | 14 |
02-Apr-2008 Christian Sommer |
| 15 |
! fixed some layout issues with Form module (combination with Output-filter) |
|
| 15 | 16 |
! fixed layout issue with optional subject/body text of encrypted mailto links |
| 16 | 17 |
# fixed bug in the mailto Javascript encryption code of the Output-Filter module |
| 17 | 18 |
01-Apr-2008 Christian Sommer |
| trunk/wb/admin/interface/stylesheet.css | ||
|---|---|---|
| 86 | 86 |
background-color: #ECF3F7; |
| 87 | 87 |
} |
| 88 | 88 |
.row_b {
|
| 89 |
background-color: #EBF7FC;
|
|
| 89 |
background-color: #DBEBF2;
|
|
| 90 | 90 |
} |
| 91 | 91 |
.hide {
|
| 92 | 92 |
display: none; |
| trunk/wb/index.php | ||
|---|---|---|
| 92 | 92 |
|
| 93 | 93 |
if(function_exists('filter_frontend_output')) {
|
| 94 | 94 |
// store output in variable for filtering |
| 95 |
ob_start(); |
|
| 95 |
@ob_start();
|
|
| 96 | 96 |
require(WB_PATH.'/templates/'.TEMPLATE.'/index.php'); |
| 97 | 97 |
$frontend_output = ob_get_contents(); |
| 98 |
ob_end_clean(); |
|
| 98 |
@ob_end_clean();
|
|
| 99 | 99 |
// Display the filtered output on the frontend |
| 100 | 100 |
echo filter_frontend_output($frontend_output); |
| 101 | 101 |
die; |
| trunk/wb/modules/form/edit_css.php | ||
|---|---|---|
| 40 | 40 |
} |
| 41 | 41 |
|
| 42 | 42 |
// set defaults if output varibles are not set in the languages files |
| 43 |
if(!isset($CAP_EDIT_CSS)) $CAP_EDIT_CSS = 'Edit CSS'; |
|
| 44 | 43 |
if(!isset($HEADING_CSS_FILE)) $HEADING_CSS_FILE = 'Actual module file: '; |
| 45 | 44 |
if(!isset($TXT_EDIT_CSS_FILE)) $TXT_EDIT_CSS_FILE = 'Edit the CSS definitions in the textarea below.'; |
| 46 | 45 |
|
| trunk/wb/modules/form/css.functions.php | ||
|---|---|---|
| 59 | 59 |
if($frontend_css || $backend_css) {
|
| 60 | 60 |
// default text used for the edit CSS routines if not defined in the modules language file |
| 61 | 61 |
if(!isset($CAP_EDIT_CSS)) $CAP_EDIT_CSS = 'Edit CSS'; |
| 62 |
if(!isset($HEADING_CSS_FILE)) $HEADING_CSS_FILE = 'Actual module file: '; |
|
| 63 |
if(!isset($TXT_EDIT_CSS_FILE)) $TXT_EDIT_CSS_FILE = 'Edit the CSS definitions in the textarea below.'; |
|
| 64 | 62 |
?> |
| 65 | 63 |
<form name="edit_module_file" action="<?php echo WB_URL .'/modules/' .$mod_dir . |
| 66 | 64 |
'/edit_css.php';?>" method="post" style="margin: 0; align:right;"> |
| trunk/wb/modules/form/view.php | ||
|---|---|---|
| 41 | 41 |
|
| 42 | 42 |
require_once(WB_PATH.'/include/captcha/captcha.php'); |
| 43 | 43 |
|
| 44 |
// obtain the settings of the output filter module |
|
| 45 |
if(file_exists(WB_PATH.'/modules/output_filter/filter-routines.php')) {
|
|
| 46 |
include_once(WB_PATH.'/modules/output_filter/filter-routines.php'); |
|
| 47 |
$filter_settings = get_output_filter_settings(); |
|
| 48 |
} else {
|
|
| 49 |
// no output filter used, define default settings |
|
| 50 |
$filter_settings['email_filter'] = 0; |
|
| 51 |
} |
|
| 52 |
|
|
| 44 | 53 |
// Function for generating an optionsfor a select field |
| 45 | 54 |
if (!function_exists('make_option')) {
|
| 46 | 55 |
function make_option(&$n, $k, $values) {
|
| ... | ... | |
| 221 | 230 |
// Print footer |
| 222 | 231 |
echo $footer; |
| 223 | 232 |
|
| 233 |
/** |
|
| 234 |
NOTE: comment out the line ob_end_flush() if you indicate problems (e.g. when using ob_start in the index.php of your template) |
|
| 235 |
With ob_end_flush(): output filter will be disabled for this page (and all sections embedded on this page) |
|
| 236 |
Without ob_end_flush(): emails are rewritten (e.g. name@domain.com --> name(at)domain(dot)com) if output filter is enabled |
|
| 237 |
All replacements made by the Output-Filter module will be reverted before the email is send out |
|
| 238 |
*/ |
|
| 239 |
if($filter_settings['email_filter'] && !($filter_settings['at_replacement']=='@' && $filter_settings['dot_replacement']=='.')) {
|
|
| 240 |
ob_end_flush(); |
|
| 241 |
} |
|
| 242 |
|
|
| 224 | 243 |
// Add form end code |
| 225 | 244 |
?> |
| 226 | 245 |
</form> |
| ... | ... | |
| 305 | 324 |
} else {
|
| 306 | 325 |
$_SESSION['field'.$field['field_id']] = htmlspecialchars($_POST['field'.$field['field_id']]); |
| 307 | 326 |
} |
| 327 |
// if the output filter is active, we need to revert (dot) to . and (at) to @ (using current filter settings) |
|
| 328 |
// otherwise the entered mail will not be accepted and the recipient would see (dot), (at) etc. |
|
| 329 |
if ($filter_settings['email_filter']) {
|
|
| 330 |
$field_value = $_POST['field'.$field['field_id']]; |
|
| 331 |
$field_value = str_replace($filter_settings['at_replacement'], '@', $field_value); |
|
| 332 |
$field_value = str_replace($filter_settings['dot_replacement'], '.', $field_value); |
|
| 333 |
$_POST['field'.$field['field_id']] = $field_value; |
|
| 334 |
} |
|
| 308 | 335 |
if($field['type'] == 'email' AND $admin->validate_email($_POST['field'.$field['field_id']]) == false) {
|
| 309 | 336 |
$email_error = $MESSAGE['USERS']['INVALID_EMAIL']; |
| 310 | 337 |
} |
Also available in: Unified diff
fixed some layout issues with Form module (combination with Output-filter)