[Stack-cvs] stack-1-0 index.php,1.17.2.5,1.17.2.6 quiz.php,1.22.2.2,1.22.2.3 select_quiz.php,1.1.4.4,NONE

[Juliette W. <jv...@us...>]

Update of /cvsroot/stack/stack-1-0
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26394

Modified Files:
      Tag: frontend_dev
	index.php quiz.php 
Removed Files:
      Tag: frontend_dev
	select_quiz.php 
Log Message:
Put select quiz stuff back into the index file.

--- select_quiz.php DELETED ---

Index: quiz.php
===================================================================
RCS file: /cvsroot/stack/stack-1-0/quiz.php,v
retrieving revision 1.22.2.2
retrieving revision 1.22.2.3
diff -C2 -d -r1.22.2.2 -r1.22.2.3
*** quiz.php	14 Jun 2005 17:54:52 -0000	1.22.2.2
--- quiz.php	16 Jun 2005 12:13:37 -0000	1.22.2.3
***************
*** 666,670 ****
    echo "<tr><td nowrap='nowrap'><a href=\"index.php?action=choose_quiz\">".get_string('ChooseQuiz','stack','')."</a></td>
              <td>".get_string('ClickHereTryQuiz','stack','')."</td></tr>\n
!         <tr><td><a href='select_quiz.php'>".get_string('Home','stack','')."</a></td>
              <td>".get_string('STACKHomePage','stack','')."</td></tr>\n";
    echo "</table>";
--- 666,670 ----
    echo "<tr><td nowrap='nowrap'><a href=\"index.php?action=choose_quiz\">".get_string('ChooseQuiz','stack','')."</a></td>
              <td>".get_string('ClickHereTryQuiz','stack','')."</td></tr>\n
!         <tr><td><a href='index.php?action=choose_quiz'>".get_string('Home','stack','')."</a></td>
              <td>".get_string('STACKHomePage','stack','')."</td></tr>\n";
    echo "</table>";

Index: index.php
===================================================================
RCS file: /cvsroot/stack/stack-1-0/index.php,v
retrieving revision 1.17.2.5
retrieving revision 1.17.2.6
diff -C2 -d -r1.17.2.5 -r1.17.2.6
*** index.php	16 Jun 2005 11:44:44 -0000	1.17.2.5
--- index.php	16 Jun 2005 12:13:37 -0000	1.17.2.6
***************
*** 37,41 ****
  
  ///////////////////////////////////////////////////////////////
! // (2) Log out the user if required.
  ///////////////////////////////////////////////////////////////
  
--- 37,41 ----
  
  ///////////////////////////////////////////////////////////////
! // (2) Take any actions required
  ///////////////////////////////////////////////////////////////
  
***************
*** 47,50 ****
--- 47,52 ----
  }
  
+ include('frontend_general/loginregister.php');
+ 
  //////////////////////////////////////////////////////////////
  // (2) Print the page.
***************
*** 88,91 ****
--- 90,107 ----
  }
  
+ if ('welcome' == $action) {
+      stack_welcome_screen($user);
+      $action = 'choose_quiz';
+ }
+ 
+ if ('error' == $action) {
+      stack_login_error_screen($error);
+ }
+ 
+ if ('choose_quiz' == $action) {
+        $quiz_store = stack_db_quiz_get();
+        stack_select_quiz_screen($quiz_store, $user);
+ }
+ 
  include('html/pagefoot.php');