diff options
| author | David M <davidmj@users.sourceforge.net> | 2006-07-03 00:53:54 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2006-07-03 00:53:54 +0000 |
| commit | 1b48afeb30d9486945ea2ca8c1881c044947add5 (patch) | |
| tree | bb95645c94db92c0a96aad92a8a9d378338acc4f | |
| parent | 662e12d466ef95a8d0c90869e5009a92ce197756 (diff) | |
| download | forums-1b48afeb30d9486945ea2ca8c1881c044947add5.tar forums-1b48afeb30d9486945ea2ca8c1881c044947add5.tar.gz forums-1b48afeb30d9486945ea2ca8c1881c044947add5.tar.bz2 forums-1b48afeb30d9486945ea2ca8c1881c044947add5.tar.xz forums-1b48afeb30d9486945ea2ca8c1881c044947add5.zip | |
- Database: eh? meh.
- CAPTCHA: A little easier to see which options map to which controls
git-svn-id: file:///svn/phpbb/trunk@6141 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/adm/style/acp_captcha.html | 35 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_database.php | 14 |
2 files changed, 34 insertions, 15 deletions
diff --git a/phpBB/adm/style/acp_captcha.html b/phpBB/adm/style/acp_captcha.html index 3a446c5a12..90d0dc27f8 100644 --- a/phpBB/adm/style/acp_captcha.html +++ b/phpBB/adm/style/acp_captcha.html @@ -19,9 +19,10 @@ <dd><input type="radio" class="radio" id="enable_post_confirm" name="enable_post_confirm" value="1"<!-- IF POST_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_ENABLED} <input type="radio" class="radio" name="enable_post_confirm" value="0"<!-- IF not POST_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</dd> </dl> </fieldset> + <!-- IF GD --> <fieldset> - <legend>{L_CAPTCHA_OPTIONS}</legend> + <legend>{L_CAPTCHA_OVERLAP}</legend> <!-- IF TTF --> <dl> <dt><label for="policy_overlap">{L_CAPTCHA_OVERLAP}:</label><br /><span>{U_POLICY_OVERLAP}</span></dt> @@ -36,8 +37,11 @@ <dd><input id="policy_overlap_noise_line" name="policy_overlap_noise_line" value="1" class="radio" type="radio"<!-- IF OVERLAP_NOISE_LINE_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_YES} <input name="policy_overlap_noise_line" value="0" class="radio" type="radio"<!-- IF not OVERLAP_NOISE_LINE_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_NO}</dd> </dl> -<br /> +</fieldset> <!-- ENDIF --> + +<fieldset> + <legend>{L_CAPTCHA_ENTROPY}</legend> <dl> <dt><label for="policy_entropy">{L_CAPTCHA_ENTROPY}:</label><br /><span>{U_POLICY_ENTROPY}</span></dt> <dd><input id="policy_entropy" name="policy_entropy" value="1" class="radio" type="radio"<!-- IF ENTROPY_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_YES} <input name="policy_entropy" value="0" class="radio" type="radio"<!-- IF not ENTROPY_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_NO}</dd> @@ -51,8 +55,11 @@ <dt><label for="policy_entropy_noise_line">{L_ENTROPY_NOISE_LINE}:</label></dt> <dd><input id="policy_entropy_noise_line" name="policy_entropy_noise_line" value="1" class="radio" type="radio"<!-- IF ENTROPY_NOISE_LINE_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_YES} <input name="policy_entropy_noise_line" value="0" class="radio" type="radio"<!-- IF not ENTROPY_NOISE_LINE_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_NO}</dd> </dl> -<br /> +</fieldset> + <!-- IF TTF --> +<fieldset> + <legend>{L_CAPTCHA_SHAPE}</legend> <dl> <dt><label for="policy_shape">{L_CAPTCHA_SHAPE}:</label><br /><span>{U_POLICY_SHAPE}</span></dt> <dd><input id="policy_shape" name="policy_shape" value="1" class="radio" type="radio"<!-- IF SHAPE_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_YES} <input name="policy_shape" value="0" class="radio" type="radio"<!-- IF not SHAPE_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_NO}</dd> @@ -66,30 +73,42 @@ <dt><label for="policy_shape_noise_line">{L_SHAPE_NOISE_LINE}:</label></dt> <dd><input id="policy_shape_noise_line" name="policy_shape_noise_line" value="1" class="radio" type="radio"<!-- IF SHAPE_NOISE_LINE_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_YES} <input name="policy_shape_noise_line" value="0" class="radio" type="radio"<!-- IF not SHAPE_NOISE_LINE_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_NO}</dd> </dl> -<br /> +</fieldset> <!-- ENDIF --> + +<fieldset> + <legend>{L_CAPTCHA_3DBITMAP}</legend> <dl> <dt><label for="policy_3dbitmap">{L_CAPTCHA_3DBITMAP}:</label><br /><span>{U_POLICY_3DBITMAP}</span></dt> <dd><input id="policy_3dbitmap" name="policy_3dbitmap" value="1" class="radio" type="radio"<!-- IF THREEDBITMAP_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_YES} <input name="policy_3dbitmap" value="0" class="radio" type="radio"<!-- IF not THREEDBITMAP_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_NO}</dd> </dl> -<br /> +</fieldset> + <!-- IF TTF --> +<fieldset> + <legend>{L_CAPTCHA_CELLS}</legend> <dl> <dt><label for="policy_cells">{L_CAPTCHA_CELLS}:</label><br /><span>{U_POLICY_CELLS}</span></dt> <dd><input id="policy_cells" name="policy_cells" value="1" class="radio" type="radio"<!-- IF CELLS_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_YES} <input name="policy_cells" value="0" class="radio" type="radio"<!-- IF not CELLS_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_NO}</dd> </dl> -<br /> +</fieldset> + +<fieldset> + <legend>{L_CAPTCHA_STENCIL}</legend> <dl> <dt><label for="policy_stencil">{L_CAPTCHA_STENCIL}:</label><br /><span>{U_POLICY_STENCIL}</span></dt> <dd><input id="policy_stencil" name="policy_stencil" value="1" class="radio" type="radio"<!-- IF STENCIL_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_YES} <input name="policy_stencil" value="0" class="radio" type="radio"<!-- IF not STENCIL_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_NO}</dd> </dl> -<br /> +</fieldset> + +<fieldset> + <legend>{L_CAPTCHA_COMPOSITE}</legend> <dl> <dt><label for="policy_composite">{L_CAPTCHA_COMPOSITE}:</label><br /><span>{U_POLICY_COMPOSITE}</span></dt> <dd><input id="policy_composite" name="policy_composite" value="1" class="radio" type="radio"<!-- IF COMPOSITE_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_YES} <input name="policy_composite" value="0" class="radio" type="radio"<!-- IF not COMPOSITE_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_NO}</dd> </dl> -<!-- ENDIF --> </fieldset> +<!-- ENDIF --> <!-- ENDIF --> diff --git a/phpBB/includes/acp/acp_database.php b/phpBB/includes/acp/acp_database.php index 1429719df2..2ad28cc9fa 100644 --- a/phpBB/includes/acp/acp_database.php +++ b/phpBB/includes/acp/acp_database.php @@ -362,9 +362,9 @@ class acp_database case 'sqlite': // This is *not* my fault. The PHP guys forgot a call to finalize when they wrote this function. This forces all the tables to stay locked... - // They finally fixed it in 5.3 but 5.2 still have this so instead, we go and grab the column types by smashing open the sqlite_master table + // They finally fixed it in 5.1.3 but 5.1.2 and under still have this so instead, we go and grab the column types by smashing open the sqlite_master table // and grope around for things that remind us of datatypes... - if (version_compare(phpversion(), '5.3', '>=')) + if (version_compare(phpversion(), '5.1.3', '>=')) { $col_types = sqlite_fetch_column_types($table_name, $db->db_connect_id); } @@ -455,7 +455,7 @@ class acp_database // Grab all of the data from current table. $sql = "SELECT * - FROM {$table_name}"; + FROM $table_name"; $result = $db->sql_query($sql); $i_num_fields = pg_num_fields($result); @@ -576,7 +576,7 @@ class acp_database // Grab all of the data from current table. $sql = "SELECT * - FROM {$table_name}"; + FROM $table_name"; $result = $db->sql_query($sql); $retrieved_data = odbc_num_rows($result); @@ -687,7 +687,7 @@ class acp_database // Grab all of the data from current table. $sql = "SELECT * - FROM {$table_name}"; + FROM $table_name"; $result = $db->sql_query($sql); $retrieved_data = mssql_num_rows($result); @@ -798,7 +798,7 @@ class acp_database // Grab all of the data from current table. $sql = "SELECT * - FROM {$table_name}"; + FROM $table_name"; $result = $db->sql_query($sql); $i_num_fields = ibase_num_fields($result); @@ -883,7 +883,7 @@ class acp_database // Grab all of the data from current table. $sql = "SELECT * - FROM {$table_name}"; + FROM $table_name"; $result = $db->sql_query($sql); $i_num_fields = ocinumcols($result); |