r107243 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r107242‎ \| r107243 \| r107244 >
Date:	23:33, 24 December 2011
Author:	reedy
Status:	resolved (Comments)
Tags:
Comment:	Update $sk->link to Linker::link
Modified paths:	/trunk/extensions/OpenStackManager/special/SpecialNovaAddress.php (modified) (history) /trunk/extensions/OpenStackManager/special/SpecialNovaDomain.php (modified) (history) /trunk/extensions/OpenStackManager/special/SpecialNovaInstance.php (modified) (history) /trunk/extensions/OpenStackManager/special/SpecialNovaKey.php (modified) (history) /trunk/extensions/OpenStackManager/special/SpecialNovaProject.php (modified) (history) /trunk/extensions/OpenStackManager/special/SpecialNovaPuppetGroup.php (modified) (history) /trunk/extensions/OpenStackManager/special/SpecialNovaRole.php (modified) (history) /trunk/extensions/OpenStackManager/special/SpecialNovaSecurityGroup.php (modified) (history) /trunk/extensions/OpenStackManager/special/SpecialNovaSudoer.php (modified) (history) /trunk/extensions/OpenStackManager/special/SpecialNovaVolume.php (modified) (history)

Diff [purge]

Index: trunk/extensions/OpenStackManager/special/SpecialNovaInstance.php
—	—	@@ -446,8 +446,7 @@
447	447	}
448	448	$instanceid = $wgRequest->getText( 'instanceid' );
449	449	$consoleOutput = $this->userNova->getConsoleOutput( $instanceid );
450		~~- $sk = $wgOut->getSkin();~~
451		~~- $out = $sk->link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backinstancelist' ) );~~
	450	+ $out = Linker::link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backinstancelist' ) );
452	451	$out .= Html::element( 'pre', array(), $consoleOutput );
453	452	$wgOut->addHTML( $out );
454	453	}
—	—	@@ -462,7 +461,7 @@
463	462	$wgOut->setPagetitle( wfMsg( 'openstackmanager-instancelist' ) );
464	463
465	464	$userProjects = $this->userLDAP->getProjects();
466		~~- $sk = $wgOut->getSkin();~~
	465	+
467	466	$out = '';
468	467	$instances = $this->adminNova->getInstances();
469	468	$header = Html::element( 'th', array(), wfMsg( 'openstackmanager-instancename' ) );
—	—	@@ -486,7 +485,7 @@
487	486	$instanceId = $instance->getInstanceId();
488	487	$instanceId = htmlentities( $instanceId );
489	488	$title = Title::newFromText( $instanceId, NS_NOVA_RESOURCE );
490		~~- $instanceIdLink = $sk->link( $title, $instanceId );~~
	489	+ $instanceIdLink = Linker::( $title, $instanceId );
