Project

General

Profile

« Previous | Next » 

Revision 1898

Added by Dietmar over 11 years ago

  1. bugfix missing trailing backtick in output_filter/input.php
  2. bugfix wrong backticks in 'admin/media/upload.php
  3. bugfix add missing language variable in account
    ! update form module, add class frm-fieldset to fieldset, restyle error box
    ! update captcha iframe attribute settings

View differences:

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>&nbsp;=&nbsp;</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&amp;s=$sec_id"; ?>">
162 
						<img src="<?php echo WB_URL.'/include/captcha/captchas/'.CAPTCHA_TYPE.".php?t=$t&amp;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&amp;s=$sec_id"; ?>">
162 
						<img src="<?php echo WB_URL.'/include/captcha/captchas/'.CAPTCHA_TYPE.".php?t=$t&amp;s=$sec_id"; ?>" alt="Captcha" style="margin: 0;padding:  0;" />
163 163 
						</iframe>
164 164 
					</td>
165 165 
					<td>&nbsp;=&nbsp;</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&amp;s=$sec_id"; ?>">
176 
						<img src="<?php echo WB_URL.'/include/captcha/captchas/'.CAPTCHA_TYPE.".php?t=$t&amp;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&amp;s=$sec_id"; ?> " >
176 
						<img src="<?php echo WB_URL.'/include/captcha/captchas/'.CAPTCHA_TYPE.".php?t=$t&amp;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 

  		












Also available in:  Unified diff