Changeset 1524 for branches/multiuser/util.php

Timestamp:

08/05/06 11:53:58 (2 years ago)

Author:

mbonetti

Message:

first mu checkin

Files:

• branches/multiuser/util.php (modified) (4 diffs)

branches/multiuser/util.php

@@ -339 +339 @@
             // check whether we already have this item
             if ($guid) {
-                $sql = "select id,unread, md5sum, guid, pubdate from ".getTable("item")
-                       ." where cid=$cid and guid='$guid'";
+                $sql = "select id, i2u.flgunread,i2u.flgdeleted, md5sum, guid, pubdate "
+                ."from "
+                .getTable('item2user') ." i2u "
+                ."left join "
+                .getTable('item') ." i "
+                ." on (i2u.fkiid=i.id) "
+                ." where cid=$cid and guid='$guid'";
             } else {
-                $sql = "select id,unread, md5sum, guid, pubdate from ".getTable("item")
-                       ." where cid=$cid and url='$url' and title='$dbtitle'"
-                       ." and (pubdate is NULL OR pubdate=$sec)";
+                $sql = "select id, i2u.flgunread,i2u.flgdeleted, md5sum, guid, pubdate "
+                ."from "
+                .getTable('item2user') ." i2u "
+                ."left join "
+                .getTable('item') ." i "
+                ." on (i2u.fkiid=i.id) "
+                ." where cid=$cid and url='$url' and title='$dbtitle'"
+                ." and (pubdate is NULL OR pubdate=$sec)";
             }
 
             $subres = rss_query($sql);
-            list ($indb, $state, $dbmd5sum, $dbGuid, $dbPubDate) = rss_fetch_row($subres);
+            list ($indb, $unread,$deleted, $dbmd5sum, $dbGuid, $dbPubDate) = rss_fetch_row($subres);
 
             if ($indb) {
                 $itemIdsInFeed[] = $indb;
-                if (!($state & RSS_MODE_DELETED_STATE) && $md5sum != $dbmd5sum) {
+                if (!$deleted && $md5sum != $dbmd5sum) {
                     // the md5sums do not match.
                     if($allowUpdates) { // Are we allowed update items in the db?
@@ -360 +370 @@
                         $sql = "update ".getTable("item")
                                ." set "." description='".rss_real_escape_string($description)."', "
-                               ." unread = unread | ".RSS_MODE_UNREAD_STATE
-                               .", md5sum='$md5sum'" . " where cid=$cid and id=$indb";
-
+                               //." unread = unread | ".RSS_MODE_UNREAD_STATE
+                               ." md5sum='$md5sum'" . " where cid=$cid and id=$indb";
+                        
                         rss_query($sql);
+                        
+                        rss_query("update " .getTable('item2user') . " i2u set i2u.flgunread=1 where i2u.fkiid=$indb");
                         $updatedIds[] = $indb;
                         continue;
@@ -375 +387 @@
                 $sql = "insert into ".getTable("item")
                        ." (cid, added, title, url, enclosure,"
-                       ." description, author, unread, pubdate, md5sum, guid) "
+                       ." description, author, pubdate, md5sum, guid) "
                        ." values ("."$cid, now(), '$dbtitle', "
                        ." '$url', '".rss_real_escape_string($enclosure)."', '"
                        .rss_real_escape_string($description)."', '"
                        .rss_real_escape_string($author)."', "
-                       ."$mode, $sec, '$md5sum', '$guid')";
+                       ." $sec, '$md5sum', '$guid')";
 
                 rss_query($sql);
 
                 $newIid = rss_insert_id();
+                $uid=$GLOBALS['rssuser']->getUserId();
+                $prv=($mode & RSS_MODE_PRIVATE_STATE) ?"1":"0";
+                rss_query(
+                    "insert into " .getTable('item2user')
+                    ."  (fkiid,fkuid,fkcid,flgunread,flgprivate) "
+                    ." values ($newIid, $uid, $cid, 1, $prv) "
+                );
+                
                 $itemIdsInFeed[] = $newIid;
                 $updatedIds[] = $newIid;
@@ -884 +904 @@
 
     $sql = "select count(*) from "
-           .getTable("item")    ."i, ".getTable('channels')."c "
-           ." where i.unread & ".RSS_MODE_UNREAD_STATE. " and not(i.unread & " .
-           RSS_MODE_DELETED_STATE .") and i.cid=c.id "
+           .getTable("item2user")    ."i2u, ".getTable('channels')."c "
+           ." where "
+           ." i2u.fkuid = " . rss_user_id()
+           ." and i2u.flgunread=1 and i2u.flgdeleted=0 and i2u.fkcid=c.id "
            ." and not(c.mode & ".RSS_MODE_DELETED_STATE.") ";
 
     if (hidePrivate()) {
-        $sql .= " and not(i.unread & ".RSS_MODE_PRIVATE_STATE.")";
+        $sql .= " and i2u.flgprivate=0";
     }