mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-07 20:08:53 +00:00
some changes/bugfixes
git-svn-id: file:///svn/phpbb/trunk@7241 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
parent
331a549c42
commit
9f82dec04b
19 changed files with 112 additions and 73 deletions
|
|
@ -116,9 +116,9 @@
|
|||
<select name="language_file">{S_LANG_OPTIONS}</select> <input type="submit" class="button2" name="change" value="{L_SELECT}" />
|
||||
</fieldset>
|
||||
|
||||
<br /><br /><br />
|
||||
<p> <br /> </p>
|
||||
|
||||
|
||||
<!-- DIRTY DIRTY DIRTY IE -->
|
||||
<!--[if lt IE 8]>
|
||||
<style type="text/css">
|
||||
input.langvalue, textarea.langvalue {
|
||||
|
|
|
|||
|
|
@ -871,7 +871,7 @@ dd input {
|
|||
}
|
||||
|
||||
dd select {
|
||||
fnt-size: 100%;
|
||||
font-size: 100%;
|
||||
width: auto;
|
||||
max-width: 100%;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -116,7 +116,7 @@ class acm
|
|||
}
|
||||
|
||||
$expired = true;
|
||||
include($this->cache_dir . $entry);
|
||||
@include($this->cache_dir . $entry);
|
||||
if ($expired)
|
||||
{
|
||||
@unlink($this->cache_dir . $entry);
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ class acp_board
|
|||
'default_dateformat' => array('lang' => 'DEFAULT_DATE_FORMAT', 'validate' => 'string', 'type' => 'custom', 'method' => 'dateformat_select', 'explain' => true),
|
||||
'board_timezone' => array('lang' => 'SYSTEM_TIMEZONE', 'validate' => 'string', 'type' => 'select', 'function' => 'tz_select', 'params' => array('{CONFIG_VALUE}', 1), 'explain' => false),
|
||||
'board_dst' => array('lang' => 'SYSTEM_DST', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false),
|
||||
'default_style' => array('lang' => 'DEFAULT_STYLE', 'validate' => 'int', 'type' => 'select', 'function' => 'style_select', 'params' => array('{CONFIG_VALUE}', 1), 'explain' => false),
|
||||
'default_style' => array('lang' => 'DEFAULT_STYLE', 'validate' => 'int', 'type' => 'select', 'function' => 'style_select', 'params' => array('{CONFIG_VALUE}', false), 'explain' => false),
|
||||
'override_user_style' => array('lang' => 'OVERRIDE_STYLE', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
|
||||
|
||||
'legend2' => 'WARNINGS',
|
||||
|
|
|
|||
|
|
@ -136,7 +136,7 @@ class acp_icons
|
|||
}
|
||||
|
||||
$after_txt = ($mode == 'smilies') ? $row['code'] : $row['icons_url'];
|
||||
$order_list = '<option value="' . ($row[$fields . '_order'] + 1) . '"' . $selected . '>' . sprintf($user->lang['AFTER_' . $lang], ' -> ' . htmlspecialchars($after_txt)) . '</option>' . $order_list;
|
||||
$order_list = '<option value="' . ($row[$fields . '_order'] + 1) . '"' . $selected . '>' . sprintf($user->lang['AFTER_' . $lang], ' -> ' . $after_txt) . '</option>' . $order_list;
|
||||
}
|
||||
}
|
||||
$db->sql_freeresult($result);
|
||||
|
|
|
|||
|
|
@ -105,9 +105,10 @@ class acp_language
|
|||
}
|
||||
|
||||
$hidden_data = build_hidden_fields(array(
|
||||
'file' => $this->language_file,
|
||||
'dir' => $this->language_directory,
|
||||
'method' => $method)
|
||||
'file' => $this->language_file,
|
||||
'dir' => $this->language_directory,
|
||||
'language_file' => $selected_lang_file,
|
||||
'method' => $method)
|
||||
);
|
||||
|
||||
$hidden_data .= build_hidden_fields(array('entry' => $_POST['entry']), true, STRIP);
|
||||
|
|
@ -301,21 +302,13 @@ class acp_language
|
|||
include_once($phpbb_root_path . 'includes/functions_transfer.' . $phpEx);
|
||||
$method = request_var('method', '');
|
||||
|
||||
switch ($method)
|
||||
if ($method != 'ftp' && $method != 'ftp_fsock')
|
||||
{
|
||||
case 'ftp':
|
||||
$transfer = new ftp(request_var('host', ''), request_var('username', ''), request_var('password', ''), request_var('root_path', ''), request_var('port', ''), request_var('timeout', ''));
|
||||
break;
|
||||
|
||||
case 'ftp_fsock':
|
||||
$transfer = new ftp_fsock(request_var('host', ''), request_var('username', ''), request_var('password', ''), request_var('root_path', ''), request_var('port', ''), request_var('timeout', ''));
|
||||
break;
|
||||
|
||||
default:
|
||||
trigger_error($user->lang['INVALID_UPLOAD_METHOD'], E_USER_ERROR);
|
||||
break;
|
||||
trigger_error($user->lang['INVALID_UPLOAD_METHOD'], E_USER_ERROR);
|
||||
}
|
||||
|
||||
$transfer = new $method(request_var('host', ''), request_var('username', ''), request_var('password', ''), request_var('root_path', ''), request_var('port', ''), request_var('timeout', ''));
|
||||
|
||||
if (($result = $transfer->open_session()) !== true)
|
||||
{
|
||||
trigger_error($user->lang[$result] . adm_back_link($this->u_action . '&action=details&id=' . $lang_id . '&language_file=' . urlencode($selected_lang_file)), E_USER_WARNING);
|
||||
|
|
|
|||
|
|
@ -121,7 +121,7 @@ class auth
|
|||
// But if we check for a global option only, we won't combine the options...
|
||||
if ($f != 0 && isset($this->acl_options['local'][$opt]))
|
||||
{
|
||||
if (isset($this->acl[$f]))
|
||||
if (isset($this->acl[$f]) && isset($this->acl[$f][$this->acl_options['local'][$opt]]))
|
||||
{
|
||||
$this->cache[$f][$opt] |= $this->acl[$f][$this->acl_options['local'][$opt]];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2874,7 +2874,7 @@ function parse_attachments($forum_id, &$message, &$attachments, &$update_count,
|
|||
{
|
||||
// Images
|
||||
case ATTACHMENT_CATEGORY_IMAGE:
|
||||
$l_downloaded_viewed = $user->lang['VIEWED'];
|
||||
$l_downloaded_viewed = 'VIEWED_COUNT';
|
||||
|
||||
$block_array += array(
|
||||
'S_IMAGE' => true,
|
||||
|
|
@ -2885,7 +2885,7 @@ function parse_attachments($forum_id, &$message, &$attachments, &$update_count,
|
|||
|
||||
// Images, but display Thumbnail
|
||||
case ATTACHMENT_CATEGORY_THUMB:
|
||||
$l_downloaded_viewed = $user->lang['VIEWED'];
|
||||
$l_downloaded_viewed = 'VIEWED_COUNT';
|
||||
$thumbnail_link = append_sid("{$phpbb_root_path}download.$phpEx", 'id=' . $attachment['attach_id'] . '&t=1&f=' . (int) $forum_id);
|
||||
|
||||
$block_array += array(
|
||||
|
|
@ -2896,7 +2896,7 @@ function parse_attachments($forum_id, &$message, &$attachments, &$update_count,
|
|||
|
||||
// Windows Media Streams
|
||||
case ATTACHMENT_CATEGORY_WM:
|
||||
$l_downloaded_viewed = $user->lang['VIEWED'];
|
||||
$l_downloaded_viewed = 'VIEWED_COUNT';
|
||||
|
||||
// Giving the filename directly because within the wm object all variables are in local context making it impossible
|
||||
// to validate against a valid session (all params can differ)
|
||||
|
|
@ -2915,7 +2915,7 @@ function parse_attachments($forum_id, &$message, &$attachments, &$update_count,
|
|||
// Real Media Streams
|
||||
case ATTACHMENT_CATEGORY_RM:
|
||||
case ATTACHMENT_CATEGORY_QUICKTIME:
|
||||
$l_downloaded_viewed = $user->lang['VIEWED'];
|
||||
$l_downloaded_viewed = 'VIEWED_COUNT';
|
||||
|
||||
$block_array += array(
|
||||
'S_RM_FILE' => ($display_cat == ATTACHMENT_CATEGORY_RM) ? true : false,
|
||||
|
|
@ -2932,7 +2932,7 @@ function parse_attachments($forum_id, &$message, &$attachments, &$update_count,
|
|||
case ATTACHMENT_CATEGORY_FLASH:
|
||||
list($width, $height) = getimagesize($filename);
|
||||
|
||||
$l_downloaded_viewed = $user->lang['VIEWED'];
|
||||
$l_downloaded_viewed = 'VIEWED_COUNT';
|
||||
|
||||
$block_array += array(
|
||||
'S_FLASH_FILE' => true,
|
||||
|
|
@ -2945,7 +2945,7 @@ function parse_attachments($forum_id, &$message, &$attachments, &$update_count,
|
|||
break;
|
||||
|
||||
default:
|
||||
$l_downloaded_viewed = $user->lang['DOWNLOADED'];
|
||||
$l_downloaded_viewed = 'DOWNLOAD_COUNT';
|
||||
|
||||
$block_array += array(
|
||||
'S_FILE' => true,
|
||||
|
|
@ -2953,11 +2953,10 @@ function parse_attachments($forum_id, &$message, &$attachments, &$update_count,
|
|||
break;
|
||||
}
|
||||
|
||||
$l_download_count = (!isset($attachment['download_count']) || $attachment['download_count'] == 0) ? $user->lang['DOWNLOAD_NONE'] : (($attachment['download_count'] == 1) ? sprintf($user->lang['DOWNLOAD_COUNT'], $attachment['download_count']) : sprintf($user->lang['DOWNLOAD_COUNTS'], $attachment['download_count']));
|
||||
$l_download_count = (!isset($attachment['download_count']) || $attachment['download_count'] == 0) ? $user->lang[$l_downloaded_viewed . '_NONE'] : (($attachment['download_count'] == 1) ? sprintf($user->lang[$l_downloaded_viewed], $attachment['download_count']) : sprintf($user->lang[$l_downloaded_viewed . 'S'], $attachment['download_count']));
|
||||
|
||||
$block_array += array(
|
||||
'U_DOWNLOAD_LINK' => $download_link,
|
||||
'L_DOWNLOADED_VIEWED' => $l_downloaded_viewed,
|
||||
'L_DOWNLOAD_COUNT' => $l_download_count
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,8 +32,8 @@ class transfer
|
|||
{
|
||||
global $phpbb_root_path;
|
||||
|
||||
$this->file_perms = '0644';
|
||||
$this->dir_perms = '0777';
|
||||
$this->file_perms = 0644;
|
||||
$this->dir_perms = 0777;
|
||||
|
||||
// We use the store directory as temporary path to circumvent open basedir restrictions
|
||||
$this->tmp_path = $phpbb_root_path . 'store/';
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ class ucp_activate
|
|||
$user_id = request_var('u', 0);
|
||||
$key = request_var('k', '');
|
||||
|
||||
$sql = 'SELECT user_id, username, user_type, user_email, user_newpasswd, user_lang, user_notify_type, user_actkey
|
||||
$sql = 'SELECT user_id, username, user_type, user_email, user_newpasswd, user_lang, user_notify_type, user_actkey, user_inactive_reason
|
||||
FROM ' . USERS_TABLE . "
|
||||
WHERE user_id = $user_id";
|
||||
$result = $db->sql_query($sql);
|
||||
|
|
@ -101,7 +101,14 @@ class ucp_activate
|
|||
}
|
||||
else
|
||||
{
|
||||
$message = (!$update_password) ? 'ACCOUNT_ACTIVE' : 'PASSWORD_ACTIVATED';
|
||||
if (!$update_password)
|
||||
{
|
||||
$message = ($user_row['user_inactive_reason'] == INACTIVE_PROFILE) ? 'ACCOUNT_ACTIVE_PROFILE' : 'ACCOUNT_ACTIVE';
|
||||
}
|
||||
else
|
||||
{
|
||||
$message = 'PASSWORD_ACTIVATED';
|
||||
}
|
||||
}
|
||||
|
||||
meta_refresh(3, append_sid("{$phpbb_root_path}index.$phpEx"));
|
||||
|
|
|
|||
|
|
@ -923,17 +923,25 @@ function handle_message_list_actions(&$address_list, &$error, $remove_u, $remove
|
|||
global $auth, $db, $user;
|
||||
|
||||
// Delete User [TO/BCC]
|
||||
if ($remove_u)
|
||||
if ($remove_u && !empty($_REQUEST['remove_u']) && is_array($_REQUEST['remove_u']))
|
||||
{
|
||||
$remove_user_id = array_keys($_REQUEST['remove_u']);
|
||||
unset($address_list['u'][(int) $remove_user_id[0]]);
|
||||
|
||||
if (isset($remove_user_id[0]))
|
||||
{
|
||||
unset($address_list['u'][(int) $remove_user_id[0]]);
|
||||
}
|
||||
}
|
||||
|
||||
// Delete Group [TO/BCC]
|
||||
if ($remove_g)
|
||||
if ($remove_g && !empty($_REQUEST['remove_g']) && is_array($_REQUEST['remove_g']))
|
||||
{
|
||||
$remove_group_id = array_keys($_REQUEST['remove_g']);
|
||||
unset($address_list['g'][(int) $remove_group_id[0]]);
|
||||
|
||||
if (isset($remove_group_id[0]))
|
||||
{
|
||||
unset($address_list['g'][(int) $remove_group_id[0]]);
|
||||
}
|
||||
}
|
||||
|
||||
// Add User/Group [TO]
|
||||
|
|
|
|||
|
|
@ -116,8 +116,12 @@ class ucp_profile
|
|||
add_log('user', $user->data['user_id'], 'LOG_USER_UPDATE_EMAIL', $data['username'], $user->data['user_email'], $data['email']);
|
||||
}
|
||||
|
||||
$message = 'PROFILE_UPDATED';
|
||||
|
||||
if ($config['email_enable'] && $data['email'] != $user->data['user_email'] && $user->data['user_type'] != USER_FOUNDER && ($config['require_activation'] == USER_ACTIVATION_SELF || $config['require_activation'] == USER_ACTIVATION_ADMIN))
|
||||
{
|
||||
$message = ($config['require_activation'] == USER_ACTIVATION_SELF) ? 'ACCOUNT_EMAIL_CHANGED' : 'ACCOUNT_EMAIL_CHANGED_ADMIN';
|
||||
|
||||
include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
|
||||
|
||||
$server_url = generate_board_url();
|
||||
|
|
@ -184,9 +188,9 @@ class ucp_profile
|
|||
|
||||
user_active_flip('deactivate', $user->data['user_id'], INACTIVE_PROFILE);
|
||||
|
||||
$sql_ary += array(
|
||||
'user_actkey' => $user_actkey,
|
||||
);
|
||||
// Because we want the profile to be reactivated we set user_newpasswd to empty (else the reactivation will fail)
|
||||
$sql_ary['user_actkey'] = $user_actkey;
|
||||
$sql_ary['user_newpasswd'] = '';
|
||||
}
|
||||
|
||||
if (sizeof($sql_ary))
|
||||
|
|
@ -203,8 +207,21 @@ class ucp_profile
|
|||
user_update_name($user->data['username'], $data['username']);
|
||||
}
|
||||
|
||||
meta_refresh(3, $this->u_action);
|
||||
$message = $user->lang['PROFILE_UPDATED'] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
|
||||
// Now, we can remove the user completely (kill the session) - NOT BEFORE!!!
|
||||
if (!empty($sql_ary['user_actkey']))
|
||||
{
|
||||
meta_refresh(5, append_sid($phpbb_root_path . 'index.' . $phpEx));
|
||||
$message = $user->lang[$message] . '<br /><br />' . sprintf($user->lang['RETURN_INDEX'], '<a href="' . append_sid($phpbb_root_path . 'index.' . $phpEx) . '">', '</a>');
|
||||
|
||||
// Because the user gets deactivated we log him out too, killing his session
|
||||
$user->session_kill();
|
||||
}
|
||||
else
|
||||
{
|
||||
meta_refresh(3, $this->u_action);
|
||||
$message = $user->lang[$message] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
|
||||
}
|
||||
|
||||
trigger_error($message);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -880,7 +880,7 @@ if (!$get_info)
|
|||
array('user_allow_viewonline', 'users.user_allow_viewonline', ''),
|
||||
array('user_allow_viewemail', 'users.user_viewemail', ''),
|
||||
array('user_actkey', 'users.user_actkey', ''),
|
||||
array('user_newpasswd', 'users.user_newpasswd', ''),
|
||||
array('user_newpasswd', '', ''), // Users need to re-request their password...
|
||||
array('user_style', $config['default_style'], ''),
|
||||
|
||||
array('user_options', '', 'set_user_options'),
|
||||
|
|
|
|||
|
|
@ -61,19 +61,20 @@ $lang = array_merge($lang, array(
|
|||
'ALL_TIMES' => 'All times are %1$s %2$s',
|
||||
'ALL_TOPICS' => 'All Topics',
|
||||
'AND' => 'And',
|
||||
'ARE_WATCHING_FORUM' => 'You have subscribed to receive updates on this forum',
|
||||
'ARE_WATCHING_FORUM' => 'You have subscribed to receive updates on this forum.',
|
||||
'ARE_WATCHING_TOPIC' => 'You have subscribed to receive updates on this topic.',
|
||||
'ASCENDING' => 'Ascending',
|
||||
'ATTACHMENTS' => 'Attachments',
|
||||
'ATTACHED_IMAGE_NOT_IMAGE' => 'You tried to attach an invalid image file.',
|
||||
'AUTHOR' => 'Author',
|
||||
'AUTH_NO_PROFILE_CREATED' => 'Creating a user profile failed',
|
||||
'AVATAR_DISALLOWED_EXTENSION' => 'The extension %s is not allowed',
|
||||
'AUTH_NO_PROFILE_CREATED' => 'Creating a user profile failed.',
|
||||
'AVATAR_DISALLOWED_EXTENSION' => 'The extension %s is not allowed.',
|
||||
'AVATAR_EMPTY_REMOTE_DATA' => 'Avatar could not be uploaded, the remote data appears to be invalid or corrupted.',
|
||||
'AVATAR_INVALID_FILENAME' => '%s is an invalid filename',
|
||||
'AVATAR_EMPTY_FILEUPLOAD' => 'The uploaded avatar file is empty.',
|
||||
'AVATAR_INVALID_FILENAME' => '%s is an invalid filename.',
|
||||
'AVATAR_NOT_UPLOADED' => 'Avatar could not be uploaded.',
|
||||
'AVATAR_NO_SIZE' => 'Could not obtain width or height of linked avatar, please enter them manually.',
|
||||
'AVATAR_PARTIAL_UPLOAD' => 'The uploaded file was only partially uploaded',
|
||||
'AVATAR_PARTIAL_UPLOAD' => 'The uploaded file was only partially uploaded.',
|
||||
'AVATAR_PHP_SIZE_NA' => 'The avatar’s filesize is too large.<br />Could not determine the maximum size defined by PHP in php.ini.',
|
||||
'AVATAR_PHP_SIZE_OVERRUN' => 'The avatar’s filesize is too large, maximum upload size is %d MB.<br />Please note this is set in php.ini and cannot be overridden.',
|
||||
'AVATAR_URL_INVALID' => 'The URL you specified is invalid.',
|
||||
|
|
@ -136,9 +137,12 @@ $lang = array_merge($lang, array(
|
|||
'DISPLAY_TOPICS' => 'Display topics from previous',
|
||||
'DOWNLOADED' => 'Downloaded',
|
||||
'DOWNLOADING_FILE' => 'Downloading file',
|
||||
'DOWNLOAD_COUNT' => '%d time',
|
||||
'DOWNLOAD_COUNTS' => '%d times',
|
||||
'DOWNLOAD_NONE' => '0 times',
|
||||
'DOWNLOAD_COUNT' => 'Downloaded %d time',
|
||||
'DOWNLOAD_COUNTS' => 'Downloaded %d times',
|
||||
'DOWNLOAD_COUNT_NONE' => 'Not downloaded yet',
|
||||
'VIEWED_COUNT' => 'Viewed %d time',
|
||||
'VIEWED_COUNTS' => 'Viewed %d times',
|
||||
'VIEWED_COUNT_NONE' => 'Not viewed yet',
|
||||
|
||||
'EDIT_POST' => 'Edit post',
|
||||
'EMAIL' => 'Email',
|
||||
|
|
|
|||
|
|
@ -53,13 +53,16 @@ $lang = array_merge($lang, array(
|
|||
|
||||
// Common language entries
|
||||
$lang = array_merge($lang, array(
|
||||
'ACCOUNT_ACTIVE' => 'Your account has now been activated. Thank you for registering',
|
||||
'ACCOUNT_ACTIVE_ADMIN' => 'The account has now been activated',
|
||||
'ACCOUNT_ADDED' => 'Thank you for registering, your account has been created. You may now login with your username and password',
|
||||
'ACCOUNT_ACTIVE' => 'Your account has now been activated. Thank you for registering.',
|
||||
'ACCOUNT_ACTIVE_ADMIN' => 'The account has now been activated.',
|
||||
'ACCOUNT_ACTIVE_PROFILE' => 'Your account has now been successfully reactivated.',
|
||||
'ACCOUNT_ADDED' => 'Thank you for registering, your account has been created. You may now login with your username and password.',
|
||||
'ACCOUNT_COPPA' => 'Your account has been created but has to be approved, please check your email for details.',
|
||||
'ACCOUNT_INACTIVE' => 'Your account has been created. However, this forum requires account activation, an activation key has been sent to the email address you provided. Please check your email for further information',
|
||||
'ACCOUNT_INACTIVE_ADMIN' => 'Your account has been created. However, this forum requires account activation by the administrator. An email has been sent to them and you will be informed when your account has been activated',
|
||||
'ACTIVATION_EMAIL_SENT' => 'The activation email has been sent to your email address',
|
||||
'ACCOUNT_EMAIL_CHANGED' => 'Your account has been updated. However, this forum requires account reactivation on email changes. An activation key has been sent to the new email address you provided. Please check your email for further information.',
|
||||
'ACCOUNT_EMAIL_CHANGED_ADMIN' => 'Your account has been updated. However, this forum requires account reactivation by the administrators on email changes. An email has been sent to them and you will be informed when your account has been reactivated.',
|
||||
'ACCOUNT_INACTIVE' => 'Your account has been created. However, this forum requires account activation, an activation key has been sent to the email address you provided. Please check your email for further information.',
|
||||
'ACCOUNT_INACTIVE_ADMIN' => 'Your account has been created. However, this forum requires account activation by the administrator. An email has been sent to them and you will be informed when your account has been activated.',
|
||||
'ACTIVATION_EMAIL_SENT' => 'The activation email has been sent to your email address.',
|
||||
'ADD' => 'Add',
|
||||
'ADD_BCC' => 'Add [BCC]',
|
||||
'ADD_FOES' => 'Add new foes',
|
||||
|
|
|
|||
|
|
@ -403,7 +403,7 @@ if ($mode != 'edit')
|
|||
$post_data['enable_magic_url'] = $post_data['drafts'] = false;
|
||||
|
||||
// User own some drafts?
|
||||
if ($user->data['is_registered'] && $auth->acl_get('u_savedrafts'))
|
||||
if ($user->data['is_registered'] && $auth->acl_get('u_savedrafts') && ($mode == 'reply' || $mode == 'post'))
|
||||
{
|
||||
$sql = 'SELECT draft_id
|
||||
FROM ' . DRAFTS_TABLE . '
|
||||
|
|
@ -442,10 +442,10 @@ if ($mode == 'edit' && $post_data['bbcode_uid'])
|
|||
|
||||
// HTML, BBCode, Smilies, Images and Flash status
|
||||
$bbcode_status = ($config['allow_bbcode'] && $auth->acl_get('f_bbcode', $forum_id)) ? true : false;
|
||||
$smilies_status = ($config['allow_smilies'] && $auth->acl_get('f_smilies', $forum_id)) ? true : false;
|
||||
$img_status = ($auth->acl_get('f_img', $forum_id)) ? true : false;
|
||||
$smilies_status = ($bbcode_status && $config['allow_smilies'] && $auth->acl_get('f_smilies', $forum_id)) ? true : false;
|
||||
$img_status = ($bbcode_status && $auth->acl_get('f_img', $forum_id)) ? true : false;
|
||||
$url_status = ($config['allow_post_links']) ? true : false;
|
||||
$flash_status = ($auth->acl_get('f_flash', $forum_id)) ? true : false;
|
||||
$flash_status = ($bbcode_status && $auth->acl_get('f_flash', $forum_id)) ? true : false;
|
||||
$quote_status = ($auth->acl_get('f_reply', $forum_id)) ? true : false;
|
||||
|
||||
// Save Draft
|
||||
|
|
@ -511,7 +511,7 @@ if ($save && $user->data['is_registered'] && $auth->acl_get('u_savedrafts'))
|
|||
}
|
||||
|
||||
// Load requested Draft
|
||||
if ($draft_id && $user->data['is_registered'] && $auth->acl_get('u_savedrafts'))
|
||||
if ($draft_id && ($mode == 'reply' || $mode == 'post') && $user->data['is_registered'] && $auth->acl_get('u_savedrafts'))
|
||||
{
|
||||
$sql = 'SELECT draft_subject, draft_message
|
||||
FROM ' . DRAFTS_TABLE . "
|
||||
|
|
@ -535,7 +535,7 @@ if ($draft_id && $user->data['is_registered'] && $auth->acl_get('u_savedrafts'))
|
|||
}
|
||||
|
||||
// Load draft overview
|
||||
if ($load && $post_data['drafts'])
|
||||
if ($load && ($mode == 'reply' || $mode == 'post') && $post_data['drafts'])
|
||||
{
|
||||
load_drafts($topic_id, $forum_id);
|
||||
}
|
||||
|
|
@ -801,8 +801,9 @@ if ($submit || $preview || $refresh)
|
|||
|
||||
if (!$auth->acl_get($auth_option, $forum_id))
|
||||
{
|
||||
// There is a special case where a user edits his post whereby the topic type got changed by an admin/mod
|
||||
if ($mode == 'edit' && $post_data['poster_id'] == $user->data['user_id'])
|
||||
// There is a special case where a user edits his post whereby the topic type got changed by an admin/mod.
|
||||
// Another case would be a mod not having sticky permissions for example but edit permissions.
|
||||
if ($mode == 'edit')
|
||||
{
|
||||
// To prevent non-authed users messing around with the topic type we reset it to the original one.
|
||||
$post_data['topic_type'] = $post_data['orig_topic_type'];
|
||||
|
|
@ -1212,7 +1213,7 @@ $template->assign_vars(array(
|
|||
'IMG_STATUS' => ($img_status) ? $user->lang['IMAGES_ARE_ON'] : $user->lang['IMAGES_ARE_OFF'],
|
||||
'FLASH_STATUS' => ($flash_status) ? $user->lang['FLASH_IS_ON'] : $user->lang['FLASH_IS_OFF'],
|
||||
'SMILIES_STATUS' => ($smilies_status) ? $user->lang['SMILIES_ARE_ON'] : $user->lang['SMILIES_ARE_OFF'],
|
||||
'URL_STATUS' => ($url_status) ? $user->lang['URL_IS_ON'] : $user->lang['URL_IS_OFF'],
|
||||
'URL_STATUS' => ($bbcode_status && $url_status) ? $user->lang['URL_IS_ON'] : $user->lang['URL_IS_OFF'],
|
||||
'MINI_POST_IMG' => $user->img('icon_post_target', $user->lang['POST']),
|
||||
'POST_DATE' => ($post_data['post_time']) ? $user->format_date($post_data['post_time']) : '',
|
||||
'ERROR' => (sizeof($error)) ? implode('<br />', $error) : '',
|
||||
|
|
|
|||
|
|
@ -11,12 +11,12 @@
|
|||
|
||||
<!-- IF _file.S_THUMBNAIL -->
|
||||
<a href="{_file.U_DOWNLOAD_LINK}"><img src="{_file.THUMB_IMAGE}" alt="{_file.DOWNLOAD_NAME}" /></a><br />
|
||||
<span class="gensmall">{_file.DOWNLOAD_NAME} [ {_file.FILESIZE} {_file.SIZE_LANG} | {_file.L_DOWNLOADED_VIEWED} {_file.L_DOWNLOAD_COUNT} ]</span>
|
||||
<span class="gensmall">{_file.DOWNLOAD_NAME} [ {_file.FILESIZE} {_file.SIZE_LANG} | {_file.L_DOWNLOAD_COUNT} ]</span>
|
||||
<!-- ENDIF -->
|
||||
|
||||
<!-- IF _file.S_IMAGE -->
|
||||
<img src="{_file.U_DOWNLOAD_LINK}" alt="{_file.DOWNLOAD_NAME}" /><br />
|
||||
<span class="gensmall">{_file.DOWNLOAD_NAME} [ {_file.FILESIZE} {_file.SIZE_LANG} | {_file.L_DOWNLOADED_VIEWED} {_file.L_DOWNLOAD_COUNT} ]</span>
|
||||
<span class="gensmall">{_file.DOWNLOAD_NAME} [ {_file.FILESIZE} {_file.SIZE_LANG} | {_file.L_DOWNLOAD_COUNT} ]</span>
|
||||
<!-- ENDIF -->
|
||||
|
||||
<!-- IF _file.S_FILE -->
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
<!-- IF _file.UPLOAD_ICON -->{_file.UPLOAD_ICON} <!-- ENDIF -->
|
||||
<a href="{_file.U_DOWNLOAD_LINK}">{_file.DOWNLOAD_NAME}</a> [{_file.FILESIZE} {_file.SIZE_LANG}]
|
||||
</span><br />
|
||||
<span class="gensmall">{_file.L_DOWNLOADED_VIEWED} {_file.L_DOWNLOAD_COUNT}</span>
|
||||
<span class="gensmall">{_file.L_DOWNLOAD_COUNT}</span>
|
||||
<!-- ENDIF -->
|
||||
|
||||
<!-- IF _file.S_WM_FILE -->
|
||||
|
|
@ -111,7 +111,7 @@
|
|||
<!-- IF _file.S_WM_FILE or _file.S_RM_FILE or _file.S_FLASH_FILE or _file.S_QUICKTIME_FILE -->
|
||||
<br />
|
||||
<!-- IF _file.S_QUICKTIME_FILE --><a href="javascript:play_qt_file(document.qtstream_{_file.ATTACH_ID});">[ {L_PLAY_QUICKTIME_FILE} ]</a> <!-- ENDIF -->
|
||||
<span class="gensmall"><a href="{_file.U_DOWNLOAD_LINK}">{_file.DOWNLOAD_NAME}</a> [ {_file.FILESIZE} {_file.SIZE_LANG} | {_file.L_DOWNLOADED_VIEWED} {_file.L_DOWNLOAD_COUNT} ]</span>
|
||||
<span class="gensmall"><a href="{_file.U_DOWNLOAD_LINK}">{_file.DOWNLOAD_NAME}</a> [ {_file.FILESIZE} {_file.SIZE_LANG} | {_file.L_DOWNLOAD_COUNT} ]</span>
|
||||
<!-- ENDIF -->
|
||||
|
||||
<br />
|
||||
|
|
|
|||
|
|
@ -212,6 +212,7 @@
|
|||
<!-- INCLUDE posting_buttons.html -->
|
||||
<tr>
|
||||
<td valign="top" style="width: 100%;"><textarea name="message" rows="15" cols="76" tabindex="3" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" style="width: 98%;">{MESSAGE}</textarea></td>
|
||||
<!-- IF S_BBCODE_ALLOWED -->
|
||||
<td width="80" align="center" valign="top">
|
||||
<script type="text/javascript">
|
||||
<!--
|
||||
|
|
@ -219,6 +220,7 @@
|
|||
//-->
|
||||
</script>
|
||||
</td>
|
||||
<!-- ENDIF -->
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
|
|
@ -238,6 +240,7 @@
|
|||
<tr>
|
||||
<td class="gensmall">{BBCODE_STATUS}</td>
|
||||
</tr>
|
||||
<!-- IF S_BBCODE_ALLOWED -->
|
||||
<tr>
|
||||
<td class="gensmall">{IMG_STATUS}</td>
|
||||
</tr>
|
||||
|
|
@ -250,6 +253,7 @@
|
|||
<tr>
|
||||
<td class="gensmall">{SMILIES_STATUS}</td>
|
||||
</tr>
|
||||
<!-- ENDIF -->
|
||||
</table>
|
||||
</td>
|
||||
<td class="row2">
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@
|
|||
</script>
|
||||
<script type="text/javascript" src="{T_TEMPLATE_PATH}/editor.js"></script>
|
||||
|
||||
|
||||
<!-- IF S_BBCODE_ALLOWED -->
|
||||
<input type="button" class="btnbbcode" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px;" onclick="bbstyle(0)" onmouseover="helpline('b')" onmouseout="helpline('tip')" />
|
||||
<input type="button" class="btnbbcode" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px;" onclick="bbstyle(2)" onmouseover="helpline('i')" onmouseout="helpline('tip')" />
|
||||
<input type="button" class="btnbbcode" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px;" onclick="bbstyle(4)" onmouseover="helpline('u')" onmouseout="helpline('tip')" />
|
||||
|
|
@ -75,9 +75,10 @@
|
|||
<option value="150">{L_FONT_LARGE}</option>
|
||||
<option value="200">{L_FONT_HUGE}</option>
|
||||
</select></span>
|
||||
<!-- ENDIF -->
|
||||
</td>
|
||||
</tr>
|
||||
<!-- IF .custom_tags -->
|
||||
<!-- IF S_BBCODE_ALLOWED and .custom_tags -->
|
||||
<tr valign="middle" align="{S_CONTENT_FLOW_BEGIN}">
|
||||
<td colspan="2">
|
||||
<!-- BEGIN custom_tags -->
|
||||
|
|
@ -86,9 +87,11 @@
|
|||
</td>
|
||||
</tr>
|
||||
<!-- ENDIF -->
|
||||
<!-- IF S_BBCODE_ALLOWED -->
|
||||
<tr>
|
||||
<td<!-- IF $S_SIGNATURE or S_EDIT_DRAFT --> colspan="2"<!-- ENDIF -->><input type="text" readonly="readonly" name="helpbox" style="width:100%" maxlength="100" class="helpline" value="{L_STYLES_TIP}" /></td>
|
||||
<!-- IF not $S_SIGNATURE and not S_EDIT_DRAFT -->
|
||||
<td class="genmed" align="center">{L_FONT_COLOR}</td>
|
||||
<!-- ENDIF -->
|
||||
</tr>
|
||||
<!-- ENDIF -->
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue