Changeset 1322 in ExiteCMS

Timestamp:

02/28/08 00:27:46 (4 years ago)

Author:

hverton

Message:

conversion of module version numbers so they can be compared numerically
fixed typo in forum/index.php that caused a query to crash

Location:

trunk

Files:

• administration/modules.php (modified) (1 diff)
• forum/index.php (modified) (2 diffs)

trunk/administration/modules.php

@@ -480 +480 @@
                     $this_module['id'] = $data['mod_id'];
                     $this_module['version'] = $data['mod_version'];
-                    if ($mod_version > $data['mod_version']) {
+                    // convert the versions to a number
+                    $new = explode(".", $mod_version);
+                    while (count($new) < 4) { array_unshift($new, 0); }
+                    $new = 1 * $new[3] + 100 * $new[2] + 10000 * $new[1] + 1000000 * $new[0]; 
+                    $cur = explode(".", $data['mod_version']);
+                    while (count($cur) < 4) { array_unshift($cur, 0); }
+                    $cur = 1 * $cur[3] + 100 * $cur[2] + 10000 * $cur[1] + 1000000 * $cur[0]; 
+                    // now compare the numeric version numbers
+                    if ($new > $cur) {
                         if ($filter && $filter != 2) continue;
                         $this_module['status'] = 2;

trunk/forum/index.php

@@ -81 +81 @@
     if (iMEMBER) {
         if ($userdata['user_posts_unread']) {
-            $result = dbquery("
+            $result2 = dbquery("
                 SELECT count(*) as unread 
                     FROM ".$db_prefix."posts p 
                         LEFT JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id 
                     WHERE tr.user_id = '".$userdata['user_id']."' 
+                        AND tr.forum_id = '".$data['forum_id']."' 
                         AND (p.post_datestamp > ".$settings['unread_threshold']." OR p.post_edittime > ".$settings['unread_threshold'].")
                         AND ((p.post_datestamp > tr.thread_last_read OR p.post_edittime > tr.thread_last_read)
@@ -91 +92 @@
                 );
         } else {
-            $result = dbquery("
+            $result2 = dbquery("
                 SELECT count(*) as unread 
                     FROM ".$db_prefix."posts p 
                         LEFT JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id 
                     WHERE tr.user_id = '".$userdata['user_id']."' 
+                        AND tr.forum_id = '".$data['forum_id']."' 
                         AND p.post_author != '".$userdata['user_id']."'
                         AND p.post_edituser != '".$userdata['user_id']."'