Changeset 1541

Timestamp:

08/21/06 19:48:40 (2 years ago)

Author:

mbonetti

Message:

Some more multi-user-hacking

Location:

branches/multiuser

Files:

• cls/channels.php (modified) (5 diffs)
• cls/items.php (modified) (5 diffs)
• feed.php (modified) (2 diffs)
• index.php (modified) (1 diff)
• schema.php (modified) (5 diffs)

branches/multiuser/cls/channels.php

@@ -170 +170 @@
         _pf(' ... totalCount');     
         $sql = 
-        "select count(*) from ".getTable("item2user") . "i , " . getTable('channels') . " c "
-            
-            ." where i.fkcid=c.id and i.flgdeleted=0 "
-            ." and not (c.mode & " .RSS_MODE_DELETED_STATE.")"
+            "select count(*) from ".getTable("item2user") . "i , " 
+            . getTable('channels2user') . " c2u "   
+            ." where i.fkcid=c2u.fkcid and i.flgdeleted=0 "
+            ." and c2u.fkuid=" . rss_user_id()
+            ." and i.fkuid=" . rss_user_id()
+            ." and c2u.flgdeleted=0"
             . (hidePrivate()? " and i.flgprivate=0":"");
             
@@ -184 +186 @@
         _pf(' ... feedsCount');             
         $res = rss_query("select count(*) from "
-            .getTable("channels")." where not(mode & ".RSS_MODE_DELETED_STATE.")"
-            . (hidePrivate()? " and not(mode & ".RSS_MODE_PRIVATE_STATE.")":"")
+            .getTable("channels2user")." where flgdeleted=0 "
+            ." and fkuid=" . rss_user_id()
+            . (hidePrivate()? " and flgprivate=0":"")
             );
             
@@ -220 +223 @@
             ." from "
             .getTable('item2user') ." i2u, "
-            .getTable('channels') . " c, "
+            .getTable('channels2user') . " c2u, "
             .getTable('folders') ." f "
             ." where i2u.flgunread =1 "
@@ -227 +230 @@
                 $sql .=" and i2u.flgprivate =0 ";
             }
-            $sql .= " and not(c.mode & " . RSS_MODE_DELETED_STATE .") ";
-            $sql .= " and i2u.fkcid=c.id and c.parent=f.id "
+            $sql .= " and c2u.fkuid=" . rss_user_id();
+            $sql .= " and c2u.flgdeleted=0 ";
+            $sql .= " and c2u.parent=f.id "
             ." group by f.id"; 
             _pf('query');
@@ -249 +253 @@
     function populate() {
         _pf('FeedList->populate() ...');
-        $sql = "select "." c.id, c.title, c.url, c.siteurl, f.name, c.parent, c.icon, c.descr, c.mode "." from ".getTable("channels")." c, "
-        .getTable("folders")." f "." where f.id = c.parent";
-
+        $sql = "select "
+        ." c.id, c.title, c.url, c.siteurl, f.name, c2u.parent, c2u.icon, c.descr, c2u.flgdeleted,c2u.flgprivate "
+        ." from "
+        .getTable("channels")." c, "
+        .getTable("channels2user")." c2u, "
+        .getTable("folders")." f "
+        
+        ." where "
+        ." f.id = c.parent "
+        ." and c2u.fkcid=c.id "
+        . " and c2u.fkuid=" . rss_user_id();
         if (hidePrivate()) {
-            $sql .= " and not(c.mode & ".RSS_MODE_PRIVATE_STATE.") ";
-        }
-
-        $sql .= " and not(c.mode & ".RSS_MODE_DELETED_STATE.") ";
+            $sql .= " and c2u.flgprivate=0 ";
+        }
+
+        $sql .= " and c2u.flgdeleted=0 ";
 
         if (getConfig('rss.config.absoluteordering')) {
-            $sql .= " order by f.position asc, c.position asc";
+            $sql .= " order by f.position asc, c2u.position asc";
         } else {
             $sql .= " order by f.name, c.title asc";

branches/multiuser/cls/items.php

@@ -262 +262 @@
         $this -> ORDER_BY_UNREAD_FIRST = " order by i2u.flgunread desc, ";
         if (getConfig('rss.config.absoluteordering')) {
-            $this -> ORDER_BY_UNREAD_FIRST .= " f.position asc, c.position asc";
+            $this -> ORDER_BY_UNREAD_FIRST .= " f.position asc, c2u.position asc";
         } else {
             $this -> ORDER_BY_UNREAD_FIRST .= " f.name asc, c.title asc";
@@ -284 +284 @@
       _pf('ItemList::populate()');
         $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, "
+        ."i2u.flgunread, i2u.flgprivate, i2u.flgsticky, i2u.flgdeleted, "
+        ." i2u.flgflagged,"
+            ."i.url, i.enclosure, i.author, i.description, c2u.icon, "
             ." unix_timestamp(ifnull(i.pubdate,i.added)) as ts, "
             ." i.pubdate is not null as ispubdate, i.id "
@@ -298 +299 @@
             //." left join "
             //. getTable("rating") ." r on (i.id = r.iid), "
-            .getTable("channels")." c on (i.cid=c.id) left join "
-            .getTable("folders") ." f on (c.parent=f.id) ";
+            .getTable('channels2user') ." c2u on (i.cid=c2u.fkcid) left join "
+            .getTable("channels")." c on (c2u.fkcid=c.id) left join "
+            .getTable("folders") ." f on (c2u.parent=f.id) ";
 
 
@@ -308 +310 @@
         
         $this -> _sqlActualWhere .= " and "
-            . (false == $includeDeprecated ? " not(c.mode & ".RSS_MODE_DELETED_STATE.") and " : "")
+            . (false == $includeDeprecated ? " c2u.flgdeleted=0 and " : "")
             ." i2u.flgdeleted=0 and ";
             
@@ -337 +339 @@
             if (!getConfig('rss.config.feedgrouping')) {
                 if(getConfig("rss.config.datedesc.$skey")){
-                    $this -> _sqlActualOrder = " ts desc, f.position asc, c.position asc ";
+                    $this -> _sqlActualOrder = " ts desc, f.position asc, c2u.position asc ";
                 }else{
-                    $this -> _sqlActualOrder = " ts asc, f.position asc, c.position asc ";
+                    $this -> _sqlActualOrder = " ts asc, f.position asc, c2u.position asc ";
                 }
             } elseif (getConfig('rss.config.absoluteordering')) {
-                $this -> _sqlActualOrder = " f.position asc, c.position asc";
+                $this -> _sqlActualOrder = " f.position asc, c2u.position asc";
             } else {
                 $this -> _sqlActualOrder = " f.name asc, c.title asc";

branches/multiuser/feed.php

@@ -61 +61 @@
 ) {
     $sqlid = sanitize($_REQUEST['channel'], RSS_SANITIZER_SIMPLE_SQL | RSS_SANITIZER_NO_SPACES);
-    $sql = "select id from " . getTable("channels") ." where title like '$sqlid'";
+    $sql = "select c.id from " 
+    . getTable("channels") 
+    ." c left join " .getTable('channels2user') ." c2u on (c.id=c2u.fkcid) "
+    ." where c.title like '$sqlid'";
     if (hidePrivate()) {
-        $sql .=" and not(mode & " . RSS_MODE_PRIVATE_STATE .") ";
+        $sql .=" and c2u.flgprivate=0 ";
     }
     // don't hide deprecated items becuase we want items of deprecated feeds to be accessible
@@ -76 +79 @@
 
         // is this a folder?
-        $sql = "select c.id, c.parent from ". getTable('channels')." c, "
+        $sql = "select c.id, c.parent from ". getTable('channels')." c left join "
+               . getTable('channels2user') .' c2u on (c.id=c2u.fkcid), '
                . getTable('folders') . " f "
                ." where c.parent=f.id and f.name like '$sqlid' and f.id > 0";
 
         if (hidePrivate()) {
-            $sql .=" and not(c.mode & " . RSS_MODE_PRIVATE_STATE .") ";
-        }
-        $sql .= " and not(c.mode & " .  RSS_MODE_DELETED_STATE .") ";
+            $sql .=" and c2u.flgprivate=0 ";
+        }
+        $sql .= " and c2u.flgdeleted=0 ";
 
         $res = rss_query( $sql );

branches/multiuser/index.php

@@ -162 +162 @@
         }
     $sql = "select "
-          ." c.id"
+          ." c2u.fkcid"
           ." from " 
-            .getTable("channels") . " c, " 
+            .getTable("channels2user") . " c2u, " 
             .getTable("folders") ." f "
-          ." where c.parent = f.id ";
+          ." where c2u.parent = f.id ";
           
          // $sql .= $sqlWhereHidden;
     
-        $sql .= " and not(c.mode & " . RSS_MODE_DELETED_STATE  .") ";
+        $sql .= " and c2u.flgdeleted=0 ";
         
         if (getConfig('rss.config.absoluteordering')) {
-            $sql .= " order by f.position asc, c.position asc";
+            $sql .= " order by f.position asc, c2u.position asc";
         } else {
-            $sql .=" order by f.name asc, c.title asc";
+            $sql .=" order by f.name asc, c2u.title asc";
         }
         $res1=rss_query($sql);

branches/multiuser/schema.php

@@ -52 +52 @@
         "properties" => trim(getTable("properties")),
         "item2user" => trim(getTable("item2user")),
+        "channels2user" => trim(getTable("channels2user")),
+
 
     );
@@ -269 +271 @@
         
         break;
+        case 'm.fkuid':
+            // userid on metatags - added in 0.5.5
+            rss_query('alter table ' . getTable('metatag') . ' add column fkuid bigint(15) not null');
+            rss_query('alter table ' . getTable('metatag') . " add index 'fkuid' ('fkuid')");
+            if (rss_is_sql_error(RSS_SQL_ERROR_NO_ERROR)) {
+                $updated++;
+                rss_error('updated schema for table ' . getTable('metatag'), RSS_ERROR_NOTICE);
+            } else {
+                rss_error('Failed updating schema for table ' . getTable('metatag') . ': '
+                    . rss_sql_error_message(), RSS_ERROR_ERROR);
+            }
+        
+        break;      
     }
     return $updated;
@@ -567 +582 @@
             fid bigint(16) NOT NULL default '0',                    
             tid bigint(16) NOT NULL default '0', 
+            fkuid bigint(16) NOT NULL default '1',
             ttype enum('item','folder','channel') NOT NULL default 'item', 
             KEY fid (fid), 
             KEY tid (tid),
+            KEY fkuid (fkuid),
             KEY ttype (ttype)
         ) TYPE=MyISAM;    
@@ -728 +745 @@
 }
 
+///////////////////////////////////////////////////////////////////////////////
+
+function _init_channels2user() {
+    $table = getTable('channels2user');
+    rss_query_wrapper ('DROP TABLE IF EXISTS ' . $table, true, true);
+    $sql_create = str_replace('__table__',$table, <<< _SQL_
+        CREATE TABLE __table__ (
+          id bigint(16) not null auto_increment,
+          fkcid bigint(16) NOT NULL,
+          fkuid bigint(16) NOT NULL,
+          icon varchar(255) default NULL,
+          position int(11) NOT NULL default '0',
+          parent tinyint(4) default '0',
+          flgprivate tinyint(1) NOT NULL default '0',
+          flgdeleted tinyint(1) not null default '0',
+          primary key (id),
+          KEY flgprivate (flgprivate),
+          KEY flgdeleted (flgdeleted),
+          KEY fkuid (fkuid),
+          KEY iids (fkcid)
+        ) ENGINE=MyISAM;
+_SQL_
+);
+
+
+    rss_query_wrapper($sql_create, false, true);
+
+    if (!rss_is_sql_error(RSS_SQL_ERROR_NO_ERROR)) {
+        rss_error('The ' . $table . 'table doesn\'t exist and I couldn\'t create it! Please create it manually.', RSS_ERROR_ERROR);
+        return 0;
+    } else {
+        $fillSql = "insert into $table "
+        ." (fkcid,fkuid,icon,position,parent,flgprivate,flgdeleted) "
+        ."select id, " . rss_user_id() . ", icon, position, parent, "
+        ." mode & ".RSS_MODE_PRIVATE_STATE." = ".RSS_MODE_PRIVATE_STATE.", "
+        ." mode & ".RSS_MODE_DELETED_STATE." = ".RSS_MODE_DELETED_STATE." "
+        ." from " .getTable('channels')
+        ." where url != ''";
+        //die($fillSql);
+        rss_query_wrapper($fillSql, false, true);
+        
+        rss_query(
+            'update ' .getTable('metatag') .' m '
+            .'set m.fkuid=' .rss_user_id());
+        /*
+        $rs = rss_query( "select id, fkcid from " .getTable('channels2user'));
+        $cids=array();
+        while(list($c2uid,$cid) = rss_fetch_row($rs)) {
+            $cids[$cid]=$c2uid;
+        }
+        */
+        return rss_is_sql_error(RSS_SQL_ERROR_NO_ERROR);
+    }
+}
+
+
 
 
@@ -776 +849 @@
 
 ";
-    foreach (array("channels","config","folders","item","metatag","tag","rating", "users", "dashboard","item2user") as $tbl) {
+    foreach (array("channels","config","folders","item","metatag","tag","rating", "users", "dashboard","item2user","channels2user") as $tbl) {
         call_user_func("_init_$tbl"); 
     }