Changeset 908

Timestamp:

02/25/07 16:52:15 (2 years ago)

Author:

Frank

Message:

Ticket #26, Resolved. Added auto subscription with possibility to choose not to subscribe. Also added so that the checkbox is automatically checked when you're subscribed, unchecking the box when subscribed, will unsubscribe the user.

Files:

• branches/punbb-1.3-dev/extras/db_update.php (modified) (1 diff)
• branches/punbb-1.3-dev/upload/post.php (modified) (2 diffs)
• branches/punbb-1.3-dev/upload/profile.php (modified) (3 diffs)
• branches/punbb-1.3-dev/upload/viewtopic.php (modified) (1 diff)

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

@@ -514 +514 @@
-        }
-
+        // Add the auto notify/subscription option to the users table
+        if (!$db->field_exists($db->prefix.'users', 'auto_notify'))
+        {
+                switch ($db_type)
+                {
+                        case 'mysql':
+                        case 'mysqli':
+                                $db->query('ALTER TABLE '.$db->prefix.'users ADD auto_notify TINYINT(1) NOT NULL DEFAULT 0 AFTER notify_with_post') or error('Unable to alter DB structure.', __FILE__, __LINE__, $db->error());
+                                break;
+
+                        case 'pgsql':
+                                $db->query('ALTER TABLE '.$db->prefix.'users ADD auto_notify SMALLINT') or error('Unable to alter DB structure.', __FILE__, __LINE__, $db->error());
+                                $db->query('ALTER TABLE '.$db->prefix.'users ALTER auto_notify SET DEFAULT 0') or error('Unable to alter DB structure.', __FILE__, __LINE__, $db->error());
+                                $db->query('UPDATE '.$db->prefix.'users SET auto_notify=0') or error('Unable to alter DB structure.', __FILE__, __LINE__, $db->error());
+                                break;
+
+                        case 'sqlite':
+                                $db->query('ALTER TABLE '.$db->prefix.'users ADD auto_notify INTEGER NOT NULL DEFAULT 0') or error('Unable to alter DB structure.', __FILE__, __LINE__, $db->error());
+                                break;
+                }
+        }
+
-        // Finally, we update the version number
-        $db->query('UPDATE '.$db->prefix.'config SET conf_value=\''.$update_to.'\' WHERE conf_name=\'o_cur_version\'') or error('Unable to update version.', __FILE__, __LINE__, $db->error());

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

@@ -195 +195 @@
-                                        if (!$db->num_rows($result))
-                                                $db->query('INSERT INTO '.$db->prefix.'subscriptions (user_id, topic_id) VALUES('.$pun_user['id'].' ,'.$tid.')') or error('Unable to add subscription', __FILE__, __LINE__, $db->error());
+                                }
+
+                                // Check if we're already subscribed, in that case unsubscribe
+                                elseif ($pun_config['o_subscriptions'] == '1' && !$subscribe)
+                                {
+                                        $query = array( 'SELECT'        =>      '1',
+                                                                        'FROM'          =>      'subscriptions',
+                                                                        'WHERE'         =>      '(topic_id='.$tid.' AND user_id='.$pun_user['id'].')');
+
+                                        $result = $db->query_build($query) or error('Unable to fetch subscribtion info', __FILE__, __LINE__, $db->error());
+                                        if ($db->num_rows($result))
+                                        {
+                                                $query = array( 'DELETE'        =>      'subscriptions',
+                                                                                'WHERE'         =>      '(topic_id='.$tid.' AND user_id='.$pun_user['id'].')');
+
+                                                $result = $db->query_build($query) or error('Unable to remove subscription', __FILE__, __LINE__, $db->error());
+                                        }
-                                }
-                        }
@@ -542 +559 @@
-        $checkboxes[] = '<span class="input"><input type="checkbox" id="fld'.(++$fld_count).'" name="hide_smilies" value="1"'.(isset($_POST['hide_smilies']) ? ' checked="checked"' : '').' /> <label for="fld'.$fld_count.'">'.$lang_post['Hide smilies'].'</label></span><br />';
-
+// Check/uncheck the checkbox for subscriptions depending on scenario
-if (!$pun_user['is_guest'] && $pun_config['o_subscriptions'] == '1')
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-if (!empty($checkboxes))

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

@@ -661 +661 @@
-                case 'preferences':
-                {
-
+auto_notify', '
-
-                        $form['dst'] = (isset($form['dst'])) ? 1 : 0;
@@ -672 +672 @@
-                        if (!isset($form['save_pass']) || $form['save_pass'] != '1') $form['save_pass'] = '0';
-                        if (!isset($form['notify_with_post']) || $form['notify_with_post'] != '1') $form['notify_with_post'] = '0';
+                        if (!isset($form['auto_notify']) || $form['auto_notify'] != '1') $form['auto_notify'] = '0';
-
-                        // If the save_pass setting has changed, we need to set a new cookie with the appropriate expire date
@@ -1304 +1305 @@
-                                        <p class="field">
-                                                <span class="input"><input type="checkbox" id="fld<?php echo ++$fld_count ?>" name="form[notify_with_post]" value="1"<?php if ($user['notify_with_post'] == '1') echo ' checked="checked"' ?> /> <label for="fld<?php echo $fld_count ?>"><?php echo $lang_profile['Notify full'] ?></label></span><br />
-notify_with_post]" value="1"<?php if ($user['notify_with_post
+auto_notify]" value="1"<?php if ($user['auto_notify
-                                        </p>
-                                </fieldset>

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

@@ -480 +480 @@
-if ($pun_user['is_admmod'])
-        echo "\t\t\t\t".'<input type="hidden" name="csrf_token" value="'.$pun_user['csrf_token'].'" />'."\n";
+if (!$pun_user['is_guest'] && $pun_config['o_subscriptions'] == '1' && ($pun_user['auto_notify'] == '1' || $cur_topic['is_subscribed']))
+        echo "\t\t\t\t".'<input type="hidden" name="subscribe" value="1" />'."\n";
-
-$post_help = array();