r76055 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r76054‎ \| r76055 \| r76056 >
Date:	23:21, 4 November 2010
Author:	demon
Status:	ok
Tags:
Comment:	Replace XML->HTML methods throughout most of the installer
Modified paths:	/trunk/phase3/includes/installer/DatabaseInstaller.php (modified) (history) /trunk/phase3/includes/installer/MysqlInstaller.php (modified) (history) /trunk/phase3/includes/installer/OracleInstaller.php (modified) (history) /trunk/phase3/includes/installer/PostgresInstaller.php (modified) (history) /trunk/phase3/includes/installer/WebInstallerPage.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/installer/DatabaseInstaller.php
—	—	@@ -373,11 +373,11 @@
374	374	*/
375	375	public function getInstallUserBox() {
376	376	return
377		~~- Xml::openElement( 'fieldset' ) .~~
378		~~- Xml::element( 'legend', array(), wfMsg( 'config-db-install-account' ) ) .~~
	377	+ Html::openElement( 'fieldset' ) .
	378	+ Html::element( 'legend', array(), wfMsg( 'config-db-install-account' ) ) .
379	379	$this->getTextBox( '_InstallUser', 'config-db-username', array(), $this->parent->getHelpBox( 'config-db-install-username' ) ) .
380	380	$this->getPasswordBox( '_InstallPassword', 'config-db-password', array(), $this->parent->getHelpBox( 'config-db-install-password' ) ) .
381		~~- Xml::closeElement( 'fieldset' );~~
	381	+ Html::closeElement( 'fieldset' );
382	382	}
383	383
384	384	/**
—	—	@@ -396,12 +396,12 @@
397	397	public function getWebUserBox( $noCreateMsg = false ) {
398	398	$name = $this->getName();
399	399	$s = Xml::openElement( 'fieldset' ) .
400		~~- Xml::element( 'legend', array(), wfMsg( 'config-db-web-account' ) ) .~~
	400	+ Html::element( 'legend', array(), wfMsg( 'config-db-web-account' ) ) .
401	401	$this->getCheckBox(
402	402	'_SameAccount', 'config-db-web-account-same',
403	403	array( 'class' => 'hideShowRadio', 'rel' => 'dbOtherAccount' )
404	404	) .
405		~~- Xml::openElement( 'div', array( 'id' => 'dbOtherAccount', 'style' => 'display: none;' ) ) .~~
	405	+ Html::openElement( 'div', array( 'id' => 'dbOtherAccount', 'style' => 'display: none;' ) ) .
406	406	$this->getTextBox( 'wgDBuser', 'config-db-username' ) .
407	407	$this->getPasswordBox( 'wgDBpassword', 'config-db-password' ) .
408	408	$this->parent->getHelpBox( 'config-db-web-help' );
—	—	@@ -410,7 +410,7 @@
411	411	} else {
412	412	$s .= $this->getCheckBox( '_CreateDBAccount', 'config-db-web-create' );
413	413	}
414		~~- $s .= Xml::closeElement( 'div' ) . Xml::closeElement( 'fieldset' );~~
	414	+ $s .= Html::closeElement( 'div' ) . Html::closeElement( 'fieldset' );
415	415	return $s;
416	416	}
417	417
Index: trunk/phase3/includes/installer/MysqlInstaller.php
—	—	@@ -60,11 +60,11 @@
61	61	public function getConnectForm() {
62	62	return
63	63	$this->getTextBox( 'wgDBserver', 'config-db-host', array(), $this->parent->getHelpBox( 'config-db-host-help' ) ) .
64		~~- Xml::openElement( 'fieldset' ) .~~
65		~~- Xml::element( 'legend', array(), wfMsg( 'config-db-wiki-settings' ) ) .~~
	64	+ Html::openElement( 'fieldset' ) .
	65	+ Html::element( 'legend', array(), wfMsg( 'config-db-wiki-settings' ) ) .
66	66	$this->getTextBox( 'wgDBname', 'config-db-name', array(), $this->parent->getHelpBox( 'config-db-name-help' ) ) .
67	67	$this->getTextBox( 'wgDBprefix', 'config-db-prefix', array(), $this->parent->getHelpBox( 'config-db-prefix-help' ) ) .
68		~~- Xml::closeElement( 'fieldset' ) .~~
	68	+ Html::closeElement( 'fieldset' ) .
69	69	$this->getInstallUserBox();
70	70	}
71	71
Index: trunk/phase3/includes/installer/OracleInstaller.php
—	—	@@ -43,13 +43,13 @@
44	44	$this->parent->setVar( '_SameAccount', false );
45	45	$this->parent->setVar( '_CreateDBAccount', true );
46	46	$this->parent->setVar( 'wgDBname', '' );
47		~~- return Xml::openElement( 'fieldset' ) .~~
48		~~- Xml::element( 'legend', array(), wfMsg( 'config-db-web-account' ) ) .~~
49		~~- Xml::openElement( 'div', array( 'id' => 'dbOtherAccount' ) ) .~~
	47	+ return Html::openElement( 'fieldset' ) .
	48	+ Html::element( 'legend', array(), wfMsg( 'config-db-web-account' ) ) .
	49	+ Html::openElement( 'div', array( 'id' => 'dbOtherAccount' ) ) .
50	50	$this->getTextBox( 'wgDBuser', 'config-db-username' ) .
51	51	$this->getPasswordBox( 'wgDBpassword', 'config-db-password', array(), $this->parent->getHelpBox( 'config-db-web-help' ) ) .
52	52	$this->getCheckBox( '_CreateDBAccount', 'config-db-web-create', array( 'disabled' => true ) ).
53		~~- Xml::closeElement( 'div' ) . Xml::closeElement( 'fieldset' );~~
	53	+ Html::closeElement( 'div' ) . Html::closeElement( 'fieldset' );
54	54	}
55	55
56	56	public function getConnectForm() {
Index: trunk/phase3/includes/installer/PostgresInstaller.php
—	—	@@ -38,12 +38,12 @@
39	39	return
40	40	$this->getTextBox( 'wgDBserver', 'config-db-host', array(), $this->parent->getHelpBox( 'config-db-host-help' ) ) .
41	41	$this->getTextBox( 'wgDBport', 'config-db-port' ) .
42		~~- Xml::openElement( 'fieldset' ) .~~
43		~~- Xml::element( 'legend', array(), wfMsg( 'config-db-wiki-settings' ) ) .~~
	42	+ Html::openElement( 'fieldset' ) .
	43	+ Html::element( 'legend', array(), wfMsg( 'config-db-wiki-settings' ) ) .
44	44	$this->getTextBox( 'wgDBname', 'config-db-name', array(), $this->parent->getHelpBox( 'config-db-name-help' ) ) .
45	45	$this->getTextBox( 'wgDBmwschema', 'config-db-schema', array(), $this->parent->getHelpBox( 'config-db-schema-help' ) ) .
46	46	$this->getTextBox( 'wgDBts2schema', 'config-db-ts2-schema' ) .
47		~~- Xml::closeElement( 'fieldset' ) .~~
	47	+ Html::closeElement( 'fieldset' ) .
48	48	$this->getInstallUserBox();
49	49	}
50	50
Index: trunk/phase3/includes/installer/WebInstallerPage.php
—	—	@@ -39,7 +39,7 @@
40	40	public function startForm() {
41	41	$this->addHTML(
42	42	"<div class=\"config-section\">\n" .
43		~~- Xml::openElement(~~
	43	+ Html::openElement(
44	44	'form',
45	45	array(
46	46	'method' => 'post',
—	—	@@ -235,7 +235,7 @@
236	236	*/
237	237	public function getLanguageSelector( $name, $label, $selectedCode ) {
238	238	global $wgDummyLanguageCodes;
239		~~- $s = Xml::openElement( 'select', array( 'id' => $name, 'name' => $name ) ) . "\n";~~
	239	+ $s = Html::openElement( 'select', array( 'id' => $name, 'name' => $name ) ) . "\n";
240	240
241	241	$languages = Language::getLanguageNames();
242	242	ksort( $languages );
—	—	@@ -314,8 +314,8 @@
315	315	"</li>\n";
316	316
317	317	$settings .=
318		~~- Xml::openElement( 'div', array( 'id' => 'DB_wrapper_' . $type, 'class' => 'dbWrapper' ) ) .~~
319		~~- Xml::element( 'h3', array(), wfMsg( 'config-header-' . $type ) ) .~~
	318	+ Html::openElement( 'div', array( 'id' => 'DB_wrapper_' . $type, 'class' => 'dbWrapper' ) ) .
	319	+ Html::element( 'h3', array(), wfMsg( 'config-header-' . $type ) ) .
320	320	$installer->getConnectForm() .
321	321	"</div>\n";
322	322	}
—	—	@@ -802,7 +802,7 @@
803	803
804	804	return
805	805	"<div class=\"config-cc-wrapper\" id=\"config-cc-wrapper\" style=\"display: none;\">\n" .
806		~~- Xml::element( 'iframe', $iframeAttribs, '', false /* not short */ ) .~~
	806	+ Html::element( 'iframe', $iframeAttribs, '', false /* not short */ ) .
807	807	"</div>\n";
808	808	}
809	809
—	—	@@ -813,12 +813,12 @@
814	814	$reduceJs = str_replace( '$1', '70px', $js );
815	815	return
816	816	'<p>'.
817		~~- Xml::element( 'img', array( 'src' => $this->getVar( 'wgRightsIcon' ) ) ) .~~
	817	+ Html::element( 'img', array( 'src' => $this->getVar( 'wgRightsIcon' ) ) ) .
818	818	'  ' .
819	819	htmlspecialchars( $this->getVar( 'wgRightsText' ) ) .
820	820	"</p>\n" .
821	821	"<p style=\"text-align: center\">" .
822		~~- Xml::element( 'a',~~
	822	+ Html::element( 'a',
823	823	array(
824	824	'href' => $this->getCCPartnerUrl(),
825	825	'onclick' => $expandJs,

Follow-up revisions

Revision	Commit summary	Author	Date
r76056	Followup r76055, missed a few more	demon	23:23, 4 November 2010

Status & tagging log

01:23, 5 December 2010 😂 (talk | contribs) changed the status of r76055 [removed: ⧼code-status-verified⧽ added: ok]
23:04, 6 November 2010 Hashar (talk | contribs) changed the status of r76055 [removed: new added: ⧼code-status-verified⧽]