diff --git a/cdm.css b/cdm.css index 7d02bc645..b793ee058 100644 --- a/cdm.css +++ b/cdm.css @@ -45,10 +45,6 @@ div.cdmHeader img, div.cdmFooter img { margin : 0px 2px 0px 2px; } -div.cdmContent, div.cdmContentInner * { - font-weight : normal; -} - div.cdmContent a { color : #4684ff; } @@ -155,3 +151,7 @@ div.cdmHeader div.hlFeed, div.cdmHeader div.hlFeed a { div.cdmContentInner p { max-width : 650px; } + +.Unread div.cdmHeader { + font-weight : bold; +} diff --git a/classes/feeds.php b/classes/feeds.php index c464303c1..0568eb985 100644 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -263,6 +263,8 @@ class Feeds extends Handler_Protected { if ($_REQUEST["debug"]) $timing_info = print_checkpoint("PS", $timing_info); + $expand_cdm = get_pref($this->link, 'CDM_EXPANDED'); + while ($line = db_fetch_assoc($result)) { $class = ($lnum % 2) ? "even" : "odd"; @@ -512,8 +514,6 @@ class Feeds extends Handler_Protected { } } - $expand_cdm = get_pref($this->link, 'CDM_EXPANDED'); - $mouseover_attrs = "onmouseover='postMouseIn($id)' onmouseout='postMouseOut($id)'"; @@ -627,17 +627,18 @@ class Feeds extends Handler_Protected { } $reply['content'] .= ""; - $reply['content'] .= $line["content"]; + + if (!$expand_cdm) { + $reply['content'] .= ""; + $reply['content'] .= htmlspecialchars($line["content"]); + $reply['content'] .= "link, "SELECT always_display_enclosures FROM - ttrss_feeds WHERE id = ". - (($line['feed_id'] == null) ? $line['orig_feed_id'] : - $line['feed_id'])." AND owner_uid = ".$_SESSION["uid"]); - - $always_display_enclosures = sql_bool_to_bool(db_fetch_result($tmp_result, - 0, "always_display_enclosures")); */ - $always_display_enclosures = sql_bool_to_bool($line["always_display_enclosures"]); $reply['content'] .= format_article_enclosures($this->link, $id, $always_display_enclosures, @@ -945,6 +946,5 @@ class Feeds extends Handler_Protected { return $reply; } - } ?> diff --git a/config.php-dist b/config.php-dist index a742cf9af..4414e77d3 100644 --- a/config.php-dist +++ b/config.php-dist @@ -128,6 +128,8 @@ define('SESSION_COOKIE_LIFETIME', 86400*30); // Default lifetime of a session (e.g. login) cookie. In seconds, // 0 means cookie will be deleted when browser closes. + // Setting this to zero will affect several user preferences + // like widescreen mode not saving. define('SESSION_EXPIRE_TIME', 86400*30); // Hard expiration limit for sessions. Should be diff --git a/include/functions.php b/include/functions.php index 62699e175..d9a3a5963 100644 --- a/include/functions.php +++ b/include/functions.php @@ -295,7 +295,7 @@ curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $timeout ? $timeout : 15); curl_setopt($ch, CURLOPT_TIMEOUT, $timeout ? $timeout : 45); - //curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true); + curl_setopt($ch, CURLOPT_FOLLOWLOCATION, !ini_get("safe_mode")); curl_setopt($ch, CURLOPT_MAXREDIRS, 20); curl_setopt($ch, CURLOPT_BINARYTRANSFER, true); curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); @@ -2609,7 +2609,8 @@ } if ($entry->nodeName == 'img') { - if (get_pref($link, "STRIP_IMAGES", $owner) || $force_remove_images) { + if (($owner && get_pref($link, "STRIP_IMAGES", $owner)) || + $force_remove_images) { $p = $doc->createElement('p'); @@ -3633,7 +3634,7 @@ array_push($entries, $entry); } - if (!get_pref($link, "STRIP_IMAGES")) { + if ($_SESSION['uid'] && !get_pref($link, "STRIP_IMAGES")) { if ($always_display_enclosures || !preg_match("/\n"; + } + + function javascript_tag($filename) { + $query = ""; + + if (!(strpos($filename, "?") === FALSE)) { + $query = substr($filename, strpos($filename, "?")+1); + $filename = substr($filename, 0, strpos($filename, "?")); + } + + $timestamp = filemtime($filename); + + if ($query) $timestamp .= "&$query"; + + echo "\n"; + } + ?> diff --git a/include/localized_schema.php b/include/localized_schema.php index 71436d96a..2f5903dc7 100644 --- a/include/localized_schema.php +++ b/include/localized_schema.php @@ -1,4 +1,4 @@ - <?php echo PAGE_TITLE ?> - - - + + + + @@ -74,14 +73,18 @@ - - - - - + "> - + echo javascript_tag($jsfile); + + } ?> - - + - - - - +