diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-07-21 13:45:18 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-07-21 13:45:18 +0000 |
| commit | f0b2e3beb11c0d0d05e5810ac5f8bfcd0e6a0b49 (patch) | |
| tree | b0dad871b3d4793e4a76d63f422f9d491c17e88c | |
| parent | 5706375aaccb53c902433c65b89621760c642c52 (diff) | |
| download | forums-f0b2e3beb11c0d0d05e5810ac5f8bfcd0e6a0b49.tar forums-f0b2e3beb11c0d0d05e5810ac5f8bfcd0e6a0b49.tar.gz forums-f0b2e3beb11c0d0d05e5810ac5f8bfcd0e6a0b49.tar.bz2 forums-f0b2e3beb11c0d0d05e5810ac5f8bfcd0e6a0b49.tar.xz forums-f0b2e3beb11c0d0d05e5810ac5f8bfcd0e6a0b49.zip | |
Using block_vars to fake IF...ELSE...ENDIF capability
git-svn-id: file:///svn/phpbb/trunk@719 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/page_header.php | 5 | ||||
| -rw-r--r-- | phpBB/profile.php | 24 | ||||
| -rw-r--r-- | phpBB/templates/PSO/overall_header.tpl | 6 | ||||
| -rw-r--r-- | phpBB/templates/PSO/profile_add_body.tpl | 21 |
4 files changed, 43 insertions, 13 deletions
diff --git a/phpBB/includes/page_header.php b/phpBB/includes/page_header.php index ee1c65867f..64417637be 100644 --- a/phpBB/includes/page_header.php +++ b/phpBB/includes/page_header.php @@ -259,10 +259,7 @@ $template->assign_vars(array( // if(!$userdata['session_logged_in']) { - $template->set_filenames(array( - "loginbox" => "loginbox.tpl") - ); - $template->assign_var_from_handle("S_LOGINBOX", "loginbox"); + $template->assign_block_vars("loginbox", array()); } header ("Expires: " . gmdate("D, d M Y H:i:s", time()) . " GMT"); diff --git a/phpBB/profile.php b/phpBB/profile.php index 13d50421f3..0f47c7d822 100644 --- a/phpBB/profile.php +++ b/phpBB/profile.php @@ -1060,6 +1060,30 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode'])) "S_PROFILE_ACTION" => append_sid("profile.$phpEx")) ); + // + // This is another cheat using the block_var capability + // of the templates to 'fake' an IF...ELSE...ENDIF solution + // it works well :) + // + if( $board_config['allow_avatar_upload'] || $board_config['allow_avatar_local'] || $board_config['allow_avatar_remote'] ) + { + $template->assign_block_vars("avatarblock", array() ); + + if($board_config['allow_avatar_upload']) + { + $template->assign_block_vars("avatarblock.avatarupload", array() ); + } + if($board_config['allow_avatar_remote']) + { + $template->assign_block_vars("avatarblock.avatarremote", array() ); + } + if($board_config['allow_avatar_local']) + { + $template->assign_block_vars("avatarblock.avatargallery", array() ); + } + + } + $template->pparse("body"); include($phpbb_root_path . 'includes/page_tail.'.$phpEx); diff --git a/phpBB/templates/PSO/overall_header.tpl b/phpBB/templates/PSO/overall_header.tpl index 4334c83fad..a49eae5103 100644 --- a/phpBB/templates/PSO/overall_header.tpl +++ b/phpBB/templates/PSO/overall_header.tpl @@ -53,7 +53,11 @@ INPUT.text {font-family:"Courier New",courier;font-size:8pt;} <td align="center"><span class="gensmall">{L_LAST_VISIT} {S_LAST_VISIT_DATE}</span></td> <td align="right"><span class="gensmall"><a href="{U_PROFILE}">{L_PROFILE}</a> | <a href="{U_GROUP_CP}">{L_USERGROUPS}</a> | <a href="{U_LOGIN_LOGOUT}">{L_LOGIN_LOGOUT}</a></span></td> </tr> -{S_LOGINBOX} + <!-- BEGIN loginbox --> + <tr><form method="post" action="{S_LOGIN_ACTION}"> + <td colspan="3" align="right" valign="bottom"><span class="gensmall">{L_USERNAME}: <input class="text" type="text" name="username"> {L_PASSWORD}: <input type="password" name="password"> {L_AUTO_LOGIN}</font>: <input class="text" type="checkbox" name="autologin"> <input type="submit" name="submit" value="{L_LOGIN}"> </span></td> + </form></tr> + <!-- END loginbox --> </table></td> </tr> </table></td> diff --git a/phpBB/templates/PSO/profile_add_body.tpl b/phpBB/templates/PSO/profile_add_body.tpl index 9b3a088409..839a75e521 100644 --- a/phpBB/templates/PSO/profile_add_body.tpl +++ b/phpBB/templates/PSO/profile_add_body.tpl @@ -116,10 +116,10 @@ <td class="row1"><span class="gen">{L_DATE_FORMAT}:</span><br /><span class="gensmall">{L_DATE_FORMAT_EXPLAIN}</span></td> <td class="row2"><input type="text" name="dateformat" value="{DATE_FORMAT}" maxlength="16"></td> </tr> + <!-- BEGIN avatarblock --> <tr> <th class="secondary" colspan="2"> <b>{L_AVATAR_PANEL}</b></td> </tr> - <!-- IF $S_ALLOW_AVATAR_UPLOAD eq TRUE || $S_ALLOW_AVATAR_LOCAL eq TRUE || $S_ALLOW_AVATAR_REMOTE eq TRUE --> <tr> <td class="row1" colspan="2" align="center"><table width="70%" cellspacing="2" cellpadding="0" border="0"> <tr> @@ -128,8 +128,7 @@ </tr> </table></td> </tr> - <!-- ENDIF --> - <!-- IF $S_ALLOW_AVATAR_UPLOAD eq TRUE --> + <!-- BEGIN avatarupload --> <tr> <td class="row1"><span class="gen">{L_UPLOAD_AVATAR_FILE}:</span></td> <td class="row2"><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_SIZE}"><input type="file" name="avatar"></td> @@ -138,22 +137,28 @@ <td class="row1"><span class="gen">{L_UPLOAD_AVATAR_URL}:</span><br><span class="gensmall">{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></td> <td class="row2"><input type="text" name="avatarurl" size="40"></td> </tr> - <!-- ENDIF --> - <!-- IF $S_ALLOW_AVATAR_REMOTE eq TRUE --> + <!-- END avatarupload --> + <!-- BEGIN avatarremote --> <tr> <td class="row1"><span class="gen">{L_LINK_REMOTE_AVATAR}:</span><br><span class="gensmall">{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></td> <td class="row2"><input type="text" name="avatarremoteurl" size="40"></td> </tr> - <!-- ENDIF --> - <!-- IF $S_ALLOW_AVATAR_LOCAL eq TRUE --> + <!-- END avatarremote --> + <!-- BEGIN avatargallery --> <tr> <td class="row1"><span class="gen">{L_AVATAR_GALLERY}:</span></td> <td class="row2"><input type="submit" name="avatargallery" value="{L_SHOW_GALLERY}"></td> </tr> - <!-- ENDIF --> + <!-- END avatargallery --> + <!-- END avatarblock --> <tr> <td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{L_SUBMIT}"> <input type="reset" value="{L_RESET}"></td> </tr> </table></td> </form></tr> </table> + +<!-- IF $S_ALLOW_AVATAR_UPLOAD eq TRUE || $S_ALLOW_AVATAR_LOCAL eq TRUE || $S_ALLOW_AVATAR_REMOTE eq TRUE --> +<!-- IF $S_ALLOW_AVATAR_LOCAL eq TRUE --> +<!-- IF $S_ALLOW_AVATAR_REMOTE eq TRUE --> +<!-- IF $S_ALLOW_AVATAR_UPLOAD eq TRUE --> |