Auth: Replace hardcoded strings: MDL-8069

diff --git a/auth/cas/auth.php b/auth/cas/auth.php
index b3a48d657e905267fd04cd986158fee800316b1f..55b5b99e7b15f59b65aa88cd559191533dd8c301 100644 (file)
--- a/auth/cas/auth.php
+++ b/auth/cas/auth.php
@@ -95,7 +95,7 @@ class auth_plugin_cas {
             }
         } else {
             ldap_close($ldap_connection);
-            error("LDAP part of CAS-module cannot connect to server: $CFG->ldap_host_url");
+            print_error('auth_cas_cantconnect', 'auth', $CFG->ldap_host_url);
         }
         return false;
     }

diff --git a/auth/cas/config.html b/auth/cas/config.html
index 9d2084e787924bf27f6cdb047ba24e04b4884220..22250ff1a20d6f33856db32ac306d820ca7d962a 100644 (file)
--- a/auth/cas/config.html
+++ b/auth/cas/config.html
@@ -45,7 +45,7 @@
 </tr>
 
 <tr valign="top"  class="required">
-    <td align="right">use_cas:</td>
+    <td align="right"><?php print_string('auth_cas_use_cas', 'auth') ?>:</td>
     <td>
         <?php
 
@@ -59,7 +59,7 @@
 </tr>
 
 <tr valign="top" class="required">
-    <td align="right">hostname:</td>
+    <td align="right"><?php print_string('auth_cas_hostname_key', 'auth') ?>:</td>
     <td>
         <input name="hostname" type="text" size="30" value="<?php echo $config->hostname ?>" />
         <?php
@@ -74,7 +74,7 @@
 </tr>
 
 <tr valign="top"  class="required">
-    <td align="right">baseuri:</td>
+    <td align="right"><?php print_string('auth_cas_baseuri_key', 'auth') ?>:</td>
     <td>
         <input name="baseuri" type="text" size="30" value="<?php echo $config->baseuri ?>" />
         <?php
@@ -89,7 +89,7 @@
 </tr>
 
 <tr valign="top" class="required">
-    <td align="right">port:</td>
+    <td align="right"><?php print_string('auth_cas_port_key', 'auth') ?>:</td>
     <td>
         <input name="port" type="text" size="30" value="<?php echo $config->port ?>" />
         <?php
@@ -104,7 +104,7 @@
 </tr>
 
 <tr valign="top"  class="required">
-    <td align="right">casversion:</td>
+    <td align="right"><?php print_string('auth_cas_casversion', 'auth') ?>:</td>
     <td>
         <input name="casversion" type="text" size="30" value="<?php echo $config->casversion ?>" />
         <?php
@@ -119,7 +119,7 @@
 </tr>
 
 <tr valign="top"  class="required">
-    <td align="right">language:</td>
+    <td align="right"><?php print_string('auth_cas_language_key', 'auth') ?>:</td>
     <td>
         <?php
 
@@ -131,7 +131,7 @@
 </tr>
 
 <tr valign="top">
-    <td align="right">auth_user_create: </td>
+    <td align="right"><?php print_string('auth_cas_auth_user_create', 'auth') ?>: </td>
     <td>
       <?php
 
@@ -148,7 +148,7 @@
 </tr>
 
 <tr valign="top"  class="required">
-    <td align="right">create_user:</td>
+    <td align="right"><?php print_string('auth_cas_create_user_key', 'auth') ?>:</td>
     <td>
         <?php
 
@@ -163,7 +163,7 @@
 </tr>
 
 <tr valign="top">
-    <td align="right"> changepasswordurl: </td>
+    <td align="right"><?php print_string('auth_cas_changepasswordurl', 'auth') ?>: </td>
     <td>
         <input name="changepasswordurl" type="text" value="<?php echo $config->changepasswordurl ?>" />
         <?php

diff --git a/auth/cas/forbidden.php b/auth/cas/forbidden.php
index 80a62e6b2f81ec96df8640cfec0eb2c804098730..ce1b8b2dafdbc05ced01e78a8c718df0559f44a1 100644 (file)
--- a/auth/cas/forbidden.php
+++ b/auth/cas/forbidden.php
@@ -4,7 +4,7 @@
     require("../../config.php");
 
     if (!$site = get_site()) {
-        error("No site found!");
+        print_error('nosite', '', '', NULL, true);
     }
 
     $loginsite = get_string("loginsite");

