MyDynaWeb CVS: htdocs sukria

[mdw c. <myd...@li...>]

MyDynaWeb CVS committal

Author  : sukria
Project : mydynaweb
Module  : htdocs

Dir     : mydynaweb/htdocs


Modified Files:
	news.php topnews.php 


Log Message:

OKay 
I'm about to release 0.5
...




===================================================================
RCS file: /cvsroot/mydynaweb/mydynaweb/htdocs/news.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- news.php	2002/01/15 08:37:15	1.5
+++ news.php	2002/02/06 14:08:18	1.6
@@ -7,6 +7,25 @@
 $DBH->open($dbName, $dbServer, $dbUser, $dbPass);
 $ca= new cache($DBH);
 
+
+// 20 $news item a page 
+///////////////////////
+
+$limit = "limit 10, 20"; 
+if (isset($start)) {
+	$limit = "limit $start, $stop";
+}
+else if (isset($stop)) {
+	$limit = "limit $stop";
+}
+
+$start += 30;
+$stop  = 20;
+
+$p_start -= 30;
+
+if ($p_start < 0) $p_start = 10;
+
 $page = 10;
 
 if ($file_name=$ca->is_cached("NEWS.$q.$old.$num.$fam", USER_LANG, ACTIVE_THEME))
@@ -19,7 +38,13 @@
 {
 
 if ($old == "yes") {
-  $cond = "limit 10, 15000";
+  
+  if (!strlen($limit)) {
+        $cond = "limit 10, 15000";
+  } else {
+	$cond = $limit;
+  }
+  
   $old_or_not = "Old ";
   $chapeau_news = translate("OLD_NEWS",$DBH);
   $num_page_count = 6;
@@ -141,8 +166,7 @@
   if ( (strlen($q) || strlen($old)) && 
        (!strlen($num))
      ) {
-		
-	$PAGE .= "<a href=\"$PHP_SELF?num=$row[0]\"><li><b>$row[1]</b></a>, $da_formated_date $row[7] </li>";
+	$PAGE .= " <a href=\"$PHP_SELF?num=$row[0]\"> <b>$row[1]</b></a>, $da_formated_date $row[7] <br><br>";
   }
   else if (strlen($readmore)) {
     $full_title = "<b>$row[1]</b> <font size='-1'><i>".translate("POSTED_BY",$DBH)." $row[7] ".translate("ON",$DBH)." $da_formated_date</font>".translate('FROM_THE_CATEGORY', $DBH)." ". translate($family,$DBH) . "</i><br>";
@@ -220,19 +244,31 @@
 		$rqt->query($DBH, $sql);
 		$row = $rqt->getrow();
 		$page_header .= "$row[1]<p><img src='$row[0]'><p>";
+		$NEXT_FOOTER = "<table width=50% align=center><tr>
+				<td align=left><a href='news.php?q=$q&start=$p_start&stop=$stop'>&lt;&lt;</a></td>
+				<td align=right><a href='news.php?q=$q&start=$start&stop=$stop'>&gt;&gt;</a></td>
+				</tr></table>";
 	}
 	else {
 		$page_title = "OLD_NEWS_LIST_TITLE";
 		$page_header = "OLD_NEWS_LIST_HEADER";
 		$page_header = "<center>" . translate($page_header, $DBH);
+		$NEXT_FOOTER = "<table width=50% align=center><tr>
+				<td align=left><a href='news.php?old=yes&start=$p_start&stop=$stop'>&lt;&lt;</a></td>
+				<td align=right><a href='news.php?old=yes&start=$start&stop=$stop'>&gt;&gt;</a></td>
+				</tr></table>";
 	}
 	
+
+	$PAGE .= $NEXT_FOOTER;
+	
 	$HTML = get_page(translate($page_title, $DBH), $page_header, $PAGE, $DBH);
 	print_template(THEMES_PATH."/main.html", $HTML, translate("NEWS",$DBH),
 	$DBH,"NEWS.$q.$old.$num.$fam",$REMOTE_ADDR, $HTTP_REFERER, $MSG, 10, 20);
 	
 }
 else {
+	$PAGE .= $NEXT_FOOTER;
 	print_template(THEMES_PATH."/main.html", $PAGE, translate("NEWS",$DBH),
 	$DBH,"NEWS.$q.$old.$num.$fam",$REMOTE_ADDR, $HTTP_REFERER, $MSG, 10, $page);
 }
===================================================================
RCS file: /cvsroot/mydynaweb/mydynaweb/htdocs/topnews.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- topnews.php	2002/01/15 08:37:16	1.3
+++ topnews.php	2002/02/06 14:08:18	1.4
@@ -3,16 +3,30 @@
 include('./include/mydynaweb.init.php');
 include(DYNA_ROOT . '/include/mydynaweb.libs.php');
 
+$limit = "limit 0, 30"; 
+if (isset($start)) {
+	$limit = "limit $start, $stop";
+}
+else if (isset($stop)) {
+	$limit = "limit $stop";
+}
+$i=$start;
+$start += 30;
+$stop  = 30;
+
+$p_start -= 30;
+
+if ($p_start < 0) $p_start = 0;
 
 $DBH=new db();
 $DBH->open($dbName, $dbServer, $dbUser, $dbPass);
 
 $sql = "select titre, num_news, nbhit from news
-	order by nbhit desc";
+	order by nbhit desc
+	$limit";
 $rqt  = new query($DBH);
 $rqt->query($DBH, $sql) or send_sql_error($PHP_SELF, $sql, $rqt->error());
 $TEXTE .= "<table align='center' width='90%'>";
-$i=0;
 while ($row = $rqt->getrow())
 {
 	$numnews = $row[1];
@@ -26,11 +40,20 @@
 		$bgcolor = '#ffffff';
 	}
 	
-	$TEXTE .= "<tr bgcolor='$bgcolor'><td><a href=\"comment.php?news=$numnews\">$titre</a></td>
+	$TEXTE .= "<tr bgcolor='$bgcolor'><td align=right><b>$i</b></td> <td><a href=\"comment.php?news=$numnews\">$titre</a></td>
 	<td align='right'>$hits</td></tr>";
 }
+
+$NEXT_FOOTER = "<table width=50% align=center><tr>
+				<td align=left><a href='topnews.php?start=$p_start&stop=$stop'>&lt;&lt;</a></td>
+				<td align=right><a href='topnews.php?start=$start&stop=$stop'>&gt;&gt;</a></td>
+				</tr></table>";
+
+if (!$rqt->numrows()) {
+	$NEXT_FOOTER = "<center>" . translate("NO_NEWS", $DBH)."</center>";
+}
 
-$TEXTE .= "</table>";
+$TEXTE .= "</table>$NEXT_FOOTER";
 $title = "Top des nouvelles";
 $header = "<center>Voici les classements de nouvelles les plus visitées sur le site.</center>";