[Feed-collector-svn] SF.net SVN: feed-collector: [106] trunk

[<C1...@us...>]

Revision: 106
          http://feed-collector.svn.sourceforge.net/feed-collector/?rev=106&view=rev
Author:   C167
Date:     2007-05-06 07:22:41 -0700 (Sun, 06 May 2007)

Log Message:
-----------
some changes

Modified Paths:
--------------
    trunk/class/Feed_manager.php
    trunk/inc/upperBar.php
    trunk/styles/default/common-screen.css
    trunk/styles/default/footer-screen.css
    trunk/styles/default/header-screen.css
    trunk/styles/default/main_copy-screen.css
    trunk/styles/default/page_main.tpl

Added Paths:
-----------
    trunk/styles/default/images/

Modified: trunk/class/Feed_manager.php
===================================================================
--- trunk/class/Feed_manager.php	2007-02-25 17:01:16 UTC (rev 105)
+++ trunk/class/Feed_manager.php	2007-05-06 14:22:41 UTC (rev 106)
@@ -159,7 +159,7 @@
 
 	/**
 	 * Get some feeds, pageable
-	 * @param int $count number of feeds to get (should alsways be the same!)
+	 * @param int $count number of feeds to get (should always be the same!)
 	 * @param int $page the number of the page to get.
 	 * @return mixed
 	 */
@@ -276,18 +276,13 @@
 	* @return Array An assoc array
 	*/
 	public function getRandomFeeds($count = 5) {
-		$count_feeds = $this->stat_countFeeds();
-		$rand = array ();
-		$rand = $this->generateRandomNumbers($count_feeds, 0, $count);
-		for ($i = 0; $i < $count; $i++) {
-
-			$feeds = $this->mdb->query(sprintf("SELECT feed_db_name, feed_name, items FROM feeds WHERE ID = %d;", $rand[$i]));
-			while ($row = $feeds->fetchRow()) {
-				$return[$i]['feed_name'] = $row['feed_name'];
-				$return[$i]['feed_db_name'] = $row['feed_db_name'];
-				$return[$i]['items'] = $row['items'];
-			}
-
+		$feeds = $this->mdb->query(sprintf("SELECT feed_db_name, feed_name, items FROM feeds ORDER BY RAND() LIMIT %d", $count));
+		$i = 0;
+		while ($row = $feeds->fetchRow()) {
+			$return[$i]['feed_name'] = $row['feed_name'];
+			$return[$i]['feed_db_name'] = $row['feed_db_name'];
+			$return[$i]['items'] = $row['items'];
+			$i++;
 		}
 		return $return;
 	}

Modified: trunk/inc/upperBar.php
===================================================================
--- trunk/inc/upperBar.php	2007-02-25 17:01:16 UTC (rev 105)
+++ trunk/inc/upperBar.php	2007-05-06 14:22:41 UTC (rev 106)
@@ -9,8 +9,9 @@
  */
 if (false === HTTP_Session :: get("logged_in", false)) {
 	$related_sites = sprintf("          <span>%s</span>\n" .
-	"          <a href=\"http://www.oswd.org\" title=\"The host of this base design\">OSWD</a> |\n" .
-	"          <a href=\"http://www.oswd.org/userinfo.phtml?user=haran\" title=\"Other designs by haran\">haran&rsquo;s Designs</a>\n", _("Related Sites:"));
+	"          <a href=\"http://validator.w3.org/check?uri=referer\" title=\"Validate XHTML\">Validate XHTML</a> |\n" .
+	"          <a href=\"http://www.oswd.org/userinfo.phtml?user=haran\" title=\"Other designs by haran\">haran&rsquo;s Designs</a> |\n" .
+	"          <a href=\"http://validator.w3.org/check?uri=referer\" title=\"Validate\">Validate</a>\n", _("Related Sites:"));
 } else {
 	$related_sites = sprintf("        <span>%s</span>\n" .
 	"        <a href=\"http://www.oswd.org\" title=\"The host of this base design\">OSWD</a> |\n" .

Modified: trunk/styles/default/common-screen.css
===================================================================
--- trunk/styles/default/common-screen.css	2007-02-25 17:01:16 UTC (rev 105)
+++ trunk/styles/default/common-screen.css	2007-05-06 14:22:41 UTC (rev 106)
@@ -3,7 +3,7 @@
  * URI: styles/default/common-screen.css *
  * MODIF: 2007-Jan-09 18:06 +0100        *
  *****************************************/
- @CHARSET "UTF-8";
+/*@CHARSET "UTF-8";*/
 
 /* ##### Common Styles ##### */
 .headerLogin {
@@ -156,4 +156,4 @@
 .smallCaps {
 	font-size: 117%;
 	font-variant: small-caps;
-}
\ No newline at end of file
+}

Modified: trunk/styles/default/footer-screen.css
===================================================================
--- trunk/styles/default/footer-screen.css	2007-02-25 17:01:16 UTC (rev 105)
+++ trunk/styles/default/footer-screen.css	2007-05-06 14:22:41 UTC (rev 106)
@@ -3,7 +3,7 @@
  * URI: styles/default/footer-screen.css *
  * MODIF: 2007-Jan-09 18:06 +0100        *
  *****************************************/
- @CHARSET "UTF-8";
+/*@CHARSET "UTF-8";*/
 
 
 /* ##### Footer ##### */
@@ -27,4 +27,4 @@
 
 #footer a:hover {
 	text-decoration: none;
-}
\ No newline at end of file
+}

Modified: trunk/styles/default/header-screen.css
===================================================================
--- trunk/styles/default/header-screen.css	2007-02-25 17:01:16 UTC (rev 105)
+++ trunk/styles/default/header-screen.css	2007-05-06 14:22:41 UTC (rev 106)
@@ -3,7 +3,7 @@
  * URI: styles/default/header-screen.css *
  * MODIF: 2007-Jan-09 18:06 +0100        *
  *****************************************/
- @CHARSET "UTF-8";
+/*@CHARSET "UTF-8";*/
 
 /* ##### Header ##### */
 .superHeader {
@@ -87,4 +87,4 @@
 	color: rgb(255, 204, 0);
 	background-color: transparent;
 	text-decoration: none;
-}
\ No newline at end of file
+}

Modified: trunk/styles/default/main_copy-screen.css
===================================================================
--- trunk/styles/default/main_copy-screen.css	2007-02-25 17:01:16 UTC (rev 105)
+++ trunk/styles/default/main_copy-screen.css	2007-05-06 14:22:41 UTC (rev 106)
@@ -3,7 +3,7 @@
  * URI: styles/default/main_copy-screen.css *
  * MODIF: 2007-Jan-09 18:06 +0100           *
  ********************************************/
- @CHARSET "UTF-8";
+/*@CHARSET "UTF-8";*/
 
 /* ##### Main Copy ##### */
 
@@ -49,4 +49,4 @@
  * .rowOfBoxes + .rowOfBoxes {
  *	 border-top: 1px solid rgb(204,204,204);
  * }
- */
\ No newline at end of file
+ */

Modified: trunk/styles/default/page_main.tpl
===================================================================
--- trunk/styles/default/page_main.tpl	2007-02-25 17:01:16 UTC (rev 105)
+++ trunk/styles/default/page_main.tpl	2007-05-06 14:22:41 UTC (rev 106)
@@ -1,7 +1,12 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+    "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+    <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" >
+<!--<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 Strict//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en-AU">
+-->
   <head>
     <meta http-equiv="content-type" content="application/xhtml+xml; charset=UTF-8" />
     <meta name="author" content="haran" />


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.