Changeset 663

Timestamp:

12/01/06 23:11:32 (2 years ago)

Author:

Neal

Message:

Ticket #1: Users can no longer appear twice in the online table

Files:

• branches/punbb-1.3-dev/extras/db_update.php (modified) (1 diff)
• branches/punbb-1.3-dev/upload/include/functions.php (modified) (2 diffs)
• branches/punbb-1.3-dev/upload/install.php (modified) (1 diff)

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

@@ -322 +322 @@
-        }
-
+        // We need to add a unique index to avoid users having multiple rows in the online table
+        if ($db_type == 'mysql' || $db_type == 'mysqli')
+        {
+                $result = $db->query('SHOW INDEX FROM '.$db->prefix.'online WHERE Key_name = "'.$db->prefix.'online_user_id_ident_idx"') or error('Unable to check DB structure.', __FILE__, __LINE__, $db->error());
+                
+                if ($db->num_rows($result) == 0)
+                        $db->query('ALTER TABLE '.$db->prefix.'online ADD UNIQUE INDEX '.$db->prefix.'online_user_id_ident_idx (user_id,ident)') or error('Unable to alter DB structure.', __FILE__, __LINE__, $db->error());
+        }
+        
-        // 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/include/functions.php

@@ -102 +102 @@
-                        {
-                                $pun_user['logged'] = $now;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                // Reset tracked topics
-                                set_tracked_topics(null);
@@ -146 +158 @@
-        // Update online list
-        if (!$pun_user['logged'])
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        else
-                $db->query('UPDATE '.$db->prefix.'online SET logged='.time().' WHERE ident=\''.$db->escape($remote_addr).'\'') or error('Unable to update online list', __FILE__, __LINE__, $db->error());

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

@@ -1307 +1307 @@
-                case 'mysqli':
-                        // We use MySQL's ALTER TABLE ... ADD INDEX syntax instead of CREATE INDEX to avoid problems with users lacking the INDEX privilege
+                        $queries[] = 'ALTER TABLE '.$db_prefix.'online ADD UNIQUE INDEX '.$db_prefix.'online_user_id_ident_idx(user_id,ident)';
-                        $queries[] = 'ALTER TABLE '.$db_prefix.'online ADD INDEX '.$db_prefix.'online_user_id_idx(user_id)';
-                        $queries[] = 'ALTER TABLE '.$db_prefix.'posts ADD INDEX '.$db_prefix.'posts_topic_id_idx(topic_id)';