Changeset 1575

Timestamp:

03/29/08 13:05:14 (4 months ago)

Author:

Neal

Message:

Implemented ticket #7: added form email flood protection and other group email controls.

Files:

• branches/punbb-1.3-dev/extras/db_update.php (modified) (1 diff)
• branches/punbb-1.3-dev/upload/admin/groups.php (modified) (5 diffs)
• branches/punbb-1.3-dev/upload/install.php (modified) (7 diffs)
• branches/punbb-1.3-dev/upload/lang/English/admin.php (modified) (2 diffs)
• branches/punbb-1.3-dev/upload/lang/English/misc.php (modified) (1 diff)
• branches/punbb-1.3-dev/upload/misc.php (modified) (4 diffs)
• branches/punbb-1.3-dev/upload/profile.php (modified) (4 diffs)
• branches/punbb-1.3-dev/upload/viewtopic.php (modified) (1 diff)

branches/punbb-1.3-dev/extras/db_update.php

@@ -768 +768 @@
-                $db->add_field($db->prefix.'users', 'date_format', 'INT(10)', false, 0, 'dst');
-
+                // Add the last_email_sent column to the users table and the g_send_email and
+                // g_email_flood columns to the groups table
+                $db->add_field($db->prefix.'users', 'last_email_sent', 'INT(10)', true, null, 'last_post');
+                $db->add_field($db->prefix.'groups', 'g_send_email', 'TINYINT(1)', false, 1, 'g_search_users');
+                $db->add_field($db->prefix.'groups', 'g_email_flood', 'INT(10)', false, 60, 'g_search_flood');
+
+                // Set non-default g_send_email and g_flood_email values properly
+                $db->query('UPDATE '.$db->prefix.'groups SET g_send_email=0 WHERE g_id=2') or error(__FILE__, __LINE__);
+                $db->query('UPDATE '.$db->prefix.'groups SET g_email_flood=0 WHERE g_id IN (1,2,4)') or error(__FILE__, __LINE__);
+
-                // Add the auto notify/subscription option to the users table
-                $db->add_field($db->prefix.'users', 'auto_notify', 'TINYINT(1)', false, 0, 'notify_with_post');

branches/punbb-1.3-dev/upload/admin/groups.php

@@ -183 +183 @@
-<?php endif; ?>                                         <div class="radbox"><label for="fld<?php echo ++$pun_page['fld_count'] ?>"><input type="checkbox" id="fld<?php echo $pun_page['fld_count'] ?>" name="search" value="1"<?php if ($group['g_search'] == '1') echo ' checked="checked"' ?> /> <?php echo $lang_admin['Allow use search'] ?></label></div>
-                                                <div class="radbox"><label for="fld<?php echo ++$pun_page['fld_count'] ?>"><input type="checkbox" id="fld<?php echo $pun_page['fld_count'] ?>" name="search_users" value="1"<?php if ($group['g_search_users'] == '1') echo ' checked="checked"' ?> /> <?php echo $lang_admin['Allow search users'] ?></label></div>
+                                                <div class="radbox"><label for="fld<?php echo ++$pun_page['fld_count'] ?>"><input type="checkbox" id="fld<?php echo $pun_page['fld_count'] ?>" name="send_email" value="1"<?php if ($group['g_send_email'] == '1') echo ' checked="checked"' ?> /> <?php echo $lang_admin['Allow send email'] ?></label></div>
-                                        </fieldset>
-<?php ($hook = get_hook('agr_add_edit_group_permissions_end')) ? eval($hook) : null; ?>
@@ -223 +224 @@
-                                                </label>
-                                        </div>
+                                        <div class="frm-fld text">
+                                                <label for="fld<?php echo ++$pun_page['fld_count'] ?>">
+                                                        <span class="fld-label"><?php echo $lang_admin['Email flood interval'] ?></span><br />
+                                                        <span class="fld-input"><input type="text" id="fld<?php echo $pun_page['fld_count'] ?>" name="email_flood" size="5" maxlength="4" value="<?php echo $group['g_email_flood'] ?>" /></span>
+                                                        <span class="fld-help"><?php echo $lang_admin['Email flood interval info'] ?></span>
+                                                </label>
+                                        </div>
-<?php ($hook = get_hook('agr_add_edit_group_flood_end')) ? eval($hook) : null; ?>
-                                </fieldset>
@@ -268 +276 @@
-        $search = (isset($_POST['search']) && $_POST['search'] == '1') || $is_admin_group ? '1' : '0';
-        $search_users = (isset($_POST['search_users']) && $_POST['search_users'] == '1') || $is_admin_group ? '1' : '0';
+        $send_email = (isset($_POST['send_email']) && $_POST['send_email'] == '1') || $is_admin_group ? '1' : '0';
-        $edit_subjects_interval = isset($_POST['edit_subjects_interval']) ? intval($_POST['edit_subjects_interval']) : '0';
-        $post_flood = isset($_POST['post_flood']) ? intval($_POST['post_flood']) : '0';
-        $search_flood = isset($_POST['search_flood']) ? intval($_POST['search_flood']) : '0';
+        $email_flood = isset($_POST['email_flood']) ? intval($_POST['email_flood']) : '0';
-
-        if ($title == '')
@@ -297 +307 @@
-                // Insert the new group
-                $query = array(
-edit_subjects_interval, g_post_flood, g_search
+send_email, g_edit_subjects_interval, g_post_flood, g_search_flood, g_email
-                        'INTO'          => 'groups',
-edit_subjects_interval.', '.$post_flood.', '.$search
+send_email.', '.$edit_subjects_interval.', '.$post_flood.', '.$search_flood.', '.$email
-                );
-
@@ -355 +365 @@
-                $query = array(
-                        'UPDATE'        => 'groups',
-edit_subjects_interval='.$edit_subjects_interval.', g_post_flood='.$post_flood.', g_search_flood='.$search
+send_email='.$send_email.', g_edit_subjects_interval='.$edit_subjects_interval.', g_post_flood='.$post_flood.', g_search_flood='.$search_flood.', g_email_flood='.$email
-                        'WHERE'         => 'g_id='.$group_id
-                );

branches/punbb-1.3-dev/upload/install.php

@@ -789 +789 @@
-                                        g_search TINYINT(1) NOT NULL DEFAULT 1,
-                                        g_search_users TINYINT(1) NOT NULL DEFAULT 1,
+                                        g_send_email TINYINT(1) NOT NULL DEFAULT 1,
-                                        g_edit_subjects_interval SMALLINT(6) NOT NULL DEFAULT 300,
-                                        g_post_flood SMALLINT(6) NOT NULL DEFAULT 30,
-                                        g_search_flood SMALLINT(6) NOT NULL DEFAULT 30,
+                                        g_email_flood SMALLINT(6) NOT NULL DEFAULT 60,
-                                        PRIMARY KEY (g_id)
-                                        ) ENGINE = MyISAM CHARACTER SET utf8";
@@ -816 +818 @@
-                                        g_search SMALLINT NOT NULL DEFAULT 1,
-                                        g_search_users SMALLINT NOT NULL DEFAULT 1,
+                                        g_send_email SMALLINT NOT NULL DEFAULT 1,
-                                        g_edit_subjects_interval SMALLINT NOT NULL DEFAULT 300,
-                                        g_post_flood SMALLINT NOT NULL DEFAULT 30,
-                                        g_search_flood SMALLINT NOT NULL DEFAULT 30,
+                                        g_email_flood SMALLINT NOT NULL DEFAULT 60,
-                                        PRIMARY KEY (g_id)
-                                        )";
@@ -843 +847 @@
-                                        g_search INTEGER NOT NULL DEFAULT 1,
-                                        g_search_users INTEGER NOT NULL DEFAULT 1,
+                                        g_send_email INTEGER NOT NULL DEFAULT 1,
-                                        g_edit_subjects_interval INTEGER NOT NULL DEFAULT 300,
-                                        g_post_flood INTEGER NOT NULL DEFAULT 30,
-                                        g_search_flood INTEGER NOT NULL DEFAULT 30,
+                                        g_email_flood INTEGER NOT NULL DEFAULT 60,
-                                        PRIMARY KEY (g_id)
-                                        )";
@@ -1259 +1265 @@
-                                        num_posts INT(10) UNSIGNED NOT NULL DEFAULT 0,
-                                        last_post INT(10) UNSIGNED,
+                                        last_email_sent INT(10) UNSIGNED,
-                                        registered INT(10) UNSIGNED NOT NULL DEFAULT 0,
-                                        registration_ip VARCHAR(15) NOT NULL DEFAULT '0.0.0.0',
@@ -1307 +1314 @@
-                                        num_posts INT NOT NULL DEFAULT 0,
-                                        last_post INT,
+                                        last_email_sent INT,
-                                        registered INT NOT NULL DEFAULT 0,
-                                        registration_ip VARCHAR(15) NOT NULL DEFAULT '0.0.0.0',
@@ -1355 +1363 @@
-                                        num_posts INTEGER NOT NULL DEFAULT 0,
-                                        last_post INTEGER,
+                                        last_email_sent INTEGER,
-                                        registered INTEGER NOT NULL DEFAULT 0,
-                                        registration_ip VARCHAR(15) NOT NULL DEFAULT '0.0.0.0',
@@ -1418 +1427 @@
-
-        // Insert the four preset groups
-edit_subjects_interval, g_post_flood, g_search_flood) VALUES('Administrators', 'Administrator', 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
-edit_subjects_interval, g_post_flood, g_search_flood) VALUES('Guest', NULL, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1
-edit_subjects_interval, g_post_flood, g_search_flood) VALUES('Members', NULL, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 300, 60, 3
-edit_subjects_interval, g_post_flood, g_search_flood) VALUES('Moderators', 'Moderator', 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
+send_email, g_edit_subjects_interval, g_post_flood, g_search_flood, g_email_flood) VALUES('Administrators', 'Administrator', 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0
+send_email, g_edit_subjects_interval, g_post_flood, g_search_flood, g_email_flood) VALUES('Guest', NULL, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0
+send_email, g_edit_subjects_interval, g_post_flood, g_search_flood, g_email_flood) VALUES('Members', NULL, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 300, 60, 30, 6
+send_email, g_edit_subjects_interval, g_post_flood, g_search_flood, g_email_flood) VALUES('Moderators', 'Moderator', 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0
-
-        // Insert guest and first admin user

branches/punbb-1.3-dev/upload/lang/English/admin.php

@@ -297 +297 @@
-'Allow use search'                              =>      'Allow users to use the search feature.',
-'Allow search users'                    =>      'Allow users to freetext search for users in the user list.',
+'Allow send email'                              =>      'Allow users to send e-mails to other users.',
-'Restrictions'                                  =>      'Restrictions',
-'Mod permissions'                               =>      'Moderator permissions',
@@ -306 +307 @@
-'Search interval'                               =>      'Search flood interval',
-'Search interval info'                  =>      'Number of seconds that users in this group have to wait between searches. Set to 0 to disable.',
+'Email flood interval'                  =>      'Email flood interval',
+'Email flood interval info'             =>      'Number of seconds that users in this group have to wait between e-mails. Set to 0 to disable.',
-'Mods warning'                                  =>      'Please note that in order for a user in this group to have moderator abilities, he/she must be assigned to moderate one or more forums. This is done via the user administration page of the user\'s profile.',
-'Remove group'                                  =>      'Remove group',

branches/punbb-1.3-dev/upload/lang/English/misc.php

@@ -13 +13 @@
-'No e-mail message'                     =>      'You must enter a message.',
-'Too long e-mail message'       =>      'Messages cannot be longer than '.PUN_MAX_POSTSIZE.' characters.',
+'Email flood'                           =>      'At least %s seconds have to pass between sent emails. Please wait a while and try sending again.',
-'E-mail sent redirect'          =>      'E-mail sent. Redirecting 
',
-'E-mail subject'                        =>      'Subject:',

branches/punbb-1.3-dev/upload/misc.php

@@ -132 +132 @@
-else if (isset($_GET['email']))
-{
-
+ || $pun_user['g_send_email'] == '0'
-                message($lang_common['No permission']);
-
@@ -176 +176 @@
-                else if (strlen($message) > PUN_MAX_POSTSIZE)
-                        $errors[] = $lang_misc['Too long e-mail message'];
+                if ($pun_user['last_email_sent'] != '' && (time() - $pun_user['last_email_sent']) < $pun_user['g_email_flood'] && (time() - $pun_user['last_email_sent']) >= 0)
+                        $errors[] = sprintf($lang_misc['Email flood'], $pun_user['g_email_flood']);
-
-                // Did everything go according to plan?
@@ -197 +199 @@
-
-                        pun_mail($recipient_email, $mail_subject, $mail_message, '"'.str_replace('"', '', $pun_user['username']).'" <'.$pun_user['email'].'>');
+
+                        // Set the user's last_email_sent time
+                        $query = array(
+                                'UPDATE'        => 'users',
+                                'SET'           => 'last_email_sent='.time(),
+                                'WHERE'         => 'id='.$pun_user['id'],
+                                'PARAMS'        => array(
+                                        'LOW_PRIORITY'  => 1    // MySQL only
+                                )
+                        );
+
+                        ($hook = get_hook('mi_qr_update_last_email_sent')) ? eval($hook) : null;
+                        $db->query_build($query) or error(__FILE__, __LINE__);
-
-                        redirect(pun_htmlencode($_POST['redirect_url']), $lang_misc['E-mail sent redirect']);
@@ -284 +299 @@
-                                        <label for="fld<?php echo ++$pun_page['fld_count'] ?>">
-                                                <span class="fld-label"><?php echo $lang_misc['E-mail message'] ?></span><br />
-value="<?php echo(isset($_POST['req_message']) ? pun_htmlencode($_POST['req_message']) : '') ?>" rows="10" cols="95"
+rows="10" cols="95"><?php echo(isset($_POST['req_message']) ? pun_htmlencode($_POST['req_message']) : '') ?
-                                                <em class="req-text"><?php echo $lang_common['Required'] ?></em>
-                                        </label>

branches/punbb-1.3-dev/upload/profile.php

@@ -1269 +1269 @@
-        $pun_page['user_actions'] = array();
-
-
+ && $pun_user['g_send_email'] == '1'
-                $pun_page['user_actions'][] =  '<li><a href="'.pun_link($pun_url['email'], $id).'">'.$lang_common['Send forum e-mail'].'</a></li>';
-
@@ -1284 +1284 @@
-        );
-
-
+ && $pun_user['g_send_email'] == '1'
-                $pun_page['user_data'][] = '<li><strong>'.$lang_profile['E-mail'].'</strong> <span><a href="mailto:'.$user['email'].'" class="email">'.($pun_config['o_censoring'] == '1' ? censor_words($user['email']) : $user['email']).'</a></span></li>';
-        else
@@ -1422 +1422 @@
-                        $pun_page['user_actions'][] = '<li><a href="'.pun_link($pun_url['change_email'], $id).'">'.$lang_profile['Change e-mail'].'</a></li>';
-
-$user['email_setting'] != '2' || $pun_user['is_admmod']
+($user['email_setting'] != '2' || $pun_user['is_admmod']) && $pun_user['g_send_email'] == '1'
-                        $pun_page['user_actions'][] = '<li><a href="'.pun_link($pun_url['email'], $id).'">'.$lang_profile['Send forum e-mail'].'</a></li>';
-
@@ -1438 +1438 @@
-                );
-
-$user['email_setting'] == '0' && !$pun_user['is_guest']
+($user['email_setting'] == '0' && !$pun_user['is_guest']) && $pun_user['g_send_email'] == '1'
-                        $pun_page['user_data'][] = '<li><strong>'.$lang_profile['E-mail'].'</strong> <span><a href="mailto:'.$user['email'].'" class="email">'.($pun_config['o_censoring'] == '1' ? censor_words($user['email']) : $user['email']).'</a></span></li>';
-                else

