From 817c698e8f78c1099472175f730c49aa55c2d563 Mon Sep 17 00:00:00 2001
From: moodler <moodler>
Date: Sun, 17 Nov 2002 09:57:34 +0000
Subject: [PATCH] Slight updates

---
 auth/db/lib.php   |  1 +
 auth/imap/lib.php | 10 +++++-----
 auth/nntp/lib.php |  3 ++-
 auth/pop3/lib.php |  5 +++--
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/auth/db/lib.php b/auth/db/lib.php
index b975dcc0d9d..9f220e7415d 100644
--- a/auth/db/lib.php
+++ b/auth/db/lib.php
@@ -12,6 +12,7 @@ $CFG->auth_dbpass   = "pass";      // Password matching the above username
 $CFG->auth_dbtable  = "users";     // Name of the table in the database
 $CFG->auth_dbfielduser = "user";   // Name of the field containing usernames
 $CFG->auth_dbfieldpass = "pass";   // Name of the field containing passwords
+$CFG->auth_instructions = "Use the same username and password as your school account";   // Instructions
 
 function auth_user_login ($username, $password) {
 // Returns true if the username and password work
diff --git a/auth/imap/lib.php b/auth/imap/lib.php
index 8b0391ee8bf..5d9200933c9 100644
--- a/auth/imap/lib.php
+++ b/auth/imap/lib.php
@@ -4,10 +4,10 @@
 // This code is completely untested so far  -  IT NEEDS TESTERS!
 // Looks like it should work though ...
 
-$CFG->auth_imaphost   = "127.0.0.1";  // Should be IP number
+$CFG->auth_imaphost   = "202.0.185.16";  // Should be IP number
 $CFG->auth_imaptype   = "imap";   // imap, imapssl, imapcert
 $CFG->auth_imapport   = "143";        // 143, 993
-$CFG->auth_imapinfo   = "Just use the same username and password as your school email account";
+$CFG->auth_instructions = "Use the same username and password as your school email account";   // Instructions
 
 
 function auth_user_login ($username, $password) {
@@ -18,15 +18,15 @@ function auth_user_login ($username, $password) {
 
     switch ($CFG->auth_imaptype) {
         case "imapssl":
-            $host = "\{$CFG->auth_imaphost:$CFG->auth_imapport/imap/ssl}INBOX";
+            $host = "{".$CFG->auth_imaphost.":$CFG->auth_imapport/imap/ssl}INBOX";
         break;
 
         case "imapcert":
-            $host = "\{$CFG->auth_imaphost:$CFG->auth_imapport/imap/ssl/novalidate-cert}INBOX";
+            $host = "{".$CFG->auth_imaphost.":$CFG->auth_imapport/imap/ssl/novalidate-cert}INBOX";
         break;
 
         default:
-            $host = "\{$CFG->auth_imaphost:$CFG->auth_imapport}INBOX";
+            $host = "{".$CFG->auth_imaphost.":$CFG->auth_imapport}";
     }
 
     if ($connection = imap_open($host, $username, $password, OP_HALFOPEN)) {
diff --git a/auth/nntp/lib.php b/auth/nntp/lib.php
index ee148dd5433..605fcaf5c6f 100644
--- a/auth/nntp/lib.php
+++ b/auth/nntp/lib.php
@@ -6,6 +6,7 @@
 
 $CFG->auth_nntphost   = "127.0.0.1";  // Should be IP number
 $CFG->auth_nntpport   = "119";        // 119 is most common
+$CFG->auth_instructions = "Use the same username and password as your school news account";   // Instructions
 
 
 function auth_user_login ($username, $password) {
@@ -14,7 +15,7 @@ function auth_user_login ($username, $password) {
 
     global $CFG;
 
-    $host = "{$CFG->auth_nntphost:$CFG->auth_nntpport/nntp}";
+    $host = "{".$CFG->auth_nntphost.":$CFG->auth_nntpport/nntp}";
 
     if ($connection = imap_open($host, $username, $password, OP_HALFOPEN)) {
         imap_close($connection);
diff --git a/auth/pop3/lib.php b/auth/pop3/lib.php
index 6582c979c36..9a04493d154 100644
--- a/auth/pop3/lib.php
+++ b/auth/pop3/lib.php
@@ -7,6 +7,7 @@
 $CFG->auth_pop3host   = "127.0.0.1";  // Should be IP number
 $CFG->auth_pop3type   = "pop3";       // pop3, pop3cert
 $CFG->auth_pop3port   = "110";        // 110 is most common
+$CFG->auth_instructions = "Use the same username and password as your school email account";   // Instructions
 
 
 function auth_user_login ($username, $password) {
@@ -17,10 +18,10 @@ function auth_user_login ($username, $password) {
 
     switch ($CFG->auth_pop3type) {
         case "pop3":
-            $host = "{$CFG->auth_pop3host:$CFG->auth_pop3port/pop3}INBOX";
+            $host = "{".$CFG->auth_pop3host.":$CFG->auth_pop3port/pop3}INBOX";
         break;
         case "pop3cert":
-            $host = "{$CFG->auth_pop3host:$CFG->auth_pop3port/pop3/ssl/novalidate-cert}INBOX";
+            $host = "{".$CFG->auth_pop3host.":$CFG->auth_pop3port/pop3/ssl/novalidate-cert}INBOX";
         break;
     }