Changeset 1759 for branches/multiuser/cls

Timestamp:

09/26/07 08:57:31 (3 years ago)

Author:

mdodoo

Message:

Lots of things are still not working, but I think this code is better than what was currently committed ([1639]
should have been reverted, and the person who committed should have had their SVN access pulled, for example).
Created this by grabbing the trunk code and then manually inserting the MU branch's changes in. This is probably
not usable in an actual installation (no support for creating new user accounts yet, for example), but patches are
welcome.

Not sure why I write so much here - I am not sure anyone other than my fellow devs actually read them...

Location:

branches/multiuser/cls

Files:

• channels.php (modified) (3 diffs)
• items.php (modified) (9 diffs)
• update.php (modified) (1 diff)
• user.php (modified) (2 diffs)
• wrappers/user.php (modified) (1 diff)

branches/multiuser/cls/channels.php

@@ -224 +224 @@
             ." from " . getTable('item2user') ." i2u "
             . " inner join " . getTable('channels2user') . " c2u on c2u.fkuid=" . rss_user_id()
-            . " inner join " . getTable('folders') ." f on c2u.parent=f.id"
+            . " inner join " . getTable('channels') . " c on c.id = c2u.fkcid"
+            . " inner join " . getTable('folders') ." f on c.parent=f.id"
             ." where i2u.flgunread =1 "
             ." and i2u.flgdeleted=0 ";
@@ -252 +253 @@
         _pf('FeedList->populate() ...');
         $sql = "select "
-        ." c.id, c.title, c.url, c.siteurl, f.name, c2u.parent, c2u.icon, c.descr, c2u.flgdeleted,c2u.flgprivate "
+        ." c.id, c.title, c.url, c.siteurl, f.name, c.parent, c2u.icon, c.descr, c2u.flgdeleted,c2u.flgprivate "
         ." from ".getTable("channels")." c "
         . " inner join " . getTable("channels2user")." c2u on c2u.fkcid=c.id "
@@ -265 +266 @@
 
         if (getConfig('rss.config.absoluteordering')) {
-            $sql .= " order by f.position asc, c2u.position asc";
+            $sql .= " order by f.position asc, c.position asc";
         } else {
             $sql .= " order by f.name, c.title asc";

branches/multiuser/cls/items.php

@@ -60 +60 @@
      * ctor
      */
-    function Item($id, $title, $url, $enclosure, $parent, $author, $description, $date, $isPubDate, $unread, $rating) {
+    function Item($id, $title, $url, $enclosure, $parent, $author, $description, $date, $isPubDate, $unread, $private, $sticky, $flagged) {
         $this->rss = &$GLOBALS['rss'];
         $this->id = $id;
-        $this->flags = $unread;
         if ($title) {
             $this->title = $title;
@@ -86 +85 @@
         $this->isPubDate = $isPubDate;
         $this -> tags=array();
-        $this -> rating = $rating;
-        $this ->isUnread    = $unread & RSS_MODE_UNREAD_STATE;
-        $this ->isPrivate   = $unread & RSS_MODE_PRIVATE_STATE;
-        $this ->isDeleted   = $unread & RSS_MODE_DELETED_STATE;
-        $this ->isSticky    = $unread & RSS_MODE_STICKY_STATE;
-        $this ->isFlag    = $unread & RSS_MODE_FLAG_STATE;
+        //$this -> rating = $rating;
+        $this ->isUnread    = $unread;
+        $this ->isPrivate   = $private;
+        //$this ->isDeleted = $deleted;
+        $this ->isSticky    = $sticky;
+        $this ->isFlag    = $flagged;
         //$this -> key = md5(rand(0,10000));
         
@@ -193 +192 @@
         $this->items[] = $item;
         
-        if ((!$this -> hasUnreadItems) && $item->flags & RSS_MODE_UNREAD_STATE) {
+        if ((!$this -> hasUnreadItems) && $item->isUnread) {
             $this -> hasUnreadItems = true;
         }
@@ -260 +259 @@
         
         // Predefined alternate ordering
-        $this -> ORDER_BY_UNREAD_FIRST = " order by i2u.flgunread & " . RSS_MODE_UNREAD_STATE . " desc, ";
+        $this -> ORDER_BY_UNREAD_FIRST = " order by i2u.flgunread desc, ";
         if (getConfig('rss.config.absoluteordering')) {
-            $this -> ORDER_BY_UNREAD_FIRST .= " f.position asc, c2u.position asc";
+            $this -> ORDER_BY_UNREAD_FIRST .= " f.position asc, c.position asc";
         } else {
-            $this -> ORDER_BY_UNREAD_FIRST .= " f.name asc, c2u.title asc";
+            $this -> ORDER_BY_UNREAD_FIRST .= " f.name asc, c.title asc";
         }
         $this -> ORDER_BY_UNREAD_FIRST .= ", i.added desc, i.id asc";
@@ -283 +282 @@
 
       _pf('ItemList::populate()');
-        $this -> _sqlActualWhat = " i.title,  c.title, c.id, i2u.flgunread, "
-            ."i.url, i.enclosure, i.author, i.description, c2u.icon, "
+        $this -> _sqlActualWhat = " i.title,  c.title, c.id,"
+         . " i2u.flgunread, i2u.flgprivate, i2u.flgsticky, i2u.flgdeleted, i2u.flgflagged,"
+            ." i.url, i.enclosure, i.author, i.description, c.icon, "
             ." unix_timestamp(ifnull(i.pubdate,i.added)) as ts, "
             ." i.pubdate is not null as ispubdate, i.id "
@@ -298 +298 @@
             . " inner join " . getTable('channels2user') ." c2u on (i.cid=c2u.fkcid)"
             . " inner join " . getTable("channels")." c on (c2u.fkcid=c.id)"
-            . " inner join " . getTable("folders") ." f on (c2u.parent=f.id) ";
+            . " inner join " . getTable("folders") ." f on (c.parent=f.id) ";
 
 
@@ -336 +336 @@
             if (!getConfig('rss.config.feedgrouping')) {
                 if(getConfig("rss.config.datedesc.$skey")){
-                    $this -> _sqlActualOrder = " ts desc, f.position asc, c2u.position asc ";
+                    $this -> _sqlActualOrder = " ts desc, f.position asc, c.position asc ";
                 }else{
-                    $this -> _sqlActualOrder = " ts asc, f.position asc, c2u.position asc ";
+                    $this -> _sqlActualOrder = " ts asc, f.position asc, c.position asc ";
                 }
             } elseif (getConfig('rss.config.absoluteordering')) {
-                $this -> _sqlActualOrder = " f.position asc, c2u.position asc";
+                $this -> _sqlActualOrder = " f.position asc, c.position asc";
             } else {
                 $this -> _sqlActualOrder = " f.name asc, c.title asc";
@@ -376 +376 @@
         $curIdx = 0;
         $f=null;
-        while (list ($ititle_, $ctitle_, $cid_, $iunread_, $iurl_, $ienclosure_, $iauthor_, $idescr_, $cicon_, $its_, $iispubdate_, $iid_) = $GLOBALS['rss_db']->rss_fetch_row($res)) {
+        while (list ($ititle_, $ctitle_, $cid_, $iunread_, $iprivate_, $isticky_, $ideleted_, $iflagged_, $iurl_, $ienclosure_, $iauthor_, $idescr_, $cicon_, $its_, $iispubdate_, $iid_) = $GLOBALS['rss_db']->rss_fetch_row($res)) {
             
             // Built a new Item
-            $i = new Item($iid_, $ititle_, $iurl_, $ienclosure_, $cid_, $iauthor_, $idescr_, $its_, $iispubdate_, $iunread_);
+            $i = new Item($iid_, $ititle_, $iurl_, $ienclosure_, $cid_, $iauthor_, $idescr_, $its_, $iispubdate_, $iunread_, $iprivate_, $isticky_, $iflagged_);
             
             // no dupes, please
@@ -411 +411 @@
             // Some stats...
             $this -> itemCount++;           
-            if ($iunread_ & RSS_MODE_UNREAD_STATE) {
+            if ($iunread_) {
                 $this -> unreadCount++; 
                 $this -> unreadIids[] = $iid_;

branches/multiuser/cls/update.php

@@ -99 +99 @@
         if (!hidePrivate() || $ignorePrivate) {
             if (count($newIds) > 0 && getConfig('rss.config.markreadonupdate')) {
-                rss_query("update ".getTable("item2user")." i2u set i2u.flgunread = unread & "
-                          .SET_MODE_READ_STATE." where unread & ".RSS_MODE_UNREAD_STATE
-                          ." and i2u.fkiid not in (".implode(",", $newIds).")");
+                rss_query("update ".getTable("item2user")." i2u set i2u.flgunread = 0"
+                    . " where i2u.flgunread=1"
+                    ." and i2u.fkiid not in (".implode(",", $newIds).")");
             }
         }

branches/multiuser/cls/user.php

@@ -27 +27 @@
 ###############################################################################
 rss_require('cls/wrappers/user.php');
+rss_require('themes.php');
+rss_require('plugins.php');
 
 define ('RSS_USER_ACTION_LOGIN',0x01);
@@ -81 +83 @@
             rss_redirect('');
         }
+
                 
         $cuname = $chash = null;

branches/multiuser/cls/wrappers/user.php

@@ -38 +38 @@
 }
 
+function rss_user_show_private() {
+    return $GLOBALS['rssuser'] -> getShowPrivate();
+}
+
 function rss_user_logout() {
     $GLOBALS['rssuser'] -> logout();