[CVS] openbash-org/pages footer.php,1.11,1.12 header.php,1.13,1.14 quote.php,1.4,1.5

[Javier B. <jb...@us...>]

Update of /cvsroot/openbash-org/openbash-org/pages
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19217/pages

Modified Files:
	footer.php header.php quote.php 
Log Message:
random1, footer cambiado, etc

Index: header.php
===================================================================
RCS file: /cvsroot/openbash-org/openbash-org/pages/header.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** header.php	17 Nov 2004 17:59:21 -0000	1.13
--- header.php	18 Nov 2004 12:27:10 -0000	1.14
***************
*** 33,37 ****
      / <a href="?page=browse"><?=$sentences['browse']?></a>
      / <a href="?page=quote&amp;action=random"><?=$sentences['random']?></a>
!     <a href="?page=random1&amp;action=random1">&gt;0</a>
      / <a href="?page=quote&amp;action=top&amp;top=100">Top 100</a>
      <a href="?page=quote&amp;action=top&amp;top=200">-200</a>
--- 33,37 ----
      / <a href="?page=browse"><?=$sentences['browse']?></a>
      / <a href="?page=quote&amp;action=random"><?=$sentences['random']?></a>
!     <a href="?page=quote&amp;action=random1">&gt;0</a>
      / <a href="?page=quote&amp;action=top&amp;top=100">Top 100</a>
      <a href="?page=quote&amp;action=top&amp;top=200">-200</a>

Index: footer.php
===================================================================
RCS file: /cvsroot/openbash-org/openbash-org/pages/footer.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** footer.php	17 Nov 2004 10:46:48 -0000	1.11
--- footer.php	18 Nov 2004 12:27:10 -0000	1.12
***************
*** 2,11 ****
  <div id="footer">
  <?
!   $approved_sql = 'SELECT COUNT(*) FROM quote WHERE pending=0';
!   $pending_sql = 'SELECT COUNT(*) FROM quote WHERE pending=1';
!   $count_approved = $bd->getOne($approved_sql);
!   $count_pending = $bd->getOne($pending_sql);
  ?>
! <?=$sentences['approved']?>: <?=$count_approved?> | <?=$sentences['pending']?>: <?=$count_pending?>
  </div>
  
--- 2,9 ----
  <div id="footer">
  <?
! 	include_once("modules/Quote.php");
! 	$quotes = new quote();
  ?>
! <?=$sentences['approved']?>: <?=$quotes->get_aproved_quotes();?> | <?=$sentences['pending']?>: <?=$quotes->get_pending_quotes();?>
  </div>
  

Index: quote.php
===================================================================
RCS file: /cvsroot/openbash-org/openbash-org/pages/quote.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** quote.php	16 Nov 2004 17:23:41 -0000	1.4
--- quote.php	18 Nov 2004 12:27:10 -0000	1.5
***************
*** 7,10 ****
--- 7,14 ----
  
  if (isset($_GET['action'])) {
+   /*
+    * check _GET args
+    */
+   
    if (isset($_GET['start'])) { $start = variable_clean($_GET['start']); }
    else { $start = 0; }
***************
*** 13,16 ****
--- 17,25 ----
    if (isset($_GET['top'])) { $top = variable_clean($_GET['top']); }
    else { $top = 100; }
+ 
+   /*
+    * do stuff
+    */
+   
    switch ($_GET['action']) {
      case 'latest': $quote->get_quotes_by_id("DESC", $start, $end); break;
***************
*** 21,25 ****
                     $quote->insert_quote($_POST['quote'], $_POST['author'], $_POST['channel'], $_POST['network'], $ip); break;
      case 'single': $quote->get_quote($_GET['quote']); break;
!     default:       $quote->get_quotes_by_random($start, $end); break; //defaults to random
    }
  }
--- 30,36 ----
                     $quote->insert_quote($_POST['quote'], $_POST['author'], $_POST['channel'], $_POST['network'], $ip); break;
      case 'single': $quote->get_quote($_GET['quote']); break;
!     case 'random1':$quote->get_quotes_by_random(1);break;
!     default:       $quote->get_quotes_by_random(); break; //defaults to random quotes
    }
  }
+ ?>