[Stack-cvs] stack-1-0 index.php,1.35,1.36 quiz.php,1.48,1.49 stackConfig.php.dist,1.6,1.7

[Chris S. <san...@us...>]

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

Modified Files:
	index.php quiz.php stackConfig.php.dist 
Log Message:


Index: quiz.php
===================================================================
RCS file: /cvsroot/stack/stack-1-0/quiz.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** quiz.php	19 Nov 2005 15:33:54 -0000	1.48
--- quiz.php	27 Nov 2005 11:30:52 -0000	1.49
***************
*** 802,805 ****
--- 802,808 ----
              <td>".get_string('STACKHomePage','stack','')."</td></tr>\n";
    echo "</table>";
+   if (''!=$options['TeacherEmail']) {
+       echo '<p>'.get_string('FE_index_email','stack',$options['TeacherEmail']).'</p>';
+   }
  
  

Index: stackConfig.php.dist
===================================================================
RCS file: /cvsroot/stack/stack-1-0/stackConfig.php.dist,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** stackConfig.php.dist	17 Nov 2005 21:54:19 -0000	1.6
--- stackConfig.php.dist	27 Nov 2005 11:30:52 -0000	1.7
***************
*** 129,135 ****
  /***************************************************/
  
  $stack_mail['sendmail']    = FALSE;                   // Don't send mail
  $stack_mail['smtp_host' ]  = 'mail.somewhere.com';    // smtp server
- $stack_mail['admin_email'] = 'so...@so...'; // The email address of the adminstrator.
  
  /*************************************************************/
--- 129,140 ----
  /***************************************************/
  
+ // The email address of the adminstrator.
+ $stack_mail['admin_email'] = 'so...@so...'; 
+ // If this empty, '', or has the value 'so...@so...' the email address
+ // at the bottom of subject and quiz pages will be suppressed.
+ 
+ // Use the settings below to have STACK send email automatically.
  $stack_mail['sendmail']    = FALSE;                   // Don't send mail
  $stack_mail['smtp_host' ]  = 'mail.somewhere.com';    // smtp server
  
  /*************************************************************/

Index: index.php
===================================================================
RCS file: /cvsroot/stack/stack-1-0/index.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** index.php	19 Nov 2005 15:33:54 -0000	1.35
--- index.php	27 Nov 2005 11:30:51 -0000	1.36
***************
*** 181,184 ****
--- 181,188 ----
              }
              echo $subject['subjectHTMLFoot'];
+             $options = stack_options_set(NULL,$subject);
+             if (''!=$options['TeacherEmail']) {
+                 echo '<p>'.get_string('FE_index_email','stack',$options['TeacherEmail']).'</p>';
+             }
          }
          break;