Changeset 1639 for branches/multiuser/cls

Timestamp:

11/24/06 16:23:35 (2 years ago)

Author:

mdodoo

Message:

Attempted sync with trunk through "diff -r." Ignored the internationalized langugage files because i was afraid of messing something up.

It is 10:30 am. I should get some sleep.

Location:

branches/multiuser/cls

Files:

• items.php (modified) (8 diffs)
• l10n.php (modified) (1 diff)
• update.php (modified) (5 diffs)
• wrappers/header.php (modified) (2 diffs)
• wrappers/item.php (modified) (1 diff)

branches/multiuser/cls/items.php

@@ -60 +60 @@
      * ctor
      */
-    function Item($id, $title, $url, $enclosure, $parent, $author, $description, $date, $isPubDate, $unread,$private, $sticky, $flagged) {
+    function Item($id, $title, $url, $enclosure, $parent, $author, $description, $date, $isPubDate, $unread, $rating) {
         $this->rss = &$GLOBALS['rss'];
         $this->id = $id;
-        //$this->flags = $unread;
+        $this->flags = $unread;
         if ($title) {
             $this->title = $title;
@@ -87 +87 @@
         $this -> tags=array();
         $this -> rating = $rating;
-        $this ->isUnread    = $unread;
-        $this ->isPrivate   = $private;
-        $this ->isDeleted   = $deleted;
-        $this ->isSticky    = $sticky;
-        $this ->isFlag      = $flagged;
+        $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 -> key = md5(rand(0,10000));
         
@@ -193 +193 @@
         $this->items[] = $item;
         
-        if ((!$this -> hasUnreadItems) && $item->isUnread) {
+        if ((!$this -> hasUnreadItems) && $item->flags & RSS_MODE_UNREAD_STATE) {
             $this -> hasUnreadItems = true;
         }
@@ -260 +260 @@
         
         // Predefined alternate ordering
-        $this -> ORDER_BY_UNREAD_FIRST = " order by i2u.flgunread desc, ";
+        $this -> ORDER_BY_UNREAD_FIRST = " order by i2u.flgunread & " . RSS_MODE_UNREAD_STATE . " desc, ";
         if (getConfig('rss.config.absoluteordering')) {
             $this -> ORDER_BY_UNREAD_FIRST .= " f.position asc, c2u.position asc";
         } else {
-            $this -> ORDER_BY_UNREAD_FIRST .= " f.name asc, c.title asc";
+            $this -> ORDER_BY_UNREAD_FIRST .= " f.name asc, c2u.title asc";
         }
         $this -> ORDER_BY_UNREAD_FIRST .= ", i.added desc, i.id asc";
@@ -271 +271 @@
 
     /**
-     * Populates a an ItemList with items from the Database. Note that this methdo
+     * Populates a an ItemList with items from the Database. Note that this method
      * can be invoked several times on the same ItemList object instance: upon each
      * call the new items will be aggregated to the existing ones.
@@ -283 +283 @@
 
       _pf('ItemList::populate()');
-        $this -> _sqlActualWhat = " i.title,  c.title, c.id, "
-        ."i2u.flgunread, i2u.flgprivate, i2u.flgsticky, i2u.flgdeleted, "
-        ." i2u.flgflagged,"
+        $this -> _sqlActualWhat = " i.title,  c.title, c.id, i2u.flgunread, "
             ."i.url, i.enclosure, i.author, i.description, c2u.icon, "
             ." unix_timestamp(ifnull(i.pubdate,i.added)) as ts, "
@@ -360 +358 @@
         $this -> _sqlActualLimit = " $startItem, $itemCount";
 
-        $sql = "\nselect\n\t "
+        $sql = "select "
             .$this -> _sqlActualWhat
-            . " \nfrom\n\t "
+            . " from "
             .$this -> _sqlActualFrom
-            . " \nwhere\n\t "
+            . " where "
             . $this -> _sqlActualWhere
-            . " \norder by\n\t "
+            . " order by "
             . $this -> _sqlActualOrder
-            . " \nlimit "
+            . " limit "
             . $this -> _sqlActualLimit;
             
-        //die( $sql );
+        //echo $sql;
         $this -> iids = array();
-        $res = rss_query($sql);
+        $res = $GLOBALS['rss_db']->rss_query($sql);
         $this -> rowCount = $GLOBALS['rss_db']->rss_num_rows($res);
         $prevCid = -1;
         $curIdx = 0;
         $f=null;
-        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)) {
+        while (list ($ititle_, $ctitle_, $cid_, $iunread_, $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_, $iprivate_, $isticky_, $iflagged_);
+            $i = new Item($iid_, $ititle_, $iurl_, $ienclosure_, $cid_, $iauthor_, $idescr_, $its_, $iispubdate_, $iunread_);
             
             // no dupes, please
@@ -413 +411 @@
             // Some stats...
             $this -> itemCount++;           
-            if ($iunread_) {
+            if ($iunread_ & RSS_MODE_UNREAD_STATE) {
                 $this -> unreadCount++; 
                 $this -> unreadIids[] = $iid_;

branches/multiuser/cls/l10n.php

@@ -75 +75 @@
     }
     /**
-     * Detect users preferred language. Losely based on http://grep.be/data/accept-to-gettext.inc
+     * Detect user's preferred language. 
+     * Loosely based on http://grep.be/data/accept-to-gettext.inc
      */
     function __detectUserLang() {
-       if (isset($_REQUEST['lang']) && preg_match('#^[a-z]{2}_?([A-Z]{2})?$#',$_REQUEST['lang']) && ($_REQUEST['lang'] == 'en' || file_exists(GREGARIUS_HOME .'intl/'.$_REQUEST['lang']))) {
+        // Language overridden?
+        if (defined('RSS_LANGUAGE_OVERRIDE')) {
+            return constant('RSS_LANGUAGE_OVERRIDE');
+        // Language defined in the request (?lang=)
+        } elseif (isset($_REQUEST['lang']) && preg_match('#^[a-z]{2}_?([A-Z]{2})?$#',$_REQUEST['lang']) && ($_REQUEST['lang'] == 'en' || file_exists(GREGARIUS_HOME .'intl/'.$_REQUEST['lang']))) {
             $this -> __setLocaleCookie($_REQUEST['lang']);
             rss_invalidate_cache();

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=0 where i2u.flgunread=1"
+                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).")");
             }
@@ -113 +114 @@
 
     function magpieError($error) {
-        if ($error & MAGPIE_FEED_ORIGIN_CACHE) {
+        if (is_numeric($error) && ($error & MAGPIE_FEED_ORIGIN_CACHE)) {
             if ($error & MAGPIE_FEED_ORIGIN_HTTP_304) {
                 $label = __('OK (304 Not modified)');
@@ -120 +121 @@
             elseif ($error & MAGPIE_FEED_ORIGIN_HTTP_TIMEOUT) {
                 $label = __('HTTP Timeout (Local cache)');
-                $cls = ERROR_WARNING;
+                $cls = ERROR_ERROR;
             }
             elseif ($error & MAGPIE_FEED_ORIGIN_NOT_FETCHED) {
@@ -129 +130 @@
                 $label = __('404 Not Found (Local cache)');
                 $cls = ERROR_ERROR;
+            } elseif ($error & MAGPIE_FEED_ORIGIN_HTTP_403) {
+                $label = __('403 Forbidden (Local cache)');
+                $cls = ERROR_ERROR;
             }
             else {
@@ -141 +145 @@
         else {
             if (is_numeric($error)) {
-                $label = __('ERROR');
+                $label = __('ERROR') ." $error";
                 $cls = ERROR_ERROR;
             } else {

branches/multiuser/cls/wrappers/header.php

@@ -135 +135 @@
 }
 
-function rss_header_logininfo() {
+function rss_header_logininfo($showLoginBox = true) {
 
     $ret = "<div id=\"loginfo\">\n";
@@ -142 +142 @@
         $ret .= sprintf(__('Logged in as <strong>%s</strong>'), rss_user_name())
                 ."&nbsp;|&nbsp;<a href=\"".getPath()."?logout\">".__('Logout')."</a>\n";
-    } else {
+    } else if(true == $showLoginBox) {
         $ret .= __('Not logged in')
                 ."&nbsp;|&nbsp;<a href=\"#\" onclick=\"miniloginform(); return false;\">".__('Login')."</a>";

branches/multiuser/cls/wrappers/item.php

@@ -47 +47 @@
     if (getConfig('rss.output.usepermalinks')) {
         list ($ply, $plm, $pld) = explode(":", rss_date("Y:m:d", $GLOBALS['rss'] -> currentItem -> date, false));
-        $ptitle = ($label."'".$GLOBALS['rss'] -> currentItem -> parent -> escapedTitle
-            ."/$ply/$plm/$pld/".$GLOBALS['rss'] -> currentItem -> escapedTitle."'");
-    }
-    return $ptitle;
+        $ptitle = ($label."'". htmlentities($GLOBALS['rss'] -> currentItem -> title,ENT_QUOTES  ,'UTF-8') ."'");
+    }
+    return @$ptitle;
 }