491	490	$instanceOut .= Html::rawElement( 'td', array(), $instanceIdLink );
492	491	$instanceOut .= Html::element( 'td', array(), $instance->getInstanceState() );
493	492	$instanceOut .= Html::element( 'td', array(), $instance->getInstanceType() );
—	—	@@ -509,25 +508,25 @@
510	509	$instanceOut .= Html::element( 'td', array(), $instance->getLaunchTime() );
511	510	if ( $this->userLDAP->inRole( 'sysadmin', $project ) ) {
512	511	$msg = wfMsgHtml( 'openstackmanager-delete' );
513		~~- $link = $sk->link( $this->getTitle(), $msg, array(),~~
	512	+ $link = Linker::( $this->getTitle(), $msg, array(),
514	513	array( 'action' => 'delete',
515	514	'project' => $project,
516	515	'instanceid' => $instance->getInstanceId() ) );
517	516	$actions = Html::rawElement( 'li', array(), $link );
518	517	$msg = wfMsgHtml( 'openstackmanager-reboot' );
519		~~- $link = $sk->link( $this->getTitle(), $msg, array(),~~
	518	+ $link = Linker::( $this->getTitle(), $msg, array(),
520	519	array( 'action' => 'reboot',
521	520	'project' => $project,
522	521	'instanceid' => $instance->getInstanceId() ) );
523	522	$actions .= Html::rawElement( 'li', array(), $link );
524	523	$msg = wfMsgHtml( 'openstackmanager-configure' );
525		~~- $link = $sk->link( $this->getTitle(), $msg, array(),~~
	524	+ $link = Linker::( $this->getTitle(), $msg, array(),
526	525	array( 'action' => 'configure',
527	526	'project' => $project,
528	527	'instanceid' => $instance->getInstanceId() ) );
529	528	$actions .= Html::rawElement( 'li', array(), $link );
530	529	$msg = wfMsgHtml( 'openstackmanager-getconsoleoutput' );
531		~~- $link = $sk->link( $this->getTitle(), $msg, array(),~~
	530	+ $link = Linker::( $this->getTitle(), $msg, array(),
532	531	array( 'action' => 'consoleoutput',
533	532	'project' => $project,
534	533	'instanceid' => $instance->getInstanceId() ) );
—	—	@@ -544,7 +543,7 @@
545	544	foreach ( $userProjects as $project ) {
546	545	$out .= Html::element( 'h2', array(), $project );
547	546	if ( $this->userLDAP->inRole( 'sysadmin', $project ) ) {
548		~~- $out .= $sk->link( $this->getTitle(), wfMsgHtml( 'openstackmanager-createinstance' ), array(), array( 'action' => 'create', 'project' => $project ) );~~
	547	+ $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-createinstance' ), array(), array( 'action' => 'create', 'project' => $project ) );
549	548	}
550	549	if ( isset( $projectArr["$project"] ) ) {
551	550	$projectOut = $header;
—	—	@@ -586,9 +585,9 @@
587	586	} else {
588	587	$wgOut->addWikiMsg( 'openstackmanager-createinstancefailed' );
589	588	}
590		~~- $sk = $wgOut->getSkin();~~
	589	+
591	590	$out = '<br />';
592		~~- $out .= $sk->link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backinstancelist' ) );~~
	591	+ $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backinstancelist' ) );
593	592
594	593	$wgOut->addHTML( $out );
595	594	return true;
—	—	@@ -621,9 +620,9 @@
622	621	} else {
623	622	$wgOut->addWikiMsg( 'openstackmanager-deleteinstancefailed' );
624	623	}
625		~~- $sk = $wgOut->getSkin();~~
	624	+
626	625	$out = '<br />';
627		~~- $out .= $sk->link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backinstancelist' ) );~~
	626	+ $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backinstancelist' ) );
628	627
629	628	$wgOut->addHTML( $out );
630	629	return true;
—	—	@@ -644,9 +643,9 @@
645	644	} else {
646	645	$wgOut->addWikiMsg( 'openstackmanager-rebootinstancefailed' );
647	646	}
648		~~- $sk = $wgOut->getSkin();~~
	647	+
649	648	$out = '<br />';
650		~~- $out .= $sk->link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backinstancelist' ) );~~
	649	+ $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backinstancelist' ) );
651	650
652	651	$wgOut->addHTML( $out );
653	652	return true;
—	—	@@ -673,9 +672,9 @@
674	673	} else {
675	674	$wgOut->addWikiMsg( 'openstackmanager-nonexistanthost' );
676	675	}
677		~~- $sk = $wgOut->getSkin();~~
	676	+
678	677	$out = '<br />';
679		~~- $out .= $sk->link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backinstancelist' ) );~~
	678	+ $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backinstancelist' ) );
680	679
681	680	$wgOut->addHTML( $out );
682	681	return true;
Index: trunk/extensions/OpenStackManager/special/SpecialNovaSecurityGroup.php
—	—	@@ -203,7 +203,7 @@
204	204	$wgOut->setPagetitle( wfMsg( 'openstackmanager-securitygrouplist' ) );
205	205
206	206	$userProjects = $this->userLDAP->getProjects();
207		~~- $sk = $wgOut->getSkin();~~
	207	+
208	208	$out = '';
209	209	$groupheader = Html::element( 'th', array(), wfMsg( 'openstackmanager-securitygroupname' ) );
210	210	$groupheader .= Html::element( 'th', array(), wfMsg( 'openstackmanager-securitygroupdescription' ) );
—	—	@@ -270,7 +270,7 @@
271	271	'protocol' => $ipprotocol,
272	272	'ranges' => implode( ',', $ranges ),
273	273	'groups' => implode( ',', $groupinfo ) );
274		~~- $link = $sk->link( $this->getTitle(), $msg, array(), $args );~~
	274	+ $link = Linker::( $this->getTitle(), $msg, array(), $args );
275	275	$actions = Html::rawElement( 'li', array(), $link );
276	276	$actions = Html::rawElement( 'ul', array(), $actions );
277	277	$ruleOut .= Html::rawElement( 'td', array(), $actions );
—	—	@@ -282,19 +282,19 @@
283	283	$groupOut .= Html::rawElement( 'td', array(), '' );
284	284	}
285	285	$msg = wfMsgHtml( 'openstackmanager-delete' );
286		~~- $link = $sk->link( $this->getTitle(), $msg, array(),~~
	286	+ $link = Linker::( $this->getTitle(), $msg, array(),
287	287	array( 'action' => 'delete',
288	288	'project' => $project,
289	289	'groupname' => $group->getGroupName() ) );
290	290	$actions = Html::rawElement( 'li', array(), $link );
291	291	#$msg = wfMsgHtml( 'openstackmanager-configure' );
292		~~- #$link = $sk->link( $this->getTitle(), $msg, array(),~~
	292	+ #$link = Linker::( $this->getTitle(), $msg, array(),
293	293	# array( 'action' => 'configure',
294	294	# 'project' => $project,
295	295	# 'groupname' => $group->getGroupName() ) );
296	296	#$actions .= Html::rawElement( 'li', array(), $link );
297	297	$msg = wfMsgHtml( 'openstackmanager-addrule-action' );
298		~~- $link = $sk->link( $this->getTitle(), $msg, array(),~~
	298	+ $link = Linker::( $this->getTitle(), $msg, array(),
299	299	array( 'action' => 'addrule',
300	300	'project' => $project,
301	301	'groupname' => $group->getGroupName() ) );
—	—	@@ -309,7 +309,7 @@
310	310	}
311	311	foreach ( $userProjects as $project ) {
312	312	$out .= Html::element( 'h2', array(), $project );
313		~~- $out .= $sk->link( $this->getTitle(), wfMsgHtml( 'openstackmanager-createnewsecuritygroup' ), array(),~~
	313	+ $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-createnewsecuritygroup' ), array(),
314	314	array( 'action' => 'create', 'project' => $project ) );
315	315	if ( isset( $projectArr["$project"] ) ) {
316	316	$projectOut = $groupheader;
—	—	@@ -506,9 +506,9 @@
507	507	} else {
508	508	$wgOut->addWikiMsg( 'openstackmanager-createsecuritygroupfailed' );
509	509	}
510		~~- $sk = $wgOut->getSkin();~~
	510	+
511	511	$out = '<br />';
512		~~- $out .= $sk->link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backsecuritygrouplist' ) );~~
	512	+ $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backsecuritygrouplist' ) );
513	513
514	514	$wgOut->addHTML( $out );
515	515	return true;
—	—	@@ -538,9 +538,9 @@
539	539	} else {
540	540	$wgOut->addWikiMsg( 'openstackmanager-deletesecuritygroupfailed' );
541	541	}
542		~~- $sk = $wgOut->getSkin();~~
	542	+
543	543	$out = '<br />';
544		~~- $out .= $sk->link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backsecuritygrouplist' ) );~~
	544	+ $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backsecuritygrouplist' ) );
545	545
546	546	$wgOut->addHTML( $out );
547	547	return true;
—	—	@@ -569,9 +569,9 @@
570	570	} else {
571	571	$wgOut->addWikiMsg( 'openstackmanager-nonexistantgroup' );
572	572	}
573		~~- $sk = $wgOut->getSkin();~~
	573	+
574	574	$out = '<br />';
575		~~- $out .= $sk->link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backsecuritygrouplist' ) );~~
	575	+ $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backsecuritygrouplist' ) );
576	576
577	577	$wgOut->addHTML( $out );
578	578	return true;
—	—	@@ -614,9 +614,9 @@
615	615	} else {
616	616	$wgOut->addWikiMsg( 'openstackmanager-addrulefailed' );
617	617	}
618		~~- $sk = $wgOut->getSkin();~~
	618	+
619	619	$out = '<br />';
620		~~- $out .= $sk->link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backsecuritygrouplist' ) );~~
	620	+ $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backsecuritygrouplist' ) );
621	621
622	622	$wgOut->addHTML( $out );
623	623	return true;
—	—	@@ -662,9 +662,9 @@
663	663	} else {
664	664	$wgOut->addWikiMsg( 'openstackmanager-removerulefailed' );
665	665	}
666		~~- $sk = $wgOut->getSkin();~~
	666	+
667	667	$out = '<br />';
668		~~- $out .= $sk->link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backsecuritygrouplist' ) );~~
	668	+ $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backsecuritygrouplist' ) );
669	669
670	670	$wgOut->addHTML( $out );
671	671	return true;
Index: trunk/extensions/OpenStackManager/special/SpecialNovaAddress.php
—	—	@@ -364,7 +364,7 @@
365	365
366	366	$userProjects = $this->userLDAP->getProjects();
367	367	$out = '';
368		~~- $sk = $wgOut->getSkin();~~
	368	+
369	369	$header = Html::element( 'th', array(), wfMsg( 'openstackmanager-address' ) );
370	370	$header .= Html::element( 'th', array(), wfMsg( 'openstackmanager-instanceid' ) );
371	371	$header .= Html::element( 'th', array(), wfMsg( 'openstackmanager-instancename' ) );
—	—	@@ -396,7 +396,7 @@
397	397	foreach ( $fqdns as $fqdn ) {
398	398	$hostname = explode( '.', $fqdn );
399	399	$hostname = $hostname[0];
400		~~- $link = $sk->link( $this->getTitle(), $msg, array(),~~
	400	+ $link = Linker::link( $this->getTitle(), $msg, array(),
401	401	array( 'action' => 'removehost', 'ip' => $ip, 'project' => $project, 'domain' => $domain->getDomainName(), 'hostname' => $hostname ) );
402	402	$hostOut = htmlentities( $fqdn ) . ' ' . $link;
403	403	$hostsOut .= Html::rawElement( 'li', array(), $hostOut );
—	—	@@ -412,22 +412,22 @@
413	413	$msg = wfMsgHtml( 'openstackmanager-reassociateaddress' );
414	414	} else {
415	415	$msg = wfMsgHtml( 'openstackmanager-releaseaddress' );
416		~~- $link = $sk->link( $this->getTitle(), $msg, array(),~~
	416	+ $link = Linker::link( $this->getTitle(), $msg, array(),
417	417	array( 'action' => 'release', 'ip' => $ip, 'project' => $project ) );
418	418	$actions = Html::rawElement( 'li', array(), $link );
419	419	$msg = wfMsgHtml( 'openstackmanager-associateaddress' );
420	420	}
421		~~- $link = $sk->link( $this->getTitle(), $msg, array(),~~
	421	+ $link = Linker::link( $this->getTitle(), $msg, array(),
422	422	array( 'action' => 'associate', 'ip' => $ip, 'project' => $project ) );
423	423	$actions .= Html::rawElement( 'li', array(), $link );
424	424	if ( $instanceid ) {
425	425	$msg = wfMsgHtml( 'openstackmanager-disassociateaddress' );
426		~~- $link = $sk->link( $this->getTitle(), $msg, array(),~~
	426	+ $link = Linker::link( $this->getTitle(), $msg, array(),
427	427	array( 'action' => 'disassociate', 'ip' => $ip, 'project' => $project ) );
428	428	$actions .= Html::rawElement( 'li', array(), $link );
429	429	}
430	430	$msg = wfMsgHtml( 'openstackmanager-addhost' );
431		~~- $link = $sk->link( $this->getTitle(), $msg, array(),~~
	431	+ $link = Linker::link( $this->getTitle(), $msg, array(),
432	432	array( 'action' => 'addhost', 'ip' => $ip, 'project' => $project ) );
433	433	$actions .= Html::rawElement( 'li', array(), $link );
434	434	$actions = Html::rawElement( 'ul', array(), $actions );
—	—	@@ -440,7 +440,7 @@
441	441	}
442	442	foreach ( $userProjects as $project ) {
443	443	$out .= Html::element( 'h2', array(), $project );
444		~~- $out .= $sk->link( $this->getTitle(), wfMsgHtml( 'openstackmanager-allocateaddress' ), array(), array( 'action' => 'allocate', 'project' => $project ) );~~
	444	+ $out .= Linker::link( $this->getTitle(), wfMsgHtml( 'openstackmanager-allocateaddress' ), array(), array( 'action' => 'allocate', 'project' => $project ) );
445	445	if ( isset( $projectArr["$project"] ) ) {
446	446	$projectOut = $header;
447	447	$projectOut .= $projectArr["$project"];
—	—	@@ -468,9 +468,8 @@
469	469	}
470	470	$ip = $address->getPublicIP();
471	471	$wgOut->addWikiMsg( 'openstackmanager-allocatedaddress', $ip );
472		~~- $sk = $wgOut->getSkin();~~
473	472	$out = '<br />';
474		~~- $out .= $sk->link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backaddresslist' ) );~~
	473	+ $out .= Linker::link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backaddresslist' ) );
475	474	$wgOut->addHTML( $out );
476	475
477	476	return true;
—	—	@@ -504,9 +503,9 @@
505	504	} else {
506	505	$wgOut->addWikiMsg( 'openstackmanager-cannotreleaseaddress', $ip );
507	506	}
508		~~- $sk = $wgOut->getSkin();~~
	507	+
509	508	$out = '<br />';
510		~~- $out .= $sk->link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backaddresslist' ) );~~
	509	+ $out .= Linker::link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backaddresslist' ) );
511	510	$wgOut->addHTML( $out );
512	511
513	512	return true;
—	—	@@ -528,9 +527,9 @@
529	528	} else {
530	529	$wgOut->addWikiMsg( 'openstackmanager-associatedaddressfailed', $ip, $instanceid );
531	530	}
532		~~- $sk = $wgOut->getSkin();~~
	531	+
533	532	$out = '<br />';
534		~~- $out .= $sk->link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backaddresslist' ) );~~
	533	+ $out .= Linker::link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backaddresslist' ) );
535	534	$wgOut->addHTML( $out );
536	535
537	536	return true;
—	—	@@ -551,9 +550,9 @@
552	551	} else {
553	552	$wgOut->addWikiMsg( 'openstackmanager-disassociatedaddressfailed', $ip );
554	553	}
555		~~- $sk = $wgOut->getSkin();~~
	554	+
556	555	$out = '<br />';
557		~~- $out .= $sk->link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backaddresslist' ) );~~
	556	+ $out .= Linker::link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backaddresslist' ) );
558	557	$wgOut->addHTML( $out );
559	558
560	559	return true;
—	—	@@ -609,9 +608,9 @@
610	609	$wgOut->addWikiMsg( 'openstackmanager-addhostfailed', $ip, $hostname );
611	610	}
612	611	}
613		~~- $sk = $wgOut->getSkin();~~
	612	+
614	613	$out = '<br />';
615		~~- $out .= $sk->link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backaddresslist' ) );~~
	614	+ $out .= Linker::link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backaddresslist' ) );
616	615	$wgOut->addHTML( $out );
617	616	return true;
618	617	}
Index: trunk/extensions/OpenStackManager/special/SpecialNovaProject.php
—	—	@@ -233,8 +233,8 @@
234	234	$wgOut->addModuleStyles( 'ext.openstack' );
235	235
236	236	$out = '';
237		~~- $sk = $wgOut->getSkin();~~
238		~~- $out .= $sk->link( $this->getTitle(), wfMsgHtml( 'openstackmanager-createproject' ), array(), array( 'action' => 'create' ) );~~
	237	+
	238	+ $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-createproject' ), array(), array( 'action' => 'create' ) );
239	239	$projectsOut = Html::element( 'th', array(), wfMsg( 'openstackmanager-projectname' ) );
240	240	$projectsOut .= Html::element( 'th', array(), wfMsg( 'openstackmanager-members' ) );
241	241	$projectsOut .= Html::element( 'th', array(), wfMsg( 'openstackmanager-roles' ) );
—	—	@@ -247,7 +247,7 @@
248	248	$projectName = $project->getProjectName();
249	249	$projectName = htmlentities( $projectName );
250	250	$title = Title::newFromText( $projectName, NS_NOVA_RESOURCE );
251		~~- $projectNameLink = $sk->link( $title, $projectName );~~
	251	+ $projectNameLink = Linker::( $title, $projectName );
252	252	$projectOut = Html::rawElement( 'td', array(), $projectNameLink );
253	253	$projectMembers = $project->getMembers();
254	254	$memberOut = '';
—	—	@@ -270,10 +270,10 @@
271	271	}
272	272	$roleMembers = Html::rawElement( 'ul', array(), $roleMembers );
273	273	$roleOut .= Html::rawElement( 'td', array(), $roleMembers );
274		~~- $link = $sk->link( $specialRoleTitle, wfMsgHtml( 'openstackmanager-addrolemember' ), array(),~~
	274	+ $link = Linker::( $specialRoleTitle, wfMsgHtml( 'openstackmanager-addrolemember' ), array(),
275	275	array( 'action' => 'addmember', 'projectname' => $projectName, 'rolename' => $role->getRoleName(), 'returnto' => 'Special:NovaProject' ) );
276	276	$actions = Html::rawElement( 'li', array(), $link );
277		~~- $link = $sk->link( $specialRoleTitle, wfMsgHtml( 'openstackmanager-removerolemember' ), array(),~~
	277	+ $link = Linker::( $specialRoleTitle, wfMsgHtml( 'openstackmanager-removerolemember' ), array(),
278	278	array( 'action' => 'deletemember', 'projectname' => $projectName, 'rolename' => $role->getRoleName(), 'returnto' => 'Special:NovaProject' ) );
279	279	$actions .= Html::rawElement( 'li', array(), $link );
280	280	$actions = Html::rawElement( 'ul', array(), $actions );
—	—	@@ -282,13 +282,13 @@
283	283	}
284	284	$rolesOut = Html::rawElement( 'table', array( 'class' => 'wikitable sortable collapsible' ), $rolesOut );
285	285	$projectOut .= Html::rawElement( 'td', array( 'class' => 'Nova_cell' ), $rolesOut );
286		~~- $link = $sk->link( $this->getTitle(), wfMsgHtml( 'openstackmanager-deleteproject' ), array(),~~
	286	+ $link = Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-deleteproject' ), array(),
287	287	array( 'action' => 'delete', 'projectname' => $projectName ) );
288	288	$actions = Html::rawElement( 'li', array(), $link );
289		~~- $link = $sk->link( $this->getTitle(), wfMsgHtml( 'openstackmanager-addmember' ), array(),~~
	289	+ $link = Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-addmember' ), array(),
290	290	array( 'action' => 'addmember', 'projectname' => $projectName ) );
291	291	$actions .= Html::rawElement( 'li', array(), $link );
292		~~- $link = $sk->link( $this->getTitle(), wfMsgHtml( 'openstackmanager-removemember' ), array(),~~
	292	+ $link = Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-removemember' ), array(),
293	293	array( 'action' => 'deletemember', 'projectname' => $projectName ) );
294	294	$actions .= Html::rawElement( 'li', array(), $link );
295	295	$actions = Html::rawElement( 'ul', array(), $actions );
—	—	@@ -374,9 +374,9 @@
375	375	$this->adminNova->configureConnection();
376	376	$project->editArticle();
377	377	$wgOut->addWikiMsg( 'openstackmanager-createdproject' );
378		~~- $sk = $wgOut->getSkin();~~
	378	+
379	379	$out = '<br />';
380		~~- $out .= $sk->link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backprojectlist' ) );~~
	380	+ $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backprojectlist' ) );
381	381	$wgOut->addHTML( $out );
382	382
383	383	return true;
—	—	@@ -398,9 +398,9 @@
399	399	} else {
400	400	$wgOut->addWikiMsg( 'openstackmanager-deleteprojectfailed' );
401	401	}
402		~~- $sk = $wgOut->getSkin();~~
	402	+
403	403	$out = '<br />';
404		~~- $out .= $sk->link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backprojectlist' ) );~~
	404	+ $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backprojectlist' ) );
405	405	$wgOut->addHTML( $out );
406	406
407	407	return true;
—	—	@@ -425,9 +425,9 @@
426	426	$wgOut->addWikiMsg( 'openstackmanager-failedtoadd', $formData['member'], $formData['projectname'] );
427	427	}
428	428	}
429		~~- $sk = $wgOut->getSkin();~~
	429	+
430	430	$out = '<br />';
431		~~- $out .= $sk->link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backprojectlist' ) );~~
	431	+ $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backprojectlist' ) );
432	432	$wgOut->addHTML( $out );
433	433
434	434	return true;
—	—	@@ -456,8 +456,8 @@
457	457	}
458	458	}
459	459	$out = '<br />';
460		~~- $sk = $wgOut->getSkin();~~
461		~~- $out .= $sk->link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backprojectlist' ) );~~
	460	+
	461	+ $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backprojectlist' ) );
462	462	$wgOut->addHTML( $out );
463	463
464	464	return true;
Index: trunk/extensions/OpenStackManager/special/SpecialNovaDomain.php
—	—	@@ -139,8 +139,8 @@
140	140	$wgOut->setPagetitle( wfMsg( 'openstackmanager-domainlist' ) );
141	141
142	142	$out = '';
143		~~- $sk = $wgOut->getSkin();~~
144		~~- $out .= $sk->link( $this->getTitle(), wfMsgHtml( 'openstackmanager-createdomain' ), array(), array( 'action' => 'create' ) );~~
	143	+
	144	+ $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-createdomain' ), array(), array( 'action' => 'create' ) );
145	145	$domainsOut = Html::element( 'th', array(), wfMsg( 'openstackmanager-domainname' ) );
146	146	$domainsOut .= Html::element( 'th', array(), wfMsg( 'openstackmanager-fqdn' ) );
147	147	$domainsOut .= Html::element( 'th', array(), wfMsg( 'openstackmanager-location' ) );
—	—	@@ -154,7 +154,7 @@
155	155	$domainOut .= Html::element( 'td', array(), $fqdn );
156	156	$domainOut .= Html::element( 'td', array(), $location );
157	157	$msg = wfMsgHtml( 'openstackmanager-delete' );
158		~~- $link = $sk->link( $this->getTitle(), $msg, array(),~~
	158	+ $link = Linker::( $this->getTitle(), $msg, array(),
159	159	array( 'action' => 'delete', 'domainname' => $domainName ) );
160	160	$domainOut .= Html::rawElement( 'td', array(), $link );
161	161	$domainsOut .= Html::rawElement( 'tr', array(), $domainOut );
—	—	@@ -180,9 +180,9 @@
181	181	return true;
182	182	}
183	183	$wgOut->addWikiMsg( 'openstackmanager-createddomain' );
184		~~- $sk = $wgOut->getSkin();~~
	184	+
185	185	$out = '<br />';
186		~~- $out .= $sk->link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backdomainlist' ) );~~
	186	+ $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backdomainlist' ) );
187	187	$wgOut->addHTML( $out );
188	188
189	189	return true;
—	—	@@ -202,9 +202,9 @@
203	203	} else {
204	204	$wgOut->addWikiMsg( 'openstackmanager-failedeleteddomain' );
205	205	}
206		~~- $sk = $wgOut->getSkin();~~
	206	+
207	207	$out = '<br />';
208		~~- $out .= $sk->link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backdomainlist' ) );~~
	208	+ $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backdomainlist' ) );
209	209	$wgOut->addHTML( $out );
210	210
211	211	return true;
Index: trunk/extensions/OpenStackManager/special/SpecialNovaVolume.php
—	—	@@ -319,7 +319,7 @@
320	320	$wgOut->setPagetitle( wfMsg( 'openstackmanager-volumelist' ) );
321	321
322	322	$userProjects = $this->userLDAP->getProjects();
323		~~- $sk = $wgOut->getSkin();~~
	323	+
324	324	$out = '';
325	325	$volumes = $this->adminNova->getVolumes();
326	326	$header = Html::element( 'th', array(), wfMsg( 'openstackmanager-volumename' ) );
—	—	@@ -344,7 +344,7 @@
345	345	$volumeId = $volume->getVolumeId();
346	346	$volumeId = htmlentities( $volumeId );
347	347	$title = Title::newFromText( $volumeId, NS_NOVA_RESOURCE );
348		~~- $volumeIdLink = $sk->link( $title, $volumeId );~~
	348	+ $volumeIdLink = Linker::( $title, $volumeId );
349	349	$volumeOut .= Html::rawElement( 'td', array(), $volumeIdLink );
350	350	$volumeOut .= Html::element( 'td', array(), $volume->getVolumeDescription() );
351	351	$volumeOut .= Html::element( 'td', array(), $volume->getVolumeStatus() );
—	—	@@ -356,24 +356,24 @@
357	357	$volumeOut .= Html::element( 'td', array(), $volume->getVolumeAvailabilityZone() );
358	358	$volumeOut .= Html::element( 'td', array(), $volume->getVolumeCreationTime() );
359	359	$msg = wfMsgHtml( 'openstackmanager-delete' );
360		~~- $link = $sk->link( $this->getTitle(), $msg, array(),~~
	360	+ $link = Linker::( $this->getTitle(), $msg, array(),
361	361	array( 'action' => 'delete',
362	362	'project' => $project,
363	363	'volumeid' => $volume->getVolumeId() ) );
364	364	$actions = Html::rawElement( 'li', array(), $link );
365	365	#$msg = wfMsgHtml( 'openstackmanager-rename' );
366		~~- #$actions .= $sk->link( $this->getTitle(), $msg, array(),~~
	366	+ #$actions .= Linker::( $this->getTitle(), $msg, array(),
367	367	# array( 'action' => 'rename',
368	368	# 'project' => $project,
369	369	# 'volumeid' => $volume->getVolumeId() ) );
370	370	$msg = wfMsgHtml( 'openstackmanager-attach' );
371		~~- $link = $sk->link( $this->getTitle(), $msg, array(),~~
	371	+ $link = Linker::( $this->getTitle(), $msg, array(),
372	372	array( 'action' => 'attach',
373	373	'project' => $project,
374	374	'volumeid' => $volume->getVolumeId() ) );
375	375	$actions .= Html::rawElement( 'li', array(), $link );
376	376	$msg = wfMsgHtml( 'openstackmanager-detach' );
377		~~- $link = $sk->link( $this->getTitle(), $msg, array(),~~
	377	+ $link = Linker::( $this->getTitle(), $msg, array(),
378	378	array( 'action' => 'detach',
379	379	'project' => $project,
380	380	'volumeid' => $volume->getVolumeId() ) );
—	—	@@ -388,7 +388,7 @@
389	389	}
390	390	foreach ( $userProjects as $project ) {
391	391	$out .= Html::element( 'h2', array(), $project );
392		~~- $out .= $sk->link( $this->getTitle(), wfMsgHtml( 'openstackmanager-createvolume' ), array(),~~
	392	+ $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-createvolume' ), array(),
393	393	array( 'action' => 'create', 'project' => $project ) );
394	394	if ( isset( $projectArr["$project"] ) ) {
395	395	$projectOut = $header;
—	—	@@ -415,9 +415,9 @@
416	416	} else {
417	417	$wgOut->addWikiMsg( 'openstackmanager-createevolumefailed' );
418	418	}
419		~~- $sk = $wgOut->getSkin();~~
	419	+
420	420	$out = '<br />';
421		~~- $out .= $sk->link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backvolumelist' ) );~~
	421	+ $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backvolumelist' ) );
422	422
423	423	$wgOut->addHTML( $out );
424	424	return true;
—	—	@@ -443,9 +443,9 @@
444	444	} else {
445	445	$wgOut->addWikiMsg( 'openstackmanager-deletevolumefailed' );
446	446	}
447		~~- $sk = $wgOut->getSkin();~~
	447	+
448	448	$out = '<br />';
449		~~- $out .= $sk->link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backvolumelist' ) );~~
	449	+ $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backvolumelist' ) );
450	450
451	451	$wgOut->addHTML( $out );
452	452	return true;
—	—	@@ -465,9 +465,9 @@
466	466	} else {
467	467	$wgOut->addWikiMsg( 'openstackmanager-attachvolumefailed' );
468	468	}
469		~~- $sk = $wgOut->getSkin();~~
	469	+
470	470	$out = '<br />';
471		~~- $out .= $sk->link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backvolumelist' ) );~~
	471	+ $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backvolumelist' ) );
472	472
473	473	$wgOut->addHTML( $out );
474	474	return true;
—	—	@@ -492,9 +492,9 @@
493	493	} else {
494	494	$wgOut->addWikiMsg( 'openstackmanager-detachvolumefailed' );
495	495	}
496		~~- $sk = $wgOut->getSkin();~~
	496	+
497	497	$out = '<br />';
498		~~- $out .= $sk->link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backvolumelist' ) );~~
	498	+ $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backvolumelist' ) );
499	499
500	500	$wgOut->addHTML( $out );
501	501	return true;
Index: trunk/extensions/OpenStackManager/special/SpecialNovaKey.php
—	—	@@ -170,9 +170,9 @@
171	171	$wgOut->addModuleStyles( 'ext.openstack' );
172	172
173	173	$out = '';
174		~~- $sk = $wgOut->getSkin();~~
	174	+
175	175	if ( $wgOpenStackManagerNovaKeypairStorage == 'nova' ) {
176		~~- $out .= $sk->link( $this->getTitle(), wfMsgHtml( 'openstackmanager-importkey' ), array(), array( 'action' => 'import' ) );~~
	176	+ $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-importkey' ), array(), array( 'action' => 'import' ) );
177	177	$projects = $this->userLDAP->getProjects();
178	178	foreach ( $projects as $project ) {
179	179	$userCredentials = $this->userLDAP->getCredentials();
—	—	@@ -192,7 +192,7 @@
193	193	$out .= Html::rawElement( 'table', array( 'id' => 'novakeylist', 'class' => 'wikitable sortable collapsible' ), $projectOut );
194	194	}
195	195	} elseif ( $wgOpenStackManagerNovaKeypairStorage == 'ldap' ) {
196		~~- $out .= $sk->link( $this->getTitle(), wfMsgHtml( 'openstackmanager-importkey' ), array(), array( 'action' => 'import' ) );~~
	196	+ $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-importkey' ), array(), array( 'action' => 'import' ) );
197	197	$keypairs = $this->userLDAP->getKeypairs();
198	198	$keysOut = '';
199	199	$keysOut .= Html::element( 'th', array(), wfMsg( 'openstackmanager-keys' ) );
—	—	@@ -200,7 +200,7 @@
201	201	foreach ( $keypairs as $hash => $key ) {
202	202	$keyOut = Html::element( 'td', array( 'class' => 'Nova_col' ), $key );
203	203	$msg = wfMsgHtml( 'openstackmanager-delete' );
204		~~- $link = $sk->link( $this->getTitle(), $msg, array(), array( 'action' => 'delete', 'hash' => $hash ) );~~
	204	+ $link = Linker::( $this->getTitle(), $msg, array(), array( 'action' => 'delete', 'hash' => $hash ) );
205	205	$action = Html::rawElement( 'li', array(), $link );
206	206	$action = Html::rawElement( 'ul', array(), $action );
207	207	$keyOut .= Html::rawElement( 'td', array(), $action );
—	—	@@ -241,8 +241,8 @@
242	242	$wgOut->addWikiMsg( 'openstackmanager-invalidkeypair' );
243	243	}
244	244	$out = '<br />';
245		~~- $sk = $wgOut->getSkin();~~
246		~~- $out .= $sk->link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backkeylist' ) );~~
	245	+
	246	+ $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backkeylist' ) );
247	247	$wgOut->addHTML( $out );
248	248	return true;
249	249	}
—	—	@@ -262,8 +262,8 @@
263	263	$wgOut->addWikiMsg( 'openstackmanager-deletedkeyfailed' );
264	264	}
265	265	$out = '<br />';
266		~~- $sk = $wgOut->getSkin();~~
267		~~- $out .= $sk->link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backkeylist' ) );~~
	266	+
	267	+ $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backkeylist' ) );
268	268	$wgOut->addHTML( $out );
269	269	return true;
270	270	}
Index: trunk/extensions/OpenStackManager/special/SpecialNovaPuppetGroup.php
—	—	@@ -456,8 +456,8 @@
457	457	$wgOut->addModuleStyles( 'ext.openstack' );
458	458
459	459	$out = '';
460		~~- $sk = $wgOut->getSkin();~~
461		~~- $out .= $sk->link( $this->getTitle(), wfMsgHtml( 'openstackmanager-createpuppetgroup' ), array(), array( 'action' => 'create' ) );~~
	460	+
	461	+ $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-createpuppetgroup' ), array(), array( 'action' => 'create' ) );
462	462	$puppetGroups = OpenStackNovaPuppetGroup::getGroupList();
463	463	foreach ( $puppetGroups as $puppetGroup ) {
464	464	$puppetGroupId = $puppetGroup->getId();
—	—	@@ -465,30 +465,30 @@
466	466	$puppetGroupName = $puppetGroup->getName();
467	467	$puppetGroupName = "[$puppetGroupPosition] " . htmlentities( $puppetGroupName );
468	468	$specialPuppetGroupTitle = Title::newFromText( 'Special:NovaPuppetGroup' );
469		- $modify = $sk->link( $specialPuppetGroupTitle, wfMsgHtml( 'openstackmanager-modify' ), array(), array( 'action' => 'modify', 'puppetgroupid' => $puppetGroupId, 'puppetgroupposition' => $puppetGroupPosition, 'returnto' => 'Special:NovaPuppetGroup' ) );
470		- $delete = $sk->link( $specialPuppetGroupTitle, wfMsgHtml( 'openstackmanager-delete' ), array(), array( 'action' => 'delete', 'puppetgroupid' => $puppetGroupId, 'returnto' => 'Special:NovaPuppetGroup' ) );
	469	+ $modify = Linker::( $specialPuppetGroupTitle, wfMsgHtml( 'openstackmanager-modify' ), array(), array( 'action' => 'modify', 'puppetgroupid' => $puppetGroupId, 'puppetgroupposition' => $puppetGroupPosition, 'returnto' => 'Special:NovaPuppetGroup' ) );
	470	+ $delete = Linker::( $specialPuppetGroupTitle, wfMsgHtml( 'openstackmanager-delete' ), array(), array( 'action' => 'delete', 'puppetgroupid' => $puppetGroupId, 'returnto' => 'Special:NovaPuppetGroup' ) );
471	471	$out .= Html::rawElement( 'h2', array(), "$puppetGroupName ($modify, $delete)" );
472	472	$out .= Html::element( 'h3', array(), wfMsg( 'openstackmanager-puppetclasses' ) );
473		- $out .= $sk->link( $specialPuppetGroupTitle, wfMsgHtml( 'openstackmanager-addpuppetclass' ), array(), array( 'action' => 'addclass', 'puppetgroupid' => $puppetGroupId, 'returnto' => 'Special:NovaPuppetGroup' ) );
	473	+ $out .= Linker::( $specialPuppetGroupTitle, wfMsgHtml( 'openstackmanager-addpuppetclass' ), array(), array( 'action' => 'addclass', 'puppetgroupid' => $puppetGroupId, 'returnto' => 'Special:NovaPuppetGroup' ) );
474	474	$puppetGroupClasses = $puppetGroup->getClasses();
475	475	$puppetGroupVars = $puppetGroup->getVars();
476	476	if ( $puppetGroupClasses ) {
477	477	$classesOut = '';
478	478	foreach ( $puppetGroupClasses as $puppetGroupClass ) {
479		- $modify = $sk->link( $specialPuppetGroupTitle, wfMsgHtml( 'openstackmanager-modify' ), array(), array( 'action' => 'modifyclass', 'puppetclassid' => $puppetGroupClass["id"], 'puppetclassposition' => $puppetGroupClass["position"], 'puppetgroupid' => $puppetGroupId, 'returnto' => 'Special:NovaPuppetGroup' ) );
480		- $delete = $sk->link( $specialPuppetGroupTitle, wfMsgHtml( 'openstackmanager-delete' ), array(), array( 'action' => 'deleteclass', 'puppetclassid' => $puppetGroupClass["id"], 'returnto' => 'Special:NovaPuppetGroup' ) );
	479	+ $modify = Linker::( $specialPuppetGroupTitle, wfMsgHtml( 'openstackmanager-modify' ), array(), array( 'action' => 'modifyclass', 'puppetclassid' => $puppetGroupClass["id"], 'puppetclassposition' => $puppetGroupClass["position"], 'puppetgroupid' => $puppetGroupId, 'returnto' => 'Special:NovaPuppetGroup' ) );
	480	+ $delete = Linker::( $specialPuppetGroupTitle, wfMsgHtml( 'openstackmanager-delete' ), array(), array( 'action' => 'deleteclass', 'puppetclassid' => $puppetGroupClass["id"], 'returnto' => 'Special:NovaPuppetGroup' ) );
481	481	$classname = '[' . $puppetGroupClass["position"] . '] ' . htmlentities( $puppetGroupClass["name"] );
482	482	$classesOut .= Html::rawElement( 'li', array(), "$classname ($modify, $delete)" );
483	483	}
484	484	$out .= Html::rawElement( 'ul', array(), $classesOut );
485	485	}
486	486	$out .= Html::element( 'h3', array(), wfMsg( 'openstackmanager-puppetvars' ) );
487		- $out .= $sk->link( $specialPuppetGroupTitle, wfMsgHtml( 'openstackmanager-addpuppetvar' ), array(), array( 'action' => 'addvar', 'puppetgroupid' => $puppetGroupId, 'returnto' => 'Special:NovaPuppetGroup' ) );
	487	+ $out .= Linker::( $specialPuppetGroupTitle, wfMsgHtml( 'openstackmanager-addpuppetvar' ), array(), array( 'action' => 'addvar', 'puppetgroupid' => $puppetGroupId, 'returnto' => 'Special:NovaPuppetGroup' ) );
488	488	if ( $puppetGroupVars ) {
489	489	$varsOut = '';
490	490	foreach ( $puppetGroupVars as $puppetGroupVar ) {
491		- $modify = $sk->link( $specialPuppetGroupTitle, wfMsgHtml( 'openstackmanager-modify' ), array(), array( 'action' => 'modifyvar', 'puppetvarid' => $puppetGroupVar["id"], 'puppetvarposition' => $puppetGroupVar["position"], 'puppetgroupid' => $puppetGroupId, 'returnto' => 'Special:NovaPuppetGroup' ) );
492		- $delete = $sk->link( $specialPuppetGroupTitle, wfMsgHtml( 'openstackmanager-delete' ), array(), array( 'action' => 'deletevar', 'puppetvarid' => $puppetGroupVar["id"], 'returnto' => 'Special:NovaPuppetGroup' ) );
	491	+ $modify = Linker::( $specialPuppetGroupTitle, wfMsgHtml( 'openstackmanager-modify' ), array(), array( 'action' => 'modifyvar', 'puppetvarid' => $puppetGroupVar["id"], 'puppetvarposition' => $puppetGroupVar["position"], 'puppetgroupid' => $puppetGroupId, 'returnto' => 'Special:NovaPuppetGroup' ) );
	492	+ $delete = Linker::( $specialPuppetGroupTitle, wfMsgHtml( 'openstackmanager-delete' ), array(), array( 'action' => 'deletevar', 'puppetvarid' => $puppetGroupVar["id"], 'returnto' => 'Special:NovaPuppetGroup' ) );
493	493	$varname = '[' . $puppetGroupVar["position"] . '] ' . htmlentities( $puppetGroupVar["name"] );
494	494	$varsOut .= Html::rawElement( 'li', array(), "$varname ($modify, $delete)" );
495	495	}
—	—	@@ -513,9 +513,9 @@
514	514	} else {
515	515	$wgOut->addWikiMsg( 'openstackmanager-createpuppetgroupfailed' );
516	516	}
517		~~- $sk = $wgOut->getSkin();~~
	517	+
518	518	$out = '<br />';
519		~~- $out .= $sk->link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backpuppetgrouplist' ) );~~
	519	+ $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backpuppetgrouplist' ) );
520	520	$wgOut->addHTML( $out );
521	521
522	522	return true;
—	—	@@ -535,9 +535,9 @@
536	536	} else {
537	537	$wgOut->addWikiMsg( 'openstackmanager-deletepuppetgroupfailed' );
538	538	}
539		~~- $sk = $wgOut->getSkin();~~
	539	+
540	540	$out = '<br />';
541		~~- $out .= $sk->link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backpuppetgrouplist' ) );~~
	541	+ $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backpuppetgrouplist' ) );
542	542	$wgOut->addHTML( $out );
543	543
544	544	return true;
—	—	@@ -557,9 +557,9 @@
558	558	} else {
559	559	$wgOut->addWikiMsg( 'openstackmanager-failedtoaddpuppetclass' );
560	560	}
561		~~- $sk = $wgOut->getSkin();~~
	561	+
562	562	$out = '<br />';
563		~~- $out .= $sk->link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backpuppetgrouplist' ) );~~
	563	+ $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backpuppetgrouplist' ) );
564	564	$wgOut->addHTML( $out );
565	565
566	566	return true;
—	—	@@ -580,8 +580,8 @@
581	581	$wgOut->addWikiMsg( 'openstackmanager-failedtodeletepuppetclass' );
582	582	}
583	583	$out = '<br />';
584		~~- $sk = $wgOut->getSkin();~~
585		~~- $out .= $sk->link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backpuppetgrouplist' ) );~~
	584	+
	585	+ $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backpuppetgrouplist' ) );
586	586	$wgOut->addHTML( $out );
587	587
588	588	return true;
—	—	@@ -601,9 +601,9 @@
602	602	} else {
603	603	$wgOut->addWikiMsg( 'openstackmanager-failedtoaddpuppetvar' );
604	604	}
605		~~- $sk = $wgOut->getSkin();~~
	605	+
606	606	$out = '<br />';
607		~~- $out .= $sk->link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backpuppetgrouplist' ) );~~
	607	+ $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backpuppetgrouplist' ) );
608	608	$wgOut->addHTML( $out );
609	609
610	610	return true;
—	—	@@ -624,8 +624,8 @@
625	625	$wgOut->addWikiMsg( 'openstackmanager-failedtodeletepuppetvar' );
626	626	}
627	627	$out = '<br />';
628		~~- $sk = $wgOut->getSkin();~~
629		~~- $out .= $sk->link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backpuppetgrouplist' ) );~~
	628	+
	629	+ $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backpuppetgrouplist' ) );
630	630	$wgOut->addHTML( $out );
631	631
632	632	return true;
—	—	@@ -646,8 +646,8 @@
647	647	$wgOut->addWikiMsg( 'openstackmanager-failedtomodifypuppetclass' );
648	648	}
649	649	$out = '<br />';
650		~~- $sk = $wgOut->getSkin();~~
651		~~- $out .= $sk->link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backpuppetgrouplist' ) );~~
	650	+
	651	+ $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backpuppetgrouplist' ) );
652	652	$wgOut->addHTML( $out );
653	653
654	654	return true;
—	—	@@ -668,8 +668,8 @@
669	669	$wgOut->addWikiMsg( 'openstackmanager-failedtomodifypuppetvar' );
670	670	}
671	671	$out = '<br />';
672		~~- $sk = $wgOut->getSkin();~~
673		~~- $out .= $sk->link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backpuppetgrouplist' ) );~~
	672	+
	673	+ $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backpuppetgrouplist' ) );
674	674	$wgOut->addHTML( $out );
675	675
676	676	return true;
—	—	@@ -690,8 +690,8 @@
691	691	$wgOut->addWikiMsg( 'openstackmanager-failedtomodifypuppetgroup' );
692	692	}
693	693	$out = '<br />';
694		~~- $sk = $wgOut->getSkin();~~
695		~~- $out .= $sk->link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backpuppetgrouplist' ) );~~
	694	+
	695	+ $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backpuppetgrouplist' ) );
696	696	$wgOut->addHTML( $out );
697	697
698	698	return true;
Index: trunk/extensions/OpenStackManager/special/SpecialNovaRole.php
—	—	@@ -205,7 +205,7 @@
206	206	$wgOut->setPagetitle( wfMsg( 'openstackmanager-rolelist' ) );
207	207
208	208	$out = '';
209		~~- $sk = $wgOut->getSkin();~~
	209	+
210	210	$rolesOut = Html::element( 'th', array(), wfMsg( 'openstackmanager-rolename' ) );
211	211	$rolesOut .= Html::element( 'th', array(), wfMsg( 'openstackmanager-members' ) );
212	212	$rolesOut .= Html::element( 'th', array(), wfMsg( 'openstackmanager-actions' ) );
—	—	@@ -225,9 +225,9 @@
226	226	$memberOut = Html::rawElement( 'ul', array(), $memberOut );
227	227	}
228	228	$roleOut .= Html::rawElement( 'td', array(), $memberOut );
229		~~- $link = $sk->link( $this->getTitle(), wfMsgHtml( 'openstackmanager-addrolemember' ), array(), array( 'action' => 'addmember', 'rolename' => $roleName, 'returnto' => 'Special:NovaRole' ) );~~
	229	+ $link = Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-addrolemember' ), array(), array( 'action' => 'addmember', 'rolename' => $roleName, 'returnto' => 'Special:NovaRole' ) );
230	230	$actions = Html::rawElement( 'li', array(), $link );
231		~~- $link = $sk->link( $this->getTitle(), wfMsgHtml( 'openstackmanager-removerolemember' ), array(), array( 'action' => 'deletemember', 'rolename' => $roleName, 'returnto' => 'Special:NovaRole' ) );~~
	231	+ $link = Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-removerolemember' ), array(), array( 'action' => 'deletemember', 'rolename' => $roleName, 'returnto' => 'Special:NovaRole' ) );
232	232	$actions .= Html::rawElement( 'li', array(), $link );
233	233	$actions = Html::rawElement( 'ul', array(), $actions );
234	234	$roleOut .= Html::rawElement( 'td', array(), $actions );
—	—	@@ -273,10 +273,10 @@
274	274	$wgOut->addWikiMsg( 'openstackmanager-failedtoadd', $member, $formData['rolename'] );
275	275	}
276	276	}
277		~~- $sk = $wgOut->getSkin();~~
	277	+
278	278	$out = '<br />';
279	279	$returnto = Title::newFromText( $formData['returnto'] );
280		~~- $out .= $sk->link( $returnto, wfMsgHtml( 'openstackmanager-backprojectlist' ) );~~
	280	+ $out .= Linker::( $returnto, wfMsgHtml( 'openstackmanager-backprojectlist' ) );
281	281	$wgOut->addHTML( $out );
282	282
283	283	return true;
—	—	@@ -313,10 +313,10 @@
314	314	$wgOut->addWikiMsg( 'openstackmanager-failedtoremove', $member, $formData['rolename'] );
315	315	}
316	316	}
317		~~- $sk = $wgOut->getSkin();~~
	317	+
318	318	$out = '<br />';
319	319	$returnto = Title::newFromText( $formData['returnto'] );
320		~~- $out .= $sk->link( $returnto, wfMsgHtml( 'openstackmanager-backprojectlist' ) );~~
	320	+ $out .= Linker::( $returnto, wfMsgHtml( 'openstackmanager-backprojectlist' ) );
321	321	$wgOut->addHTML( $out );
322	322
323	323	return true;
Index: trunk/extensions/OpenStackManager/special/SpecialNovaSudoer.php
—	—	@@ -215,8 +215,8 @@
216	216	$wgOut->setPagetitle( wfMsg( 'openstackmanager-sudoerlist' ) );
217	217
218	218	$out = '';
219		~~- $sk = $wgOut->getSkin();~~
220		~~- $out .= $sk->link( $this->getTitle(), wfMsgHtml( 'openstackmanager-createsudoer' ), array(), array( 'action' => 'create' ) );~~
	219	+
	220	+ $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-createsudoer' ), array(), array( 'action' => 'create' ) );
221	221	$sudoersOut = Html::element( 'th', array(), wfMsg( 'openstackmanager-sudoername' ) );
222	222	$sudoersOut .= Html::element( 'th', array(), wfMsg( 'openstackmanager-sudoerusers' ) );
223	223	$sudoersOut .= Html::element( 'th', array(), wfMsg( 'openstackmanager-sudoerhosts' ) );
—	—	@@ -256,11 +256,11 @@
257	257	$sudoerOptions = Html::rawElement( 'ul', array(), $sudoerOptions );
258	258	$sudoerOut .= Html::rawElement( 'td', array(), $sudoerOptions );
259	259	$msg = wfMsgHtml( 'openstackmanager-modify' );
260		~~- $link = $sk->link( $this->getTitle(), $msg, array(),~~
	260	+ $link = Linker::( $this->getTitle(), $msg, array(),
261	261	array( 'action' => 'modify', 'sudoername' => $sudoerName ) );
262	262	$actions = Html::rawElement( 'li', array(), $link );
263	263	$msg = wfMsgHtml( 'openstackmanager-delete' );
264		~~- $link = $sk->link( $this->getTitle(), $msg, array(),~~
	264	+ $link = Linker::( $this->getTitle(), $msg, array(),
265	265	array( 'action' => 'delete', 'sudoername' => $sudoerName ) );
266	266	$actions .= Html::rawElement( 'li', array(), $link );
267	267	$actions = Html::rawElement( 'ul', array(), $actions );
—	—	@@ -308,9 +308,9 @@
309	309	return true;
310	310	}
311	311	$wgOut->addWikiMsg( 'openstackmanager-createdsudoer' );
312		~~- $sk = $wgOut->getSkin();~~
	312	+
313	313	$out = '<br />';
314		~~- $out .= $sk->link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backsudoerlist' ) );~~
	314	+ $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backsudoerlist' ) );
315	315	$wgOut->addHTML( $out );
316	316
317	317	return true;
—	—	@@ -330,9 +330,9 @@
331	331	} else {
332	332	$wgOut->addWikiMsg( 'openstackmanager-failedeletedsudoer' );
333	333	}
334		~~- $sk = $wgOut->getSkin();~~
	334	+
335	335	$out = '<br />';
336		~~- $out .= $sk->link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backsudoerlist' ) );~~
	336	+ $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backsudoerlist' ) );
337	337	$wgOut->addHTML( $out );
338	338
339	339	return true;
—	—	@@ -377,9 +377,9 @@
378	378	} else {
379	379	$wgOut->addWikiMsg( 'openstackmanager-nonexistantsudoer' );
380	380	}
381		~~- $sk = $wgOut->getSkin();~~
	381	+
382	382	$out = '<br />';
383		~~- $out .= $sk->link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backsudoerlist' ) );~~
	383	+ $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backsudoerlist' ) );
384	384	$wgOut->addHTML( $out );
385	385
386	386	return true;

Follow-up revisions

Revision	Commit summary	Author	Date
r107252	Add missing method call	reedy	00:19, 25 December 2011

Comments

#Comment by Nikerabbit (talk | contribs) 11:27, 25 December 2011

Lots of Linker::( )

#Comment by Nikerabbit (talk | contribs) 11:37, 25 December 2011

Apparently not all instances resolved yet. See r107250.

#Comment by Reedy (talk | contribs) 14:47, 25 December 2011

Should all have been fixed, as it broke the lint testing on Jenkins

Spawned a new test just now at http://integration.mediawiki.org/ci/job/MediaWiki-lint/86/

Status & tagging log

14:50, 25 December 2011 Nikerabbit (talk | contribs) changed the status of r107243 [removed: new added: resolved]
14:47, 25 December 2011 Reedy (talk | contribs) changed the status of r107243 [removed: fixme added: new]
11:37, 25 December 2011 Nikerabbit (talk | contribs) changed the status of r107243 [removed: resolved added: fixme]
11:33, 25 December 2011 Nikerabbit (talk | contribs) changed the status of r107243 [removed: fixme added: resolved]
11:27, 25 December 2011 Nikerabbit (talk | contribs) changed the status of r107243 [removed: new added: fixme]