MDL-11448 FirstClass Authentication does not hold settings and has cosmetic and info...

diff --git a/auth/fc/auth.php b/auth/fc/auth.php
index 45049ad9f2a7b7def50ced63466f872946565c79..9ef341b3521176d814c43ab1af9f22c147c33567 100644 (file)
--- a/auth/fc/auth.php
+++ b/auth/fc/auth.php
@@ -88,7 +88,7 @@ class auth_plugin_fc extends auth_plugin_base {
 
         $userinfo = array();
 
-        $fpp = new fcFPP($this->config->host, $this->config->port);
+        $fpp = new fcFPP($this->config->host, $this->config->fppport);
         if ($fpp->open()) {
             if ($fpp->login($this->config->userid, $this->config->passwd)) {
                 $userinfo['firstname']   = $fpp->getUserInfo($username,"1202");
@@ -121,7 +121,7 @@ class auth_plugin_fc extends auth_plugin_base {
 
         $fcgroups = array();
 
-        $fpp = new fcFPP($this->config->host, $this->config->port);
+        $fpp = new fcFPP($this->config->host, $this->config->fppport);
         if ($fpp->open()) {
             if ($fpp->login($this->config->userid, $this->config->passwd)) {
                 $fcgroups = $fpp->getGroups($username);
@@ -224,7 +224,7 @@ class auth_plugin_fc extends auth_plugin_base {
         }
 
         // save settings
-        set_config('host',      $config->user,     'auth/fc');
+        set_config('host',      $config->host,     'auth/fc');
         set_config('fppport',   $config->fppport,  'auth/fc');
         set_config('userid',    $config->userid,   'auth/fc');
         set_config('passwd',    $config->passwd,   'auth/fc');

diff --git a/auth/fc/fcFPP.php b/auth/fc/fcFPP.php
index 57a2ef1848cfdba49ac088026d6ed422d1d7cf0c..7b844478e5fec4e2ad081681498372538b41fae7 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)
     {
-        print_error('auth_fcconnfail','auth', array($errno, $errstr));
+        print_error('auth_fcconnfail','auth', '', array($errno, $errstr));
         return false;
     }
 

diff --git a/lang/en_utf8/auth.php b/lang/en_utf8/auth.php
index ba7794294103ac86234fd0e6e9f768a1ad1f51ca..0987eb8a07d4cad64d5c2ac18500c3bc6e1e9699 100644 (file)
--- a/lang/en_utf8/auth.php
+++ b/lang/en_utf8/auth.php
@@ -123,7 +123,7 @@ $string['auth_fchost'] = 'The FirstClass server address. Use the IP number or DN
 $string['auth_fcpasswd'] = 'Password for the account above.';
 $string['auth_fctitle'] = 'FirstClass server';
 $string['auth_fcuserid'] = 'Userid for FirstClass account with privilege \'Subadministrator\' set.';
-$string['auth_fchost_key'] = 'Host:';
+$string['auth_fchost_key'] = 'Host';
 $string['auth_fcfppport_key'] = 'Port';
 $string['auth_fcuserid_key'] = 'User ID';
 $string['auth_fcpasswd_key'] = 'Password';