Skip to content
This repository has been archived by the owner on Aug 25, 2019. It is now read-only.

Commit

Permalink
Added max signature length.
Browse files Browse the repository at this point in the history
  • Loading branch information
dietrichm committed Sep 3, 2005
1 parent 8da9bd8 commit fbb0b64
Show file tree
Hide file tree
Showing 9 changed files with 29 additions and 8 deletions.
1 change: 1 addition & 0 deletions Changelog.txt
Expand Up @@ -5,6 +5,7 @@ UseBB 0.7 Changelog

- Added ACP module system.
- Added mark all as read feature in panel.
- Added max signature length.
- Fixed XSS vulnerability in search results.
- Fixed bug #658: search form gives error when no viewable forums.
- Fixed bug #669: no newlines in quote tags cause problems.
Expand Down
3 changes: 2 additions & 1 deletion config.php
Expand Up @@ -89,7 +89,7 @@
$conf['guests_can_view_profiles'] = 1;
$conf['hide_avatars'] = 0;
$conf['hide_signatures'] = 0;
$conf['hide_undefined_config_setting_warnings'] = 1;
$conf['hide_undefined_config_setting_warnings'] = 0;
$conf['hide_undefined_template_setting_warnings'] = 0;
$conf['hide_undefined_template_warnings'] = 0;
$conf['hide_userinfo'] = 0;
Expand All @@ -110,6 +110,7 @@
$conf['show_edited_message_timeout'] = 60;
$conf['sig_allow_bbcode'] = 1;
$conf['sig_allow_smilies'] = 1;
$conf['sig_max_length'] = 500;
$conf['single_forum_mode'] = 1;
$conf['target_blank'] = 0;
$conf['template'] = 'default';
Expand Down
1 change: 1 addition & 0 deletions languages/admin_English.php
Expand Up @@ -136,6 +136,7 @@
$lang['ConfigBoard-return_to_topic_after_posting'] = 'Return to the topic after posting';
$lang['ConfigBoard-sig_allow_bbcode'] = 'Enable BBCode in signatures';
$lang['ConfigBoard-sig_allow_smilies'] = 'Enable smilies in signatures';
$lang['ConfigBoard-sig_max_length'] = 'Max signature length';
$lang['ConfigBoard-single_forum_mode'] = 'Single forum mode (when applicable)';
$lang['ConfigBoard-target_blank'] = 'BBCode links open new window';
$lang['ConfigBoard-users_must_activate'] = 'Users must activate via e-mail';
Expand Down
1 change: 1 addition & 0 deletions languages/admin_Nederlands.php
Expand Up @@ -136,6 +136,7 @@
$lang['ConfigBoard-return_to_topic_after_posting'] = 'Terugkeren naar onderwerp na het plaatsen';
$lang['ConfigBoard-sig_allow_bbcode'] = 'BBCode in handtekeningen inschakelen';
$lang['ConfigBoard-sig_allow_smilies'] = 'Smilies in handtekeningen inschakelen';
$lang['ConfigBoard-sig_max_length'] = 'Maximale lengte handtekening';
$lang['ConfigBoard-single_forum_mode'] = 'Enkel forum-modus (indien van toepassing)';
$lang['ConfigBoard-target_blank'] = 'BBCode-links openen een nieuw venster';
$lang['ConfigBoard-users_must_activate'] = 'E-mailactivatie inschakelen';
Expand Down
2 changes: 2 additions & 0 deletions languages/lang_English.php
Expand Up @@ -450,5 +450,7 @@
$lang['Add'] = 'Add';
$lang['MarkAllAsRead'] = 'Mark all as read';
$lang['MarkAllAsReadDone'] = 'All forums and topics are now marked as read.';
$lang['StringTooShort'] = '%s is too short, at least %d characters are required.';
$lang['StringTooLong'] = '%s is too long, only %d characters are allowed.';

?>
2 changes: 2 additions & 0 deletions languages/lang_Nederlands.php
Expand Up @@ -450,6 +450,8 @@
$lang['Add'] = 'Toevoegen';
$lang['MarkAllAsRead'] = 'Alles gelezen markeren';
$lang['MarkAllAsReadDone'] = 'Alle forums en onderwerpen zijn nu als gelezen gemarkeerd.';
$lang['StringTooShort'] = '%s is te kort, er zijn tenminste %d karakters benodigd.';
$lang['StringTooLong'] = '%s is te lang, maximaal %d karakters zijn toegestaan.';

//
// Date translations
Expand Down
3 changes: 2 additions & 1 deletion sources/admin_config.php
Expand Up @@ -36,7 +36,7 @@
$missing = array();
$necessary_settings = array(
'strings' => array('type', 'server', 'username', 'dbname', 'admin_email', 'board_descr', 'board_name', 'date_format', 'language', 'session_name', 'template'),
'integers' => array('active_topics_count', 'avatars_force_width', 'avatars_force_height', 'debug', 'email_view_level', 'flood_interval', 'members_per_page', 'online_min_updated', 'output_compression', 'passwd_min_length', 'posts_per_page', 'rss_items_count', 'search_limit_results', 'search_nonindex_words_min_length', 'session_max_lifetime', 'show_edited_message_timeout', 'topicreview_posts', 'topics_per_page', 'view_detailed_online_list_min_level', 'view_forum_stats_box_min_level', 'view_hidden_email_addresses_min_level', 'view_memberlist_min_level', 'view_stafflist_min_level', 'view_stats_min_level', 'view_contactadmin_min_level')
'integers' => array('active_topics_count', 'avatars_force_width', 'avatars_force_height', 'debug', 'email_view_level', 'flood_interval', 'members_per_page', 'online_min_updated', 'output_compression', 'passwd_min_length', 'posts_per_page', 'rss_items_count', 'search_limit_results', 'search_nonindex_words_min_length', 'session_max_lifetime', 'show_edited_message_timeout', 'sig_max_length', 'topicreview_posts', 'topics_per_page', 'view_detailed_online_list_min_level', 'view_forum_stats_box_min_level', 'view_hidden_email_addresses_min_level', 'view_memberlist_min_level', 'view_stafflist_min_level', 'view_stats_min_level', 'view_contactadmin_min_level')
);
foreach ( $necessary_settings['strings'] as $key ) {

Expand Down Expand Up @@ -173,6 +173,7 @@
'guests_can_view_profiles',
'sig_allow_bbcode',
'sig_allow_smilies',
'sig_max_length',
'users_must_activate',
'view_contactadmin_min_level',
'view_detailed_online_list_min_level',
Expand Down
13 changes: 8 additions & 5 deletions sources/functions.php
Expand Up @@ -265,23 +265,26 @@ function get_config($setting) {

$path_parts = pathinfo($_SERVER['SCRIPT_NAME']);
$protocol = ( isset($_SERVER['HTTPS']) ) ? 'https' : 'http';
$this->board_config['board_url'] = $protocol.'://'.$_SERVER['HTTP_HOST'].$path_parts['dirname'].'/';
$set_to = $protocol.'://'.$_SERVER['HTTP_HOST'].$path_parts['dirname'].'/';

} elseif ( $setting == 'cookie_path' ) {

$path_parts = pathinfo($_SERVER['SCRIPT_NAME']);
$this->board_config['cookie_path'] = $path_parts['dirname'];
$set_to = $path_parts['dirname'];

} elseif ( $setting == 'search_limit_results' ) {
} elseif ( $setting == 'search_limit_results' || $setting == 'sig_max_length' ) {

$this->board_config['search_limit_results'] = 1000;
$set_to = 1000;

} elseif ( $setting == 'search_nonindex_words_min_length' ) {

$this->board_config['search_nonindex_words_min_length'] = 3;
$set_to = 3;

}

if ( isset($set_to) )
$this->board_config[$setting] = $set_to;

}

//
Expand Down
11 changes: 10 additions & 1 deletion sources/panel_profile.php
Expand Up @@ -60,7 +60,7 @@

}

if ( !empty($_POST['displayed_name']) && !$displayed_name_taken && !$displayed_name_banned && ( ( empty($_POST['birthday_month']) && empty($_POST['birthday_day']) && empty($_POST['birthday_year']) ) || ( valid_int($_POST['birthday_month']) && valid_int($_POST['birthday_day']) && valid_int($_POST['birthday_year']) && checkdate($_POST['birthday_month'], $_POST['birthday_day'], $_POST['birthday_year']) ) ) && !empty($_POST['email']) && preg_match(EMAIL_PREG, $_POST['email']) && ( empty($_POST['avatar']) || preg_match(IMG_PREG, $_POST['avatar']) ) && ( empty($_POST['website']) || preg_match(WEB_PREG, $_POST['website']) ) ) {
if ( !empty($_POST['displayed_name']) && !$displayed_name_taken && !$displayed_name_banned && entities_strlen($_POST['signature']) <= $functions->get_config('sig_max_length') && ( ( empty($_POST['birthday_month']) && empty($_POST['birthday_day']) && empty($_POST['birthday_year']) ) || ( valid_int($_POST['birthday_month']) && valid_int($_POST['birthday_day']) && valid_int($_POST['birthday_year']) && checkdate($_POST['birthday_month'], $_POST['birthday_day'], $_POST['birthday_year']) ) ) && !empty($_POST['email']) && preg_match(EMAIL_PREG, $_POST['email']) && ( empty($_POST['avatar']) || preg_match(IMG_PREG, $_POST['avatar']) ) && ( empty($_POST['website']) || preg_match(WEB_PREG, $_POST['website']) ) ) {

if ( !empty($_POST['avatar']) ) {

Expand Down Expand Up @@ -187,6 +187,15 @@

}

if ( entities_strlen($_POST['signature']) > $functions->get_config('sig_max_length') ) {

$template->parse('msgbox', 'global', array(
'box_title' => $lang['Error'],
'content' => sprintf($lang['StringTooLong'], $lang['Signature'], $functions->get_config('sig_max_length'))
));

}

}

//
Expand Down

0 comments on commit fbb0b64

Please sign in to comment.