branches/punbb-1.3-dev/upload/viewtopic.php

@@ -381 +381 @@
-                        if ($cur_post['url'] != '')
-                                $pun_page['post_options'][] = '<a class="contact external" href="'.pun_htmlencode(($pun_config['o_censoring'] == '1') ? censor_words($cur_post['url']) : $cur_post['url']).'"><span>'.sprintf($lang_topic['Visit website'], pun_htmlencode($cur_post['username'])).'</span></a>';
-$cur_post['email_setting'] == '0' && !$pun_user['is_guest']) || $pun_user['is_admmod']
+($cur_post['email_setting'] == '0' && !$pun_user['is_guest']) || $pun_user['is_admmod']) && $pun_user['g_send_email'] == '1'
-                                $pun_page['post_options'][] = '<a class="contact" href="mailto:'.$cur_post['email'].'"><span>'.$lang_common['E-mail'].'<span>&#160;'.pun_htmlencode($cur_post['username']).'</span></span></a>';
-
+ && $pun_user['g_send_email'] == '1'
-                                $pun_page['post_options'][] = '<a class="contact" href="'.pun_link($pun_url['email'], $cur_post['poster_id']).'"><span>'.$lang_common['E-mail'].'<span>&#160;'.pun_htmlencode($cur_post['username']).'</span></span></a>';
-                }
-                else
-                {
-
+ && $pun_user['g_send_email'] == '1'
-                                $pun_page['post_options'][] = '<a class="contact" href="mailto:'.$cur_post['poster_email'].'"><span>'.$lang_common['E-mail'].'<span>&#160;'.pun_htmlencode($cur_post['username']).'</span></span></a>';
-                }