Commit fe2964ab authored by Yuliya Bozhko's avatar Yuliya Bozhko
Browse files

Remove unused port number from XMLRPC auth (Bug #1220410)



Change-Id: I87ec616b0d27d9c168ad0233457ac6feec94301c
Signed-off-by: default avatarYuliya Bozhko <yuliya.bozhko@totaralms.com>
parent 25555c2a
<!-- @license http://www.gnu.org/copyleft/gpl.html GNU GPL version 3 or later -->
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Port number</h3>
<p>The port number that the remote application is listening at. You probably won't need to change this unless you are connecting to a https service, or your remote app is running on a non-standard port.</p>
......@@ -777,18 +777,6 @@ class PluginAuthXmlrpc extends PluginAuth {
'help' => true
);
$elements['portno'] = array(
'type' => 'text',
'title' => get_string('port', 'auth'),
'rules' => array(
'required' => true,
'integer' => true
),
'defaultvalue' => $peer->portno,
'size' => 4,
'help' => true
);
$elements['parent'] = array(
'type' => 'select',
'title' => get_string('parent','auth'),
......@@ -931,7 +919,6 @@ class PluginAuthXmlrpc extends PluginAuth {
$peer->wwwroot = preg_replace("|\/+$|", "", $values['wwwroot']);
$peer->name = $values['name'];
$peer->deleted = $values['deleted'];
$peer->portno = $values['portno'];
$peer->appname = $values['appname'];
$peer->institution = $values['institution'];
if (isset($values['publickey'])) {
......
......@@ -14,8 +14,6 @@ defined('INTERNAL') || die();
// IMAP
$string['host'] = 'Hostname or address';
$string['wwwroot'] = 'WWW root';
$string['port'] = 'Port number';
$string['protocol'] = 'Protocol';
$string['changepasswordurl'] = 'Password-change URL';
$string['cannotremove'] = "We cannot remove this authentication plugin, as it is the only \nplugin that exists for this institution.";
......
......@@ -264,7 +264,6 @@
<FIELD NAME="name" TYPE="char" LENGTH="80" NOTNULL="true"/>
<FIELD NAME="institution" TYPE="char" LENGTH="255" NOTNULL="true"/>
<FIELD NAME="ipaddress" TYPE="char" LENGTH="39" NOTNULL="true"/>
<FIELD NAME="portno" TYPE="int" LENGTH="10" NOTNULL="true" DEFAULT="80"/>
<FIELD NAME="appname" TYPE="char" LENGTH="20" NOTNULL="true"/>
<FIELD NAME="publickey" TYPE="text" NOTNULL="true" DEFAULT=""/>
<FIELD NAME="publickeyexpires" TYPE="int" LENGTH="10" NOTNULL="true"/>
......
......@@ -3149,5 +3149,11 @@ function xmldb_core_upgrade($oldversion=0) {
}
}
if ($oldversion < 2014022600) {
$table = new XMLDBTable('host');
$field = new XMLDBField('portno');
drop_field($table, $field);
}
return $status;
}
......@@ -25,7 +25,6 @@ class Peer {
'name' => '',
'institution' => '',
'ipaddress' => '',
'portno' => 80,
'publickey' => '',
'publickeyexpires' => 0,
'deleted' => 0,
......@@ -75,7 +74,6 @@ class Peer {
!empty($this->name) &&
!empty($this->institution) &&
!empty($this->ipaddress) &&
!empty($this->portno) &&
!empty($this->appname) &&
!empty($this->publickey) &&
!empty($this->publickeyexpires)) {
......@@ -125,7 +123,6 @@ class Peer {
$host->name = $this->name;
$host->publickey = $this->certificate;
$host->publickeyexpires = $this->publickeyexpires;
$host->portno = $this->portno;
$host->lastconnecttime = $this->lastconnecttime;
$host->appname = $this->appname;
$host->institution = $this->institution;
......
......@@ -15,7 +15,7 @@ $config = new stdClass();
// See https://wiki.mahara.org/index.php/Developer_Area/Version_Numbering_Policy
// For upgrades on stable branches, increment the version by one. On master, use the date.
$config->version = 2014022400;
$config->version = 2014022600;
$config->release = '1.9.0dev';
$config->minupgradefrom = 2009022600;
$config->minupgraderelease = '1.1.0 (release tag 1.1.0_RELEASE)';
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment