Revision 1898
Added by Dietmar over 11 years ago
branches/2.8.x/CHANGELOG | ||
---|---|---|
13 | 13 |
|
14 | 14 |
|
15 | 15 |
|
16 |
03 Apr-2013 Build 1898 Dietmar Woellbrink (Luisehahne) |
|
17 |
# bugfix missing trailing backtick in output_filter/input.php |
|
18 |
# bugfix wrong backticks in 'admin/media/upload.php |
|
19 |
# bugfix add missing language variable in account |
|
20 |
! update form module, add class frm-fieldset to fieldset, restyle error box |
|
21 |
! update captcha iframe attribute settings |
|
16 | 22 |
21 Mar-2013 Build 1897 Dietmar Woellbrink (Luisehahne) |
17 | 23 |
# SqlImport removes BOM in sql files in a Windows Environment |
18 | 24 |
otherwise you have an error in your SQL syntax; |
branches/2.8.x/wb/include/captcha/captcha.php | ||
---|---|---|
5 | 5 |
* @package include |
6 | 6 |
* @subpackage |
7 | 7 |
* @author Ryan Djurovich,WebsiteBaker Project |
8 |
* @copyright 2009-2012, WebsiteBaker Org. e.V.
|
|
9 |
* @link http://www.websitebaker2.org/
|
|
8 |
* @copyright 2009-2013, WebsiteBaker Org. e.V.
|
|
9 |
* @link http://www.websitebaker.org/ |
|
10 | 10 |
* @license http://www.gnu.org/licenses/gpl.html |
11 | 11 |
* @platform WebsiteBaker 2.8.x |
12 | 12 |
* @requirements PHP 5.2.2 and higher |
... | ... | |
112 | 112 |
// get width and height of captcha image for use in <iframe> |
113 | 113 |
switch(CAPTCHA_TYPE) { |
114 | 114 |
case 'calc_image': |
115 |
$captcha_width = 142;
|
|
116 |
$captcha_height = 30;
|
|
115 |
$captcha_width = 160;
|
|
116 |
$captcha_height = 55;
|
|
117 | 117 |
break; |
118 | 118 |
case 'calc_ttf_image': |
119 |
$captcha_width = 162;
|
|
120 |
$captcha_height = 40;
|
|
119 |
$captcha_width = 175;
|
|
120 |
$captcha_height = 55;
|
|
121 | 121 |
break; |
122 | 122 |
case 'ttf_image': |
123 |
$captcha_width = 162;
|
|
124 |
$captcha_height = 40;
|
|
123 |
$captcha_width = 175;
|
|
124 |
$captcha_height = 55;
|
|
125 | 125 |
break; |
126 | 126 |
case 'old_image': |
127 |
$captcha_width = 142;
|
|
128 |
$captcha_height = 30;
|
|
127 |
$captcha_width = 160;
|
|
128 |
$captcha_height = 55;
|
|
129 | 129 |
break; |
130 | 130 |
default: |
131 | 131 |
$captcha_width = 250; |
... | ... | |
150 | 150 |
<?php include(WB_PATH.'/include/captcha/captchas/'.CAPTCHA_TYPE.'.php'); ?> |
151 | 151 |
</td> |
152 | 152 |
<td> = </td> |
153 |
<td><input type="text" name="captcha" maxlength="10" style="width:20px;" /></td>
|
|
153 |
<td><input type="text" name="captcha" maxlength="10" style="width:30px;" /></td>
|
|
154 | 154 |
<td class="captcha_expl"><?php echo $MOD_CAPTCHA['VERIFICATION_INFO_RES']; ?></td> |
155 | 155 |
</tr></table><?php |
156 | 156 |
break; |
157 | 157 |
case 'calc_image': // calculation with image (old captcha) |
158 | 158 |
case 'calc_ttf_image': // calculation with varying background and ttf-font |
159 |
?><table class="captcha_table"><tr> |
|
159 |
?><table class="captcha_table" style="font-size: 100%;"><tr>
|
|
160 | 160 |
<td class="image_captcha"> |
161 |
<?php echo "<iframe class=\"captcha_iframe\" width=\"$captcha_width\" height=\"$captcha_height\" scrolling=\"no\" marginheight=\"0\" marginwidth=\"0\" frameborder=\"0\" name=\"captcha_iframe_$sec_id\" src=\"". WB_URL ."/include/captcha/captcha.php?display_captcha_X986E21=1&s=$sec_id"; ?>">
|
|
162 |
<img src="<?php echo WB_URL.'/include/captcha/captchas/'.CAPTCHA_TYPE.".php?t=$t&s=$sec_id"; ?>" alt="Captcha" /> |
|
161 |
<?php echo "<iframe class=\"captcha_iframe\" width=\"$captcha_width\" height=\"$captcha_height\" style=\"overflow:hidden;border: 1px solid #999;\" name=\"captcha_iframe_$sec_id\" src=\"". WB_URL ."/include/captcha/captcha.php?display_captcha_X986E21=1&s=$sec_id"; ?>">
|
|
162 |
<img src="<?php echo WB_URL.'/include/captcha/captchas/'.CAPTCHA_TYPE.".php?t=$t&s=$sec_id"; ?>" alt="Captcha" style="margin: 0;padding: 0;" />
|
|
163 | 163 |
</iframe> |
164 | 164 |
</td> |
165 | 165 |
<td> = </td> |
166 |
<td><input type="text" name="captcha" maxlength="10" style="width:20px;" /></td>
|
|
166 |
<td><input type="text" name="captcha" maxlength="10" style="width:30px;" /></td>
|
|
167 | 167 |
<td class="captcha_expl"><?php echo $MOD_CAPTCHA['VERIFICATION_INFO_RES']; ?></td> |
168 | 168 |
</tr></table><?php |
169 | 169 |
break; |
... | ... | |
172 | 172 |
case 'old_image': // old captcha |
173 | 173 |
?><table class="captcha_table"><tr> |
174 | 174 |
<td class="image_captcha"> |
175 |
<?php echo "<iframe class=\"captcha_iframe\" width=\"$captcha_width\" height=\"$captcha_height\" scrolling=\"no\" marginheight=\"0\" marginwidth=\"0\" frameborder=\"0\" name=\"captcha_iframe_$sec_id\" src=\"". WB_URL ."/include/captcha/captcha.php?display_captcha_X986E21=1&s=$sec_id"; ?>">
|
|
176 |
<img src="<?php echo WB_URL.'/include/captcha/captchas/'.CAPTCHA_TYPE.".php?t=$t&s=$sec_id"; ?>" alt="Captcha" /> |
|
175 |
<?php echo "<iframe class=\"captcha_iframe\" width=\"$captcha_width\" height=\"$captcha_height\" style=\"overflow:hidden;border: 1px solid #999;\" name=\"captcha_iframe_$sec_id\" src=\"". WB_URL ."/include/captcha/captcha.php?display_captcha_X986E21=1&s=$sec_id"; ?> " >
|
|
176 |
<img src="<?php echo WB_URL.'/include/captcha/captchas/'.CAPTCHA_TYPE.".php?t=$t&s=$sec_id"; ?>" alt="Captcha" style="margin: 0;padding: 0;" />
|
|
177 | 177 |
</iframe> |
178 | 178 |
</td> |
179 | 179 |
<td></td> |
... | ... | |
253 | 253 |
} |
254 | 254 |
} |
255 | 255 |
} |
256 |
|
branches/2.8.x/wb/admin/media/upload.php | ||
---|---|---|
4 | 4 |
* @category admin |
5 | 5 |
* @package media |
6 | 6 |
* @author Ryan Djurovich,WebsiteBaker Project |
7 |
* @copyright 2009-2012, WebsiteBaker Org. e.V.
|
|
8 |
* @link http://www.websitebaker2.org/
|
|
7 |
* @copyright 2009-2013, WebsiteBaker Org. e.V.
|
|
8 |
* @link http://www.websitebaker.org/
|
|
9 | 9 |
* @license http://www.gnu.org/licenses/gpl.html |
10 | 10 |
* @platform WebsiteBaker 2.8.x |
11 | 11 |
* @requirements PHP 5.2.2 and higher |
12 | 12 |
* @version $Id$ |
13 |
* @filesource $HeadURL$
|
|
13 |
* @filesource $HeadURL$
|
|
14 | 14 |
* @lastmodified $Date$ |
15 | 15 |
* |
16 | 16 |
*/ |
... | ... | |
67 | 67 |
|
68 | 68 |
$file_extension_string = ''; |
69 | 69 |
// Get list of file types to which we're supposed to append 'txt' |
70 |
$sql = 'SELECT ´value´ FROM ´'.TABLE_PREFIX. 'settings´ '.
|
|
71 |
'WHERE ´name´=\'rename_files_on_upload\'';
|
|
70 |
$sql = 'SELECT `value` FROM `'.TABLE_PREFIX. 'settings` '.
|
|
71 |
'WHERE `name`=\'rename_files_on_upload\'';
|
|
72 | 72 |
|
73 | 73 |
if($oRes = $database->query($sql)) { |
74 | 74 |
$aResult = $oRes->fetchRow(MYSQL_ASSOC); |
branches/2.8.x/wb/admin/interface/version.php | ||
---|---|---|
51 | 51 |
|
52 | 52 |
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) |
53 | 53 |
if(!defined('VERSION')) define('VERSION', '2.8.3'); |
54 |
if(!defined('REVISION')) define('REVISION', '1897');
|
|
54 |
if(!defined('REVISION')) define('REVISION', '1898');
|
|
55 | 55 |
if(!defined('SP')) define('SP', ''); |
branches/2.8.x/wb/account/languages/EN.php | ||
---|---|---|
156 | 156 |
$TEXT['ACTIVATION'] = 'Activate'; |
157 | 157 |
$TEXT['SEND'] = 'Request'; |
158 | 158 |
$TEXT['USERNAME'] = 'Login name'; |
159 |
$TEXT['INFO'] = ''; |
branches/2.8.x/wb/account/languages/DE.php | ||
---|---|---|
163 | 163 |
$TEXT['ACTIVATION'] = 'Freischalten'; |
164 | 164 |
$TEXT['SEND'] = 'Anfordern'; |
165 | 165 |
$TEXT['USERNAME'] = 'Loginname'; |
166 |
$TEXT['INFO'] = ''; |
branches/2.8.x/wb/account/signup_form.php | ||
---|---|---|
4 | 4 |
* @category frontend |
5 | 5 |
* @package account |
6 | 6 |
* @author Ryan Djurovich, WebsiteBaker Project |
7 |
* @copyright 2009-2012, WebsiteBaker Org. e.V.
|
|
8 |
* @link http://www.websitebaker2.org/
|
|
7 |
* @copyright 2009-2013, WebsiteBaker Org. e.V.
|
|
8 |
* @link http://www.websitebaker.org/
|
|
9 | 9 |
* @license http://www.gnu.org/licenses/gpl.html |
10 | 10 |
* @platform WebsiteBaker 2.8.x |
11 | 11 |
* @requirements PHP 5.2.2 and higher |
12 | 12 |
* @version $Id$ |
13 |
* @filesource $HeadURL$
|
|
13 |
* @filesource $HeadURL$
|
|
14 | 14 |
* @lastmodified $Date$ |
15 | 15 |
* |
16 | 16 |
*/ |
... | ... | |
102 | 102 |
|
103 | 103 |
// login label vars |
104 | 104 |
$oTpl->set_var(array( |
105 |
'TEXT_INFO' => $SFS_TEXT['INFO'],
|
|
105 |
'TEXT_INFO' => $TEXT['INFO'], |
|
106 | 106 |
'TEXT_USERNAME' => $TEXT['USERNAME'], |
107 | 107 |
'TEXT_DISPLAY_NAME' => $TEXT['DISPLAY_NAME'], |
108 | 108 |
'TEXT_EMAIL' => $TEXT['EMAIL'], |
branches/2.8.x/wb/modules/form/info.php | ||
---|---|---|
4 | 4 |
* @category module |
5 | 5 |
* @package Form |
6 | 6 |
* @author WebsiteBaker Project |
7 |
* @copyright 2009-2012, WebsiteBaker Org. e.V.
|
|
8 |
* @link http://www.websitebaker2.org/
|
|
7 |
* @copyright 2009-2013, WebsiteBaker Org. e.V.
|
|
8 |
* @link http://www.websitebaker.org/
|
|
9 | 9 |
* @license http://www.gnu.org/licenses/gpl.html |
10 | 10 |
* @platform WebsiteBaker 2.8.3 |
11 | 11 |
* @requirements PHP 5.2.2 and higher |
12 | 12 |
* @version $Id$ |
13 |
* @filesource $HeadURL$
|
|
13 |
* @filesource $HeadURL$
|
|
14 | 14 |
* @lastmodified $Date$ |
15 | 15 |
* @description |
16 | 16 |
*/ |
branches/2.8.x/wb/modules/form/view.php | ||
---|---|---|
4 | 4 |
* @category module |
5 | 5 |
* @package Form |
6 | 6 |
* @author WebsiteBaker Project |
7 |
* @copyright 2009-2012, WebsiteBaker Org. e.V.
|
|
8 |
* @link http://www.websitebaker2.org/
|
|
7 |
* @copyright 2009-2013, WebsiteBaker Org. e.V.
|
|
8 |
* @link http://www.websitebaker.org/
|
|
9 | 9 |
* @license http://www.gnu.org/licenses/gpl.html |
10 | 10 |
* @platform WebsiteBaker 2.8.x |
11 | 11 |
* @requirements PHP 5.2.2 and higher |
12 | 12 |
* @version $Id$ |
13 |
* @filesource $HeadURL$
|
|
13 |
* @filesource $HeadURL$
|
|
14 | 14 |
* @lastmodified $Date$ |
15 | 15 |
* @description |
16 | 16 |
*/ |
... | ... | |
162 | 162 |
if($query_fields->numRows() > 0) { |
163 | 163 |
?> |
164 | 164 |
<form <?php echo ( ( (strlen($form_name) > 0) AND (false == $use_xhtml_strict) ) ? "id=\"".$form_name.$section_id."\"" : ""); ?> action="<?php echo htmlspecialchars(strip_tags($_SERVER['SCRIPT_NAME'])).'';?>" method="post"> |
165 |
<fieldset> |
|
165 |
<fieldset class="frm-fieldset">
|
|
166 | 166 |
<input type="hidden" name="submission_id" value="<?php echo $_SESSION['form_submission_id']; ?>" /> |
167 | 167 |
<?php |
168 | 168 |
$iFormRequestId = isset($_GET['fri']) ? intval($_GET['fri']) : 0; |
... | ... | |
456 | 456 |
|
457 | 457 |
// Check if the user forgot to enter values into all the required fields |
458 | 458 |
if(sizeof($required )) { |
459 |
|
|
459 |
echo "<div class=\"frm-warning\">\n"; |
|
460 | 460 |
if(!isset($MESSAGE['MOD_FORM_REQUIRED_FIELDS'])) { |
461 | 461 |
echo '<h3>You must enter details for the following fields</h3>'; |
462 | 462 |
} else { |
463 | 463 |
echo '<h3>'.$MESSAGE['MOD_FORM_REQUIRED_FIELDS'].'</h3>'; |
464 | 464 |
} |
465 |
echo "<ol class=\"warning\">\n";
|
|
465 |
echo "<ol>\n"; |
|
466 | 466 |
foreach($required AS $field_title) { |
467 | 467 |
if($field_title!=''){ |
468 | 468 |
echo '<li>'.$field_title."</li>\n"; |
469 | 469 |
} |
470 | 470 |
} |
471 |
|
|
472 | 471 |
if(isset($email_error)) { |
473 | 472 |
echo '<li>'.$email_error."</li>\n"; |
474 | 473 |
} |
475 |
|
|
476 | 474 |
if(isset($captcha_error)) { |
477 | 475 |
echo '<li>'.$captcha_error."</li>\n"; |
478 | 476 |
} |
479 | 477 |
// Create blank "required" array |
480 | 478 |
$required = array(); |
481 | 479 |
echo "</ol>\n"; |
482 |
|
|
483 |
echo '<p> </p>'."\n".'<p><a href="'.htmlspecialchars(strip_tags($_SERVER['SCRIPT_NAME'])).'">'.$TEXT['BACK'].'</a></p>'."\n";
|
|
480 |
echo "</div>\n"; |
|
481 |
echo '<p class="frm-warning"><a href="'.htmlspecialchars(strip_tags($_SERVER['SCRIPT_NAME'])).'">'.$TEXT['BACK'].'</a></p>'."\n";
|
|
484 | 482 |
} else { |
485 | 483 |
if(isset($email_error)) { |
486 |
echo '<br /><ol class=\"warning\">'."\n"; |
|
484 |
echo "<div class=\"frm-warning\">\n"; |
|
485 |
echo '<br /><ol>'."\n"; |
|
487 | 486 |
echo '<li>'.$email_error.'</li>'."\n"; |
488 | 487 |
echo '</ol>'."\n"; |
489 |
echo '<a href="'.htmlspecialchars(strip_tags($_SERVER['SCRIPT_NAME'])).'">'.$TEXT['BACK'].'</a>'; |
|
488 |
echo "</div>\n"; |
|
489 |
echo '<p class="frm-warning"><a href="'.htmlspecialchars(strip_tags($_SERVER['SCRIPT_NAME'])).'">'.$TEXT['BACK'].'</a></p>'."\n"; |
|
490 | 490 |
} elseif(isset($captcha_error)) { |
491 |
echo '<br /><ol class=\"warning\">'."\n"; |
|
491 |
echo "<div class=\"frm-warning\">\n"; |
|
492 |
echo '<br /><ol>'."\n"; |
|
492 | 493 |
echo '<li>'.$captcha_error.'</li>'."\n"; |
493 | 494 |
echo '</ol>'."\n"; |
494 |
echo '<p> </p>'."\n".'<p><a href="'.htmlspecialchars(strip_tags($_SERVER['SCRIPT_NAME'])).'">'.$TEXT['BACK'].'</a></p>'."\n"; |
|
495 |
echo "</div>\n"; |
|
496 |
echo '<p class="frm-warning"><a href="'.htmlspecialchars(strip_tags($_SERVER['SCRIPT_NAME'])).'">'.$TEXT['BACK'].'</a></p>'."\n"; |
|
495 | 497 |
} else { |
496 |
// Check how many times form has been submitted in last hour
|
|
498 |
// Check how many times form has been submitted in last hour |
|
497 | 499 |
$last_hour = time()-3600; |
498 | 500 |
$sql = 'SELECT `submission_id` FROM `'.TABLE_PREFIX.'mod_form_submissions` '; |
499 | 501 |
$sql .= 'WHERE `submitted_when` >= '.$last_hour.''; |
... | ... | |
502 | 504 |
{ |
503 | 505 |
if($query_submissions->numRows() > $max_submissions) |
504 | 506 |
{ |
505 |
// Too many submissions so far this hour
|
|
507 |
// Too many submissions so far this hour |
|
506 | 508 |
echo $MESSAGE['MOD_FORM_EXCESS_SUBMISSIONS']; |
507 | 509 |
$success = false; |
508 | 510 |
} else { |
branches/2.8.x/wb/modules/form/frontend.css | ||
---|---|---|
1 |
.frm-field_table { width :100%; vertical-align :middle; table-layout :auto; border-collapse :separate; border :none; } |
|
2 |
.frm-field_table tbody { font-size : 100%; padding :0.4em 0.2em; } |
|
3 |
.frm-field_table tbody td { border :none; } |
|
4 |
.frm-field_table tbody td.field_heading, |
|
5 |
.frm-field_table tbody td.frm-field_heading { border-bottom :2px solid #666666; color :#666666; font-weight :bold; padding-top :0.5em; } |
|
6 |
.frm-required { color :#ff0000; } |
|
7 |
.frm-field_title { width :25%; vertical-align :top; white-space :nowrap; text-align :right; } |
|
8 |
.frm-textfield { width :90%; } |
|
9 |
.frm-textarea { width :100%; height :100px; } |
|
10 |
.frm-select { width :50%; } |
|
11 |
.frm-select option { width :95%; } |
|
12 |
.frm-field_checkbox { cursor :pointer; width :2em; vertical-align :middle; } |
|
13 |
.frm-checkbox_label { cursor :pointer; vertical-align :middle; } |
|
14 |
.frm-radio_label { cursor :pointer; } |
|
15 |
.frm-email { width : 90%; } |
|
16 |
/*** Don't remove the class nixhier, this is required for ASP ***/ |
|
17 |
.nixhier, |
|
18 |
.frm-nixhier { display :none; } |
|
19 |
.frm-submission { margin :0 auto; position :relative; width :auto; } |
|
20 |
.print-email { font-size :0.8em; color :#000; margin :10px auto; } |
|
21 |
.frm-warning { background :#ffeeee; border :0.2em #884444 solid; color :#e10000; margin-bottom :1em; padding :0.8em; font-size :1.2em; font-weight :bold; } |
|
22 |
.frm-note { background :#eeffee; border :0.2em #448844 solid; color :#004400; margin-bottom :1em; padding :0.8em; font-size :1.2em; font-weight :bold; } |
|
23 |
.previewPrintTop { text-align :right; } |
|
24 |
.previewPrintTop img { padding-left :1em; } |
|
25 |
.frm-thankyou { } |
|
26 |
.frm-tbody { } |
|
1 |
.frm-field_table { width :100%; vertical-align :middle; table-layout :auto; border-collapse :separate; border :none; } |
|
2 |
.frm-field_table tbody { font-size :100%; padding :0.4em 0.2em; } |
|
3 |
.frm-field_table tbody td { border :none; } |
|
4 |
.frm-field_table tbody td.field_heading, |
|
5 |
.frm-field_table tbody td.frm-field_heading { border-bottom :2px solid #666666; color :#666666; font-weight :bold; padding-top :0.5em; } |
|
6 |
.frm-required { color :#FF0000; } |
|
7 |
.frm-field_title { width :25%; vertical-align :top; white-space :nowrap; text-align :right; } |
|
8 |
.frm-textfield { width :90%; } |
|
9 |
.frm-textarea { width :100%; height :100px; } |
|
10 |
.frm-select { width :50%; } |
|
11 |
.frm-select option { width :95%; } |
|
12 |
.frm-field_checkbox { cursor :pointer; width :2em; vertical-align :middle; } |
|
13 |
.frm-checkbox_label { cursor :pointer; vertical-align :middle; } |
|
14 |
.frm-radio_label { cursor :pointer; } |
|
15 |
.frm-email { width :90%; } |
|
16 |
/*** Don't remove the class nixhier, this is required for ASP ***/ |
|
17 |
.nixhier, |
|
18 |
.frm-nixhier { display :none; } |
|
19 |
.frm-submission { margin :0 auto; position :relative; width :auto; } |
|
20 |
.print-email { font-size :0.8em; color :#000000; margin :10px auto; } |
|
21 |
.frm-warning { background :#FFEEEE; border :0.1em #884444 solid; color :#E10000; margin-bottom :1em; padding :0.5em 2.8em; font-size :96.5%; font-weight :normal; } |
|
22 |
.frm-note { background :#EEFFEE; border :0.2em #448844 solid; color :#004400; margin-bottom :1em; padding :0.8em; font-size :1.2em; font-weight :bold; } |
|
23 |
.previewprinttop { text-align :right; } |
|
24 |
.previewprinttop img { padding-left :1em; } |
|
25 |
.frm-thankyou { } |
|
26 |
.frm-tbody { } |
|
27 |
.frm-warning h3 { font-size :120%; line-height :1.3em; margin :0.1em; padding :0.1em; } |
|
28 |
.frm-warning ol { color :#333333; margin :0.1em; } |
|
29 |
.frm-field_table input[type="submit"] { padding :0.1em 0.8em; } |
|
30 |
.frm-warning a, |
|
31 |
p.frm-warning a { background :transparent; padding-left :0; } |
|
32 |
fieldset.frm-fieldset { border :none; } |
branches/2.8.x/wb/modules/form/add.php | ||
---|---|---|
4 | 4 |
* @category module |
5 | 5 |
* @package Form |
6 | 6 |
* @author WebsiteBaker Project |
7 |
* @copyright 2009-2011, Website Baker Org. e.V.
|
|
8 |
* @link http://www.websitebaker2.org/
|
|
7 |
* @copyright 2009-2013, WebsiteBaker Org. e.V.
|
|
8 |
* @link http://www.websitebaker.org/
|
|
9 | 9 |
* @license http://www.gnu.org/licenses/gpl.html |
10 | 10 |
* @platform WebsiteBaker 2.8.x |
11 | 11 |
* @requirements PHP 5.2.2 and higher |
12 | 12 |
* @version $Id$ |
13 |
* @filesource $HeadURL$
|
|
13 |
* @filesource $HeadURL$
|
|
14 | 14 |
* @lastmodified $Date$ |
15 | 15 |
* @description |
16 | 16 |
*/ |
17 | 17 |
|
18 |
// Must include code to stop this file being access directly |
|
19 |
/* -------------------------------------------------------- */ |
|
20 |
if(defined('WB_PATH') == false) |
|
21 |
{ |
|
22 |
// Stop this file being access directly |
|
23 |
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>'); |
|
24 |
} |
|
25 |
/* -------------------------------------------------------- */ |
|
18 |
if(!defined('WB_PATH')) { |
|
19 |
require_once(dirname(dirname(dirname(__FILE__))).'/framework/globalExceptionHandler.php'); |
|
20 |
throw new IllegalFileException(); |
|
21 |
} else { |
|
22 |
$table_name = TABLE_PREFIX.'mod_form_settings'; |
|
23 |
$field_name = 'perpage_submissions'; |
|
24 |
$description = "INT NOT NULL DEFAULT '10' AFTER `max_submissions`"; |
|
25 |
if(!$database->field_exists($table_name,$field_name)) { |
|
26 |
$database->field_add($table_name, $field_name, $description); |
|
27 |
} |
|
26 | 28 |
|
27 |
// ------------------------------------ |
|
28 |
$table_name = TABLE_PREFIX.'mod_form_settings'; |
|
29 |
$field_name = 'perpage_submissions'; |
|
30 |
$description = "INT NOT NULL DEFAULT '10' AFTER `max_submissions`"; |
|
31 |
if(!$database->field_exists($table_name,$field_name)) { |
|
32 |
$database->field_add($table_name, $field_name, $description); |
|
33 |
} |
|
34 |
// ------------------------------------ |
|
35 |
|
|
36 |
// Insert an extra rows into the database |
|
37 |
$header = '<table class="frm-field_table">'; |
|
38 |
$field_loop = '<tr>'.PHP_EOL.'<td class=\"frm-field_title\">{TITLE}{REQUIRED}:</td>'.PHP_EOL.'<td>{FIELD}</td>'.PHP_EOL.'</tr>'; |
|
39 |
$footer = '<tr>'.PHP_EOL.'<td> </td>'.PHP_EOL.' |
|
29 |
// Insert an extra rows into the database |
|
30 |
$header = '<table class="frm-field_table">'; |
|
31 |
$field_loop = '<tr>'.PHP_EOL.'<td class=\"frm-field_title\">{TITLE}{REQUIRED}:</td>'.PHP_EOL.'<td>{FIELD}</td>'.PHP_EOL.'</tr>'; |
|
32 |
$footer = '<tr>'.PHP_EOL.' |
|
40 | 33 |
<td>'.PHP_EOL.' |
41 | 34 |
<input type=\"submit\" name=\"submit\" value=\"{SUBMIT_FORM}\" />'.PHP_EOL.' |
42 | 35 |
</td>'.PHP_EOL.' |
43 | 36 |
</tr>'.PHP_EOL.' |
44 | 37 |
</table>'.PHP_EOL; |
45 |
$email_to = ''; |
|
46 |
$email_from = ''; |
|
47 |
$email_fromname = ''; |
|
48 |
$email_subject = ''; |
|
49 |
$success_page = 'none'; |
|
50 |
$success_email_to = ''; |
|
51 |
$success_email_from = ''; |
|
52 |
$success_email_fromname = ''; |
|
53 |
$success_email_text = ''; |
|
54 |
// $success_email_text = addslashes($success_email_text); |
|
55 |
$success_email_subject = ''; |
|
56 |
$max_submissions = 50; |
|
57 |
$stored_submissions = 50; |
|
58 |
$perpage_submissions = 10; |
|
59 |
$use_captcha = true; |
|
60 |
|
|
61 |
// $database->query("INSERT INTO ".TABLE_PREFIX."mod_form_settings (page_id,section_id,header,field_loop,footer,email_to,email_from,email_fromname,email_subject,success_page,success_email_to,success_email_from,success_email_fromname,success_email_text,success_email_subject,max_submissions,stored_submissions,use_captcha) VALUES ('$page_id','$section_id','$header','$field_loop','$footer','$email_to','$email_from','$email_fromname','$email_subject','$success_page','$success_email_to','$success_email_from','$success_email_fromname','$success_email_text','$success_email_subject','$max_submissions','$stored_submissions','$use_captcha')"); |
|
62 |
|
|
63 |
// Insert settings |
|
64 |
$sql = 'INSERT INTO `'.TABLE_PREFIX.'mod_form_settings` SET '; |
|
65 |
$sql .= '`section_id` = \''.$section_id.'\', '; |
|
66 |
$sql .= '`page_id` = \''.$page_id.'\', '; |
|
67 |
$sql .= '`header` = \''.$header.'\', '; |
|
68 |
$sql .= '`field_loop` = \''.$field_loop.'\', '; |
|
69 |
$sql .= '`footer` = \''.$footer.'\', '; |
|
70 |
$sql .= '`email_to` = \''.$email_to.'\', '; |
|
71 |
$sql .= '`email_from` = \''.$email_from.'\', '; |
|
72 |
$sql .= '`email_fromname` = \''.$email_fromname.'\', '; |
|
73 |
$sql .= '`email_subject` = \''.$email_subject.'\', '; |
|
74 |
$sql .= '`success_page` = \''.$success_page.'\', '; |
|
75 |
$sql .= '`success_email_to` = \''.$success_email_to.'\', '; |
|
76 |
$sql .= '`success_email_from` = \''.$success_email_from.'\', '; |
|
77 |
$sql .= '`success_email_fromname` = \''.$success_email_fromname.'\', '; |
|
78 |
$sql .= '`success_email_text` = \''.$success_email_text.'\', '; |
|
79 |
$sql .= '`success_email_subject` = \''.$success_email_subject.'\', '; |
|
80 |
$sql .= '`max_submissions` = \''.$max_submissions.'\', '; |
|
81 |
$sql .= '`stored_submissions` = \''.$stored_submissions.'\', '; |
|
82 |
$sql .= '`perpage_submissions` = \''.$perpage_submissions.'\', '; |
|
83 |
$sql .= '`use_captcha` = \''.$use_captcha.'\' '; |
|
84 |
$sql .= ''; |
|
85 |
if($database->query($sql)) { |
|
86 |
// $admin->print_success($TEXT['SUCCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id.$sec_anchor); |
|
38 |
$email_to = ''; |
|
39 |
$email_from = ''; |
|
40 |
$email_fromname = ''; |
|
41 |
$email_subject = ''; |
|
42 |
$success_page = 'none'; |
|
43 |
$success_email_to = ''; |
|
44 |
$success_email_from = ''; |
|
45 |
$success_email_fromname = ''; |
|
46 |
$success_email_text = ''; |
|
47 |
// $success_email_text = addslashes($success_email_text); |
|
48 |
$success_email_subject = ''; |
|
49 |
$max_submissions = 50; |
|
50 |
$stored_submissions = 50; |
|
51 |
$perpage_submissions = 10; |
|
52 |
$use_captcha = true; |
|
53 |
|
|
54 |
// Insert settings |
|
55 |
$sql = 'INSERT INTO `'.TABLE_PREFIX.'mod_form_settings` SET '; |
|
56 |
$sql .= '`section_id` = \''.$section_id.'\', '; |
|
57 |
$sql .= '`page_id` = \''.$page_id.'\', '; |
|
58 |
$sql .= '`header` = \''.$header.'\', '; |
|
59 |
$sql .= '`field_loop` = \''.$field_loop.'\', '; |
|
60 |
$sql .= '`footer` = \''.$footer.'\', '; |
|
61 |
$sql .= '`email_to` = \''.$email_to.'\', '; |
|
62 |
$sql .= '`email_from` = \''.$email_from.'\', '; |
|
63 |
$sql .= '`email_fromname` = \''.$email_fromname.'\', '; |
|
64 |
$sql .= '`email_subject` = \''.$email_subject.'\', '; |
|
65 |
$sql .= '`success_page` = \''.$success_page.'\', '; |
|
66 |
$sql .= '`success_email_to` = \''.$success_email_to.'\', '; |
|
67 |
$sql .= '`success_email_from` = \''.$success_email_from.'\', '; |
|
68 |
$sql .= '`success_email_fromname` = \''.$success_email_fromname.'\', '; |
|
69 |
$sql .= '`success_email_text` = \''.$success_email_text.'\', '; |
|
70 |
$sql .= '`success_email_subject` = \''.$success_email_subject.'\', '; |
|
71 |
$sql .= '`max_submissions` = \''.$max_submissions.'\', '; |
|
72 |
$sql .= '`stored_submissions` = \''.$stored_submissions.'\', '; |
|
73 |
$sql .= '`perpage_submissions` = \''.$perpage_submissions.'\', '; |
|
74 |
$sql .= '`use_captcha` = \''.$use_captcha.'\' '; |
|
75 |
$sql .= ''; |
|
76 |
if($database->query($sql)) { |
|
77 |
// $admin->print_success($TEXT['SUCCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id.$sec_anchor); |
|
78 |
} |
|
87 | 79 |
} |
branches/2.8.x/wb/modules/output_filter/index.php | ||
---|---|---|
4 | 4 |
* @category modules |
5 | 5 |
* @package output_filter |
6 | 6 |
* @author Christian Sommer, WB-Project, Werner v.d. Decken |
7 |
* @copyright 2011, Website Baker Org. e.V.
|
|
8 |
* @link http://www.websitebaker2.org/
|
|
7 |
* @copyright 2011, WebsiteBaker Org. e.V. |
|
8 |
* @link http://www.websitebaker.org/
|
|
9 | 9 |
* @license http://www.gnu.org/licenses/gpl.html |
10 | 10 |
* @platform WebsiteBaker 2.8.2 |
11 | 11 |
* @requirements PHP 5.2.2 and higher |
12 | 12 |
* @version $Id$ |
13 |
* @filesource $HeadURL$
|
|
13 |
* @filesource $HeadURL$
|
|
14 | 14 |
* @lastmodified $Date$ |
15 | 15 |
* |
16 | 16 |
*/ |
... | ... | |
90 | 90 |
// be sure field 'sys_rel' is in table |
91 | 91 |
$database->field_add( TABLE_PREFIX.'mod_output_filter', 'sys_rel', 'INT NOT NULL DEFAULT \'0\' FIRST'); |
92 | 92 |
// request settings from database |
93 |
$sql = 'SELECT * FROM `'.TABLE_PREFIX.'mod_output_filter'; |
|
93 |
$sql = 'SELECT * FROM `'.TABLE_PREFIX.'mod_output_filter` ';
|
|
94 | 94 |
if(($res = $database->query($sql))) { |
95 | 95 |
if(($rec = $res->fetchRow())) { |
96 | 96 |
$settings = $rec; |
Also available in: Unified diff
! update form module, add class frm-fieldset to fieldset, restyle error box
! update captcha iframe attribute settings