diff --git a/auth/cas/login.php b/auth/cas/login.php
index 40093e8c117b0fbae6049dbb484dc7d9653b5a94..c0940bf59d5014fc8803d38bdc6ed80f8b4e12ed 100644 (file)
--- a/auth/cas/login.php
+++ b/auth/cas/login.php
@@ -7,7 +7,7 @@ defined('MOODLE_INTERNAL') or die('Direct access to this script is forbidden.');
 
     //Define variables used in page
     if (!$site = get_site()) {
-        error("No site found!");
+        print_error('nosite', '', '', NULL, true);
     }
 
     if (empty($CFG->langmenu)) {
@@ -118,9 +118,7 @@ defined('MOODLE_INTERNAL') or die('Direct access to this script is forbidden.');
                 if (isset($passwordchangeurl)) {
                     redirect($passwordchangeurl);
                 } else {
-                    error("You cannot proceed without changing your password. 
-                           However there is no available page for changing it.
-                           Please contact your Moodle Administrator.");
+                    print_error('auth_cas_broken_password','auth');
                 }
             }
 
@@ -224,9 +222,7 @@ defined('MOODLE_INTERNAL') or die('Direct access to this script is forbidden.');
             if (isset($passwordchangeurl)) {
                 redirect($passwordchangeurl);
             } else {
-                error("You cannot proceed without changing your password. 
-                       However there is no available page for changing it.
-                       Please contact your Moodle Administrator.");
+                print_error('auth_cas_broken_password','auth');
             }
         }
 

diff --git a/auth/db/auth.php b/auth/db/auth.php
index 893f11ee3d559a79093e3deb600ea37bf17fe138..2d7065a11dcb7212035f5eaf48ce640e72c2b19b 100644 (file)
--- a/auth/db/auth.php
+++ b/auth/db/auth.php
@@ -70,8 +70,7 @@ class auth_plugin_db {
             $authdb->Close();
 
             if (!$rs) {
-                notify("Could not connect to the specified authentication database...");
-
+                print_error('auth_dbcantconnect','auth');
                 return false;
             }
         
@@ -101,7 +100,7 @@ class auth_plugin_db {
             $CFG->prefix = $prefix;
             
             if (!$rs) {
-                notify("Could not connect to the specified authentication database...");
+                print_error('auth_dbcantconnect','auth');
                 return false;
             }
         
@@ -209,7 +208,8 @@ class auth_plugin_db {
         $remove_users = get_records_sql($sql); 
 
         if (!empty($remove_users)) {
-            print "User entries to remove: ". count($remove_users) . "\n";
+            print_string('auth_dbuserstoremove','auth', count($remove_users));
+            echo "\n";
 
             begin_sql();
             foreach ($remove_users as $user) {
@@ -295,7 +295,8 @@ class auth_plugin_db {
         unset($usernames);
 
         if (!empty($add_users)) {
-            print "User entries to add: ". count($add_users). "\n";
+            print_string('auth_dbuserstoadd','auth',count($add_users));
+            echo "\n";
             begin_sql();
             foreach($add_users as $user) {
                 $username = $user;
@@ -316,9 +317,11 @@ class auth_plugin_db {
                 if ($old_user = get_record('user', 'username', $user->username, 'deleted', 1, 'mnethostid', $user->mnethostid)) {
                     $user->id = $old_user->id;
                     set_field('user', 'deleted', 0, 'username', $user->username);
-                    echo "Revived user $user->username id $user->id\n";
+                    print_string('auth_dbrevive','auth',array($user->username, $user->id));
+                    echo "\n";
                 } elseif ($id=insert_record ('user',$user)) { // it is truly a new user
-                    echo "inserted user $user->username id $id\n";
+                    print_string('auth_dbinsertuser','auth',array($user->username, $id));
+                    echo "\n";
                     $user->id = $id;
                     // if relevant, tag for password generation
                     if ($this->config->passtype === 'internal') {
@@ -326,7 +329,8 @@ class auth_plugin_db {
                         set_user_preference('create_password',          1, $id);
                     }
                 } else {
-                    echo "error inserting user $user->username \n";
+                    print_string('auth_dbinsertusererror', 'auth', $user->username);
+                    echo "\n";
                 }
                 $CFG->debug=$old_debug;                        
             }
@@ -346,7 +350,7 @@ class auth_plugin_db {
         $authdb->Close();
 
         if (!$rs) {
-            notify("Could not connect to the specified authentication database...");
+            print_error('auth_dbcantconnect','auth');
             return false;
         }
         
@@ -377,7 +381,7 @@ class auth_plugin_db {
         $authdb->Close();
 
         if (!$rs) {
-            notify("Could not connect to the specified authentication database...");
+            print_error('auth_dbcantconnect','auth');
             return false;
         }
         
@@ -427,6 +431,7 @@ class auth_plugin_db {
         $user = get_record('user', 'username', $username, 'mnethostid', $CFG->mnet_localhost_id);
         if (empty($user)) { // trouble
             error_log("Cannot update non-existent user: $username");
+            print_error('auth_dbusernotexist','auth',$username);
             die;
         }
 

diff --git a/auth/db/config.html b/auth/db/config.html
index e2058e681b5e7e23c40834aa51f24bd710454c6b..09d70f4f0ac1bf22c99c1518c80599fb5616e1ce 100644 (file)
--- a/auth/db/config.html
+++ b/auth/db/config.html
@@ -38,7 +38,7 @@
 <table cellspacing="0" cellpadding="5" border="0" align="center">
 
 <tr valign="top" class="required">
-    <td align="right"> host: </td>
+    <td align="right"><?php print_string("auth_dbhost_key", "auth") ?>: </td>
     <td>
         <input name="host" type="text" size="30" value="<?php echo $config->host?>" />
         <?php
@@ -53,7 +53,7 @@
 </tr>
 
 <tr valign="top" class="required">
-    <td align="right"> type: </td>
+    <td align="right"><?php print_string("auth_dbtype_key", "auth") ?>: </td>
     <td>
     <?php  $dbtypes = array("access","ado_access", "ado", "ado_mssql", "borland_ibase", "csv", "db2", "fbsql", "firebird", "ibase", "informix72", "informix", "mssql", "mssql_n", "mysql", "mysqlt", "oci805", "oci8", "oci8po", "odbc", "odbc_mssql", "odbc_oracle", "oracle", "postgres64", "postgres7", "postgres", "proxy", "sqlanywhere", "sybase", "vfp");
        foreach ($dbtypes as $dbtype) {
@@ -69,7 +69,7 @@
 </tr>
 
 <tr valign="top" class="required">
-    <td align="right"> name: </td>
+    <td align="right"><?php print_string("auth_dbname_key", "auth") ?>: </td>
     <td>
         <input name="name" type="text" size="30" value="<?php echo $config->name?>" />
         <?php
@@ -84,7 +84,7 @@
 </tr>
 
 <tr valign="top" class="required">
-    <td align="right"> user: </td>
+    <td align="right"><?php print_string("auth_dbuser_key", "auth") ?>: </td>
     <td>
         <input name="user" type="text" size="30" value="<?php echo $config->user?>" />
         <?php
@@ -99,7 +99,7 @@
 </tr>
 
 <tr valign="top" class="required">
-    <td align="right"> pass: </td>
+    <td align="right"><?php print_string("auth_dbpass_key", "auth") ?>: </td>
     <td>
         <input name="pass" type="text" size="30" value="<?php echo $config->pass?>" />
         <?php
@@ -116,7 +116,7 @@
 </tr>
 
 <tr valign="top" class="required">
-    <td align="right"> table: </td>
+    <td align="right"><?php print_string("auth_dbtable_key", "auth") ?>: </td>
     <td>
         <input name="table" type="text" size="30" value="<?php echo $config->table?>" />
         <?php
@@ -131,7 +131,7 @@
 </tr>
 
 <tr valign="top" class="required">
-    <td align="right"> fielduser: </td>
+    <td align="right"><?php print_string("auth_dbfielduser_key", "auth") ?>: </td>
     <td>
         <input name="fielduser" type="text" size="30" value="<?php echo $config->fielduser?>" />
         <?php
@@ -146,7 +146,7 @@
 </tr>
 
 <tr valign="top" class="required">
-    <td align="right"> fieldpass: </td>
+    <td align="right"><?php print_string("auth_dbfieldpass_key", "auth") ?>: </td>
     <td>
         <input name="fieldpass" type="text" size="30" value="<?php echo $config->fieldpass?>" />
         <?php
@@ -161,7 +161,7 @@
 </tr>
 
 <tr valign="top" class="required">
-    <td align="right"> passtype: </td>
+    <td align="right"><?php print_string("auth_dbpasstype_key", "auth") ?>: </td>
     <td>
         <?php  
 
@@ -176,7 +176,7 @@
 </tr>
 
 <tr valign="top">
-    <td align="right"> changepasswordurl: </td>
+    <td align="right"><?php print_string("auth_dbchangepasswordurl_key", "auth") ?>: </td>
     <td>
         <input name="changepasswordurl" type="text" value="<?php echo $config->changepasswordurl ?>" />
         <?php

diff --git a/auth/email/auth.php b/auth/email/auth.php
index 690b166356f079ce3daa5ca36768f0185989e5ce..0fba410f8f2f0ea38fab0abb9c14ac47886d9ec7 100644 (file)
--- a/auth/email/auth.php
+++ b/auth/email/auth.php
@@ -78,10 +78,10 @@ class auth_plugin_email {
      */
     function user_signup($user, $notify = true) {
         if (! ($user->id = insert_record('user', $user)) ) {
-            error('Could not add your record to the database!');
+            print_error('auth_emailnoinsert','auth');
         }
         if (! send_confirmation_email($user)) {
-            error('Tried to send you an email but failed!');
+            print_error('auth_emailnoemail','auth');
         }
 
         if ($notify) {

diff --git a/auth/fc/config.html b/auth/fc/config.html
index f1d87ee1a7d318fdbe2a58fb482119387130b9c6..e99b1188ba2b6b342023c86df9cc6ab8dd4feb77 100644 (file)
--- a/auth/fc/config.html
+++ b/auth/fc/config.html
@@ -27,7 +27,7 @@
 <table cellspacing="0" cellpadding="5" border="0" align="center">
 
 <tr valign="top" class="required">
-       <td align="right">host:</td>
+       <td align="right"><?php  print_string("auth_fchost_key", "auth") ?>:</td>
     <td>
         <input name="host" type="text" size="30" value="<?php echo $config->host?>" />
        <?php  if (isset($err["host"])) formerr($err["host"]); ?>
@@ -38,7 +38,7 @@
 </tr>
 
 <tr valign="top" class="required">
-       <td align="right">fppport:</td>
+       <td align="right"><?php  print_string("auth_fcfppport_key", "auth") ?>:</td>
     <td>
         <input name="fppport" type="text" size="30" value="<?php echo $config->fppport?>" />
        <?php  if (isset($err["fppport"])) formerr($err["host"]); ?>
@@ -49,7 +49,7 @@
 </tr>
 
 <tr valign="top" class="required">
-       <td align="right">userid:</td>
+       <td align="right"><?php  print_string("auth_fcuserid_key", "auth") ?>:</td>
     <td>
         <input name="userid" type="text" size="30" maxlength="15" value="<?php echo $config->userid?>" />
        <?php  if (isset($err["userid"])) formerr($err["userid"]); ?>
@@ -58,9 +58,8 @@
     <?php  print_string("auth_fcuserid", "auth") ?>
     </td>
 </tr>
-
 <tr valign="top" class="required">
-       <td align="right">passwd:</td>
+       <td align="right"><?php  print_string("auth_fcpasswd_key", "auth") ?>:</td>
     <td>
         <input name="passwd" type="password" size="30" maxlength="12" value="<?php echo $config->passwd?>" />
        <?php  if (isset($err["passwd"])) formerr($err["passwd"]); ?>
@@ -71,7 +70,7 @@
 </tr>
 
 <tr valign="top" class="required">
-       <td align="right">creators:</td>
+       <td align="right"><?php  print_string("auth_fccreators_key", "auth") ?>:</td>
     <td>
         <input name="creators" type="text" size="30" value="<?php echo $config->creators?>" />
        <?php  if (isset($err["creators"])) formerr($err["creators"]); ?>
@@ -82,7 +81,7 @@
 </tr>
 
 <tr valign="top">
-    <td align="right"> changepasswordurl: </td>
+    <td align="right"><?php print_string('auth_fcchangepasswordurl', 'auth') ?>: </td>
     <td>
         <input name="changepasswordurl" type="text" value="<?php echo $config->changepasswordurl ?>" />
         <?php

diff --git a/auth/fc/fcFPP.php b/auth/fc/fcFPP.php
index 5ddd2c5a37b619693274053ed957f4d0039312b9..1e6351bef42cc620d21f1dd8afeb3776d8872f68 100644 (file)
--- a/auth/fc/fcFPP.php
+++ b/auth/fc/fcFPP.php
@@ -50,7 +50,7 @@ class fcFPP
     $conn = fsockopen($host, $port, $errno, $errstr, 5);
     if (!$conn)
     {
-        echo "connection failed!".$errno. $errstr;
+        print_error('auth_fcconnfail','auth', array($errno, $errstr));
         return false;
     }
     

diff --git a/auth/ldap/config.html b/auth/ldap/config.html
index 9f22fb10998e39286bbdf65730f2f9f9c34f7958..42b80f6aae0964608f068bf3a3e4c5da7dd1df2f 100644 (file)
--- a/auth/ldap/config.html
+++ b/auth/ldap/config.html
@@ -69,7 +69,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
 </tr>
 
 <tr valign="top" class="required">
-    <td align="right">host_url:</td>
+    <td align="right"><?php  print_string('auth_ldap_host_url_key','auth') ?>:</td>
     <td>
         <input name="host_url" type="text" size="30" value="<?php echo $config->host_url?>" />
     <?php  if (isset($err['host_url'])) formerr($err['host_url']); ?>
@@ -80,7 +80,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
 </tr>
 
 <tr valign="top" class="required">
-    <td align="right">version:</td>
+    <td align="right"><?php  print_string('auth_ldap_version_key','auth') ?>:</td>
     <td>
     <?php
        $versions[2] = '2';
@@ -101,7 +101,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
 </tr>
 
 <tr valign="top" class="required">
-    <td align="right">preventpassindb:</td>
+    <td align="right"><?php  print_string('auth_ldap_preventpassindb_key','auth') ?>:</td>
     <td>
     <?php
         $choices = array();
@@ -115,7 +115,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
 </tr>
 
 <tr valign="top" class="required">
-    <td align="right">bind_dn:</td>
+    <td align="right"><?php  print_string('auth_ldap_bind_dn_key','auth') ?>:</td>
     <td>
     <input name="bind_dn" type="text" size="30" value="<?php echo $config->bind_dn?>" />
     <?php  if (isset($err['bind_dn'])) formerr($err['bind_dn']); ?>
@@ -125,7 +125,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
 </tr>
 
 <tr valign="top" class="required">
-    <td align="right">bind_pw:</td>
+    <td align="right"><?php  print_string('auth_ldap_bind_pw_key','auth') ?>:</td>
     <td>
     <input name="bind_pw" type="password" size="30" value="<?php echo $config->bind_pw?>" />
     <?php  if (isset($err['bind_pw'])) formerr($err['bind_pw']); ?>
@@ -141,7 +141,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
 </tr>
 
 <tr valign="top" class="required">
-    <td align="right">user_type:</td>
+    <td align="right"><?php  print_string('auth_ldap_user_type_key','auth') ?>:</td>
     <td>
     <?php choose_from_menu($this->ldap_suppported_usertypes(), 'user_type', $config->user_type, ''); ?>
     <?php  if (isset($err['user_type'])) formerr($err['user_type']); ?>
@@ -152,7 +152,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
 </tr>
 
 <tr valign="top" class="required">
-    <td align="right">contexts:</td>
+    <td align="right"><?php  print_string('auth_ldap_contexts_key','auth') ?>:</td>
     <td>
     <input name="contexts" type="text" size="30" value="<?php echo $config->contexts?>" />
     <?php  if (isset($err['contexts'])) formerr($err['contexts']); ?>
@@ -163,7 +163,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
 </tr>
 
 <tr valign="top" class="required">
-    <td align="right">search_sub:</td>
+    <td align="right"><?php  print_string('auth_ldap_search_sub_key','auth') ?>:</td>
     <td>
 <?php
     $choices = array();
@@ -178,7 +178,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
     </td>
 </tr>
 <tr valign="top" class="required">
-    <td align="right">opt_deref:</td>
+    <td align="right"><?php  print_string('auth_ldap_opt_deref_key','auth') ?>:</td>
     <td>
     <?php
        $opt_deref[LDAP_DEREF_NEVER] = get_string('no');
@@ -195,7 +195,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
 
 
 <tr valign="top" class="required">
-    <td align="right">user_attribute:</td>
+    <td align="right"><?php  print_string('auth_ldap_user_attribute_key','auth') ?>:</td>
     <td>
     <input name="user_attribute" type="text" size="30" value="<?php echo $config->user_attribute?>" />
     <?php  if (isset($err['user_attribute'])) formerr($err['user_attribute']); ?>
@@ -206,7 +206,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
 </tr>
 
 <tr valign="top" class="required">
-        <td align="right">memberattribute:</td>
+        <td align="right"><?php  print_string('auth_ldap_memberattribute_key','auth') ?>:</td>
         <td>
     <input name="memberattribute" type="text" size="30" value="<?php echo $config->memberattribute?>" />
     <?php  if (isset($err['memberattribute'])) formerr($err['memberattribute']); ?>
@@ -216,7 +216,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
 </tr>
 
 <tr valign="top" class="required">
-    <td align="right">objectclass:</td>
+    <td align="right"><?php  print_string('auth_ldap_objectclass_key','auth') ?>:</td>
     <td>
     <input name="objectclass" type="text" size="30" value="<?php echo $config->objectclass?>" />
     <?php  if (isset($err['objectclass'])) formerr($err['objectclass']); ?>
@@ -268,7 +268,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
 </tr>
 
 <tr valign="top">
-    <td align="right"> changepasswordurl: </td>
+    <td align="right"><?php  print_string('auth_ldap_changepasswordurl_key','auth') ?>: </td>
     <td>
         <input name="changepasswordurl" type="text" value="<?php echo $config->changepasswordurl ?>" />
         <?php
@@ -289,7 +289,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
 </tr>
 
 <tr valign="top" class="required">
-    <td align="right">expiration:</td>
+    <td align="right"><?php  print_string('auth_ldap_expiration_key','auth') ?>:</td>
     <td>
     <?php
        $expiration['0'] = 'no';
@@ -305,7 +305,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
 
 
 <tr valign="top" class="required">
-    <td align="right">expiration_warning:</td>
+    <td align="right"><?php  print_string('auth_ldap_expiration_warning_key','auth') ?>:</td>
     <td>
     <input name="expiration_warning" type="text" size="2" value="<?php echo $config->expiration_warning?>" />
     <?php   if (isset($err['expiration_warning'])) formerr($err['expiration_warning']); 
@@ -317,7 +317,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
 </tr>
 
 <tr valign="top" class="required">
-    <td align="right">exprireattr:</td>
+    <td align="right"><?php  print_string('auth_ldap_exprireattr_key','auth') ?>:</td>
     <td>
     <input name="expireattr" type="text" size="30" value="<?php echo $config->expireattr?>" />
     <?php  if (isset($err['expireattr'])) formerr($err['expireattr']); 
@@ -329,7 +329,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
 </tr>
 
 <tr valign="top" class="required">
-    <td align="right">gracelogins:</td>
+    <td align="right"><?php  print_string('auth_ldap_gracelogins_key','auth') ?>:</td>
     <td>
     <?php
        $grace['0'] = get_string('no');
@@ -344,7 +344,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
 </tr>
 
 <tr valign="top" class="required">
-    <td align="right">graceattr:</td>
+    <td align="right"><?php  print_string('auth_ldap_gracelogin_key','auth') ?>:</td> 
     <td>
     <input name="graceattr" type="text" size="30" value="<?php echo $config->graceattr?>" />
     <?php   if (isset($err['graceattr'])) formerr($err['graceattr']); 
@@ -364,7 +364,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
 </tr>
 
 <tr valign="top">
-    <td align="right">auth_user_create: </td>
+    <td align="right"><?php  print_string('auth_ldap_auth_user_create_key','auth') ?>: </td>
     <td>
       <?php
 
@@ -380,9 +380,8 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
     </td>
 </tr>
 
-</tr>
 <tr valign="top" class="required">
-    <td align="right">create_context:</td>
+    <td align="right"><?php  print_string('auth_ldap_create_context_key','auth') ?>:</td>
     <td>
     <input name="create_context" type="text" size="30" value="<?php echo $config->create_context?>" />
     <?php  if (isset($err['create_context'])) formerr($err['create_context']); ?>
@@ -399,7 +398,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there?
 </tr>
 
 <tr valign="top" class="required">
-        <td align="right">creators:</td>
+        <td align="right"><?php  print_string('auth_ldap_creators_key','auth') ?>:</td>
         <td>
     <input name="creators" type="text" size="30" value="<?php echo $config->creators?>" />
     <?php  if (isset($err['creators'])) formerr($err['creators']); ?>

diff --git a/lang/en_utf8/auth.php b/lang/en_utf8/auth.php
index 457a434e20c54975711b17517f32f8b6d36ef68b..5dfff3405482867519371621446c9ef47579325d 100644 (file)
--- a/lang/en_utf8/auth.php
+++ b/lang/en_utf8/auth.php
@@ -23,6 +23,21 @@ $string['auth_cas_enabled'] = 'Turn this on if you want to use CAS authenticatio
 $string['auth_cas_text'] = 'Secure connection';
 $string['auth_cas_create_user'] = 'Turn this on if you want to insert CAS-authenticated users in Moodle database. If not then only users who already exist in the Moodle database can log in.';
 $string['auth_casnotinstalled'] = 'Cannot use CAS authentication. The PHP LDAP module is not installed.';
+$string['auth_cas_cantconnect'] ='LDAP part of CAS-module cannot connect to server: $a';
+$string['auth_cas_use_cas'] ='Use CAS';
+$string['auth_cas_broken_password'] ='You cannot proceed without changing your password, however there is no available page for changing it. Please contact your Moodle Administrator.';
+
+
+$string['auth_cas_hostname_key'] ='Hostname';
+$string['auth_cas_changepasswordurl'] ='Password-change URL';
+$string['auth_cas_create_user_key'] ='Create user';
+$string['auth_cas_auth_user_create'] ='Create users externally';
+$string['auth_cas_language_key'] ='Language';
+$string['auth_cas_casversion'] ='Version';
+$string['auth_cas_port_key'] ='Port';
+$string['auth_cas_baseuri_key'] ='Base URI';
+
+
 
 $string['auth_changepasswordurl'] = 'Change password URL';
 $string['auth_changepasswordurl_expl'] = 'Specify the url to send users who have lost their $a password. Set <strong>Use standard Change Password page</strong> to <strong>No</strong>.';
@@ -39,15 +54,34 @@ $string['auth_dbfielduser'] = 'Name of the field containing usernames';
 $string['auth_dbhost'] = 'The computer hosting the database server.';
 $string['auth_dbname'] = 'Name of the database itself';
 $string['auth_dbpass'] = 'Password matching the above username';
-$string['auth_dbpasstype'] = '<p>Specify the format that the password field is using. MD5 encryption is useful for connecting to other common web applications like PostNuke.</p> <p>Use \'internal\' if you want to the external DB to manage usernames & email addresses, but Moodle to manage passwords. If you use \'internal\', you <i>must</i> provide a populated email address field in the external DB, and you must execute admin/cron.php regularly. Moodle will send an email to new users with a temporary password.</p>';
+$string['auth_dbpasstype'] = '<p>Specify the format that the password field is using. MD5 encryption is useful for connecting to other common web applications like PostNuke.</p> <p>Use \'internal\' if you want to the external DB to manage usernames &amp; email addresses, but Moodle to manage passwords. If you use \'internal\', you <i>must</i> provide a populated email address field in the external DB, and you must execute admin/cron.php regularly. Moodle will send an email to new users with a temporary password.</p>';
 $string['auth_dbtable'] = 'Name of the table in the database';
 $string['auth_dbtitle'] = 'Use an external database';
 $string['auth_dbtype'] = 'The database type (See the <a href=\"../lib/adodb/readme.htm#drivers\">ADOdb documentation</a> for details)';
 $string['auth_dbuser'] = 'Username with read access to the database';
+$string['auth_dbcantconnect'] ='Could not connect to the specified authentication database...';
+$string['auth_dbuserstoadd'] = 'User entries to add: $a';
+$string['auth_dbrevive'] = 'Revived user $a[0] id $a[1]';
+$string['auth_dbinsertuser'] ='inserted user $a[0] id $a[1]';
+$string['auth_dbinsertusererror'] = 'error inserting user $a';
+$string['auth_dbuserstoremove'] = 'User entries to remove: $a';
+$string['auth_dbusernotexist'] = 'Cannot update non-existent user: $a';
+$string['auth_dbhost_key'] = 'Host';
+$string['auth_dbtype_key'] = 'Database';
+$string['auth_dbname_key'] = 'DB Name';
+$string['auth_dbuser_key'] = 'DB User';
+$string['auth_dbpass_key'] = 'Password';
+$string['auth_dbtable_key'] = 'Table';
+$string['auth_dbfielduser_key'] = 'Username field';
+$string['auth_dbfieldpass_key'] = 'Password field';
+$string['auth_dbpasstype_key'] = 'Password format';
+$string['auth_dbchangepasswordurl_key'] = 'Password-change URL';
 
 // Email plugin
 $string['auth_emaildescription'] = 'Email confirmation is the default authentication method.  When the user signs up, choosing their own new username and password, a confirmation email is sent to the user\'s email address.  This email contains a secure link to a page where the user can confirm their account. Future logins just check the username and password against the stored values in the Moodle database.';
 $string['auth_emailtitle'] = 'Email-based self-registration';
+$string['auth_emailnoinsert'] = 'Could not add your record to the database!';
+$string['auth_emailnoemail'] = 'Tried to send you an email but failed!';
 
 // FirstClass plugin
 $string['auth_fccreators'] = 'List of groups whose members are allowed to create new courses. Separate multiple groups with \';\'. Names must be spelled exactly as on FirstClass server. System is case-sensitive.';
@@ -57,6 +91,13 @@ $string['auth_fchost'] = 'The FirstClass server address. Use the IP number or DN
 $string['auth_fcpasswd'] = 'Password for the account above.';
 $string['auth_fctitle'] = 'Use a FirstClass server';
 $string['auth_fcuserid'] = 'Userid for FirstClass account with privilege \'Subadministrator\' set.';
+$string['auth_fchost_key'] = 'Host:';
+$string['auth_fcfppport_key'] = 'Port';
+$string['auth_fcuserid_key'] = 'User ID';
+$string['auth_fcpasswd_key'] = 'Password';
+$string['auth_fccreators_key'] = 'Creators';
+$string['auth_fcchangepasswordurl'] = 'Password-change URL';
+$string['auth_fcconnfail'] = 'Connection failed with Errno: $a[0] and Error String: $a[1]';
 
 // Fieldlocks
 $string['auth_fieldlock'] = 'Lock value';
@@ -81,7 +122,7 @@ $string['auth_ldap_create_context'] = 'If you enable user creation with email co
 $string['auth_ldap_creators'] = 'List of groups whose members are allowed to create new courses. Separate multiple groups with \';\'. Usually something like \'cn=teachers,ou=staff,o=myorg\'';
 $string['auth_ldap_expiration_desc'] = 'Select No to disable expired password checking or LDAP to read passwordexpiration time directly from LDAP';
 $string['auth_ldap_expiration_warning_desc'] = 'Number of days before password expiration warning is issued.';
-$string['auth_ldap_expireattr_desc'] = 'Optional: overrides ldap-attribute what stores password expiration time passwordExpirationTime';
+$string['auth_ldap_expireattr_desc'] = 'Optional: overrides ldap-attribute that stores password expiration time';
 $string['auth_ldap_graceattr_desc'] = 'Optional: Overrides  gracelogin attribute';
 $string['auth_ldap_gracelogins_desc'] = 'Enable LDAP gracelogin support. After password has expired user can login until gracelogin count is 0. Enabling this setting displays grace login message if password is exprired.';
 $string['auth_ldap_host_url'] = 'Specify LDAP host in URL-form like \'ldap://ldap.myorg.com/\' or \'ldaps://ldap.myorg.com/\' Separate multipleservers with \';\' to get failover support.';
@@ -107,6 +148,28 @@ $string['auth_ldapdescription'] = 'This method provides authentication against a
                                   wanted fields in Moodle.  For following logins only the username and 
 
                                   password are checked.';
+$string['auth_ldap_host_url_key'] = 'Host URL';
+$string['auth_ldap_version_key'] = 'Version';
+$string['auth_ldap_preventpassindb_key'] = 'Hide passwords';
+$string['auth_ldap_bind_dn_key'] = 'Distinguished Name';
+$string['auth_ldap_bind_pw_key'] = 'Password';
+$string['auth_ldap_user_type_key'] = 'User type';
+$string['auth_ldap_contexts_key'] = 'Contexts';
+$string['auth_ldap_search_sub_key'] = 'Search subcontexts';
+$string['auth_ldap_opt_deref_key'] = 'Dereference aliases';
+$string['auth_ldap_user_attribute_key'] = 'User attribute';
+$string['auth_ldap_memberattribute_key'] = 'Member attribute';
+$string['auth_ldap_objectclass_key'] = 'Object class';
+$string['auth_ldap_changepasswordurl_key'] = 'Password-change URL';
+$string['auth_ldap_expiration_key'] = 'Expiration';
+$string['auth_ldap_expiration_warning_key'] = 'Expiration warning';
+$string['auth_ldap_exprireattr_key'] = 'Expiration attribute';
+$string['auth_ldap_gracelogins_key'] = 'Grace logins';
+$string['auth_ldap_gracelogin_key'] = 'Grace login attribute';
+$string['auth_ldap_auth_user_create_key'] = 'Create users externally';
+$string['auth_ldap_create_context_key'] = 'Context for new users';
+$string['auth_ldap_creators_key'] = 'Creators';
+
 $string['auth_ldapextrafields'] = 'These fields are optional.  You can choose to pre-fill some Moodle user fields with information from the <b>LDAP fields</b> that you specify here. <p>If you leave these fields blank, then nothing will be transferred from LDAP and Moodle defaults will be used instead.</p><p>In either case, the user will be able to edit all of these fields after they log in.</p>';
 $string['auth_ldaptitle'] = 'Use an LDAP server';
 $string['auth_ldapnotinstalled'] = 'Cannot use LDAP authentication. The PHP LDAP module is not installed.';

diff --git a/lang/en_utf8/moodle.php b/lang/en_utf8/moodle.php
index 2fa79475eb158b9873fb1ebeaf1bdcbee6da3f4e..a01d1627cf334325084a37487583da9620dfa0d0 100644 (file)
--- a/lang/en_utf8/moodle.php
+++ b/lang/en_utf8/moodle.php
@@ -986,6 +986,7 @@ $string['noreplyname'] = 'Do not reply to this email';
 $string['noresults'] = 'No results';
 $string['normal'] = 'Normal';
 $string['normalfilter'] = 'Normal search';
+$string['nosite'] = 'Could not find site-level course';
 $string['nostatstodisplay'] = 'There is no available data to display, sorry.';
 $string['nostudentsfound'] = 'No $a found';
 $string['nostudentsingroup'] = 'There are no students in this group yet';