r107252 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r107251‎ \| r107252 \| r107253 >
Date:	00:19, 25 December 2011
Author:	reedy
Status:	ok
Tags:
Comment:	Add missing method call
Modified paths:	/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
—	—	@@ -482,7 +482,7 @@
483	483	$instanceId = $instance->getInstanceId();
484	484	$instanceId = htmlentities( $instanceId );
485	485	$title = Title::newFromText( $instanceId, NS_NOVA_RESOURCE );
486		~~- $instanceIdLink = Linker::( $title, $instanceId );~~
	486	+ $instanceIdLink = Linker::link( $title, $instanceId );
487	487	$instanceOut .= Html::rawElement( 'td', array(), $instanceIdLink );
488	488	$instanceOut .= Html::element( 'td', array(), $instance->getInstanceState() );
489	489	$instanceOut .= Html::element( 'td', array(), $instance->getInstanceType() );
—	—	@@ -505,25 +505,25 @@
506	506	$instanceOut .= Html::element( 'td', array(), $instance->getLaunchTime() );
507	507	if ( $this->userLDAP->inRole( 'sysadmin', $project ) ) {
508	508	$msg = wfMsgHtml( 'openstackmanager-delete' );
509		~~- $link = Linker::( $this->getTitle(), $msg, array(),~~
	509	+ $link = Linker::link( $this->getTitle(), $msg, array(),
510	510	array( 'action' => 'delete',
511	511	'project' => $project,
512	512	'instanceid' => $instance->getInstanceId() ) );
513	513	$actions = Html::rawElement( 'li', array(), $link );
514	514	$msg = wfMsgHtml( 'openstackmanager-reboot' );
515		~~- $link = Linker::( $this->getTitle(), $msg, array(),~~
	515	+ $link = Linker::link( $this->getTitle(), $msg, array(),
516	516	array( 'action' => 'reboot',
517	517	'project' => $project,
518	518	'instanceid' => $instance->getInstanceId() ) );
519	519	$actions .= Html::rawElement( 'li', array(), $link );
520	520	$msg = wfMsgHtml( 'openstackmanager-configure' );
521		~~- $link = Linker::( $this->getTitle(), $msg, array(),~~
	521	+ $link = Linker::link( $this->getTitle(), $msg, array(),
522	522	array( 'action' => 'configure',
523	523	'project' => $project,
524	524	'instanceid' => $instance->getInstanceId() ) );
525	525	$actions .= Html::rawElement( 'li', array(), $link );
526	526	$msg = wfMsgHtml( 'openstackmanager-getconsoleoutput' );
527		~~- $link = Linker::( $this->getTitle(), $msg, array(),~~
	527	+ $link = Linker::link( $this->getTitle(), $msg, array(),
528	528	array( 'action' => 'consoleoutput',
529	529	'project' => $project,
530	530	'instanceid' => $instance->getInstanceId() ) );
—	—	@@ -540,7 +540,7 @@
541	541	foreach ( $userProjects as $project ) {
542	542	$out .= Html::element( 'h2', array(), $project );
543	543	if ( $this->userLDAP->inRole( 'sysadmin', $project ) ) {
544		~~- $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-createinstance' ), array(), array( 'action' => 'create', 'project' => $project ) );~~
	544	+ $out .= Linker::link( $this->getTitle(), wfMsgHtml( 'openstackmanager-createinstance' ), array(), array( 'action' => 'create', 'project' => $project ) );
545	545	}
546	546	if ( isset( $projectArr["$project"] ) ) {
547	547	$projectOut = $header;
—	—	@@ -582,7 +582,7 @@
583	583	}
584	584
585	585	$out = '<br />';
586		~~- $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backinstancelist' ) );~~
	586	+ $out .= Linker::link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backinstancelist' ) );
587	587
588	588	$this->getOutput()->addHTML( $out );
589	589	return true;
—	—	@@ -615,7 +615,7 @@
616	616	}
617	617
618	618	$out = '<br />';
619		~~- $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backinstancelist' ) );~~
	619	+ $out .= Linker::link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backinstancelist' ) );
620	620
621	621	$this->getOutput()->addHTML( $out );
622	622	return true;
—	—	@@ -636,7 +636,7 @@
637	637	}
638	638
639	639	$out = '<br />';
640		~~- $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backinstancelist' ) );~~
	640	+ $out .= Linker::link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backinstancelist' ) );
641	641
642	642	$this->getOutput()->addHTML( $out );
643	643	return true;
—	—	@@ -663,7 +663,7 @@
664	664	}
665	665
666	666	$out = '<br />';
667		~~- $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backinstancelist' ) );~~
	667	+ $out .= Linker::link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backinstancelist' ) );
668	668
669	669	$this->getOutput()->addHTML( $out );
670	670	return true;
Index: trunk/extensions/OpenStackManager/special/SpecialNovaSecurityGroup.php
—	—	@@ -267,7 +267,7 @@
268	268	'protocol' => $ipprotocol,
269	269	'ranges' => implode( ',', $ranges ),
270	270	'groups' => implode( ',', $groupinfo ) );
271		~~- $link = Linker::( $this->getTitle(), $msg, array(), $args );~~
	271	+ $link = Linker::link( $this->getTitle(), $msg, array(), $args );
272	272	$actions = Html::rawElement( 'li', array(), $link );
273	273	$actions = Html::rawElement( 'ul', array(), $actions );
274	274	$ruleOut .= Html::rawElement( 'td', array(), $actions );
—	—	@@ -279,19 +279,19 @@
280	280	$groupOut .= Html::rawElement( 'td', array(), '' );
281	281	}
282	282	$msg = wfMsgHtml( 'openstackmanager-delete' );
283		~~- $link = Linker::( $this->getTitle(), $msg, array(),~~
	283	+ $link = Linker::link( $this->getTitle(), $msg, array(),
284	284	array( 'action' => 'delete',
285	285	'project' => $project,
286	286	'groupname' => $group->getGroupName() ) );
287	287	$actions = Html::rawElement( 'li', array(), $link );
288	288	#$msg = wfMsgHtml( 'openstackmanager-configure' );
289		~~- #$link = Linker::( $this->getTitle(), $msg, array(),~~
	289	+ #$link = Linker::link( $this->getTitle(), $msg, array(),
290	290	# array( 'action' => 'configure',
291	291	# 'project' => $project,
292	292	# 'groupname' => $group->getGroupName() ) );
293	293	#$actions .= Html::rawElement( 'li', array(), $link );
294	294	$msg = wfMsgHtml( 'openstackmanager-addrule-action' );
295		~~- $link = Linker::( $this->getTitle(), $msg, array(),~~
	295	+ $link = Linker::link( $this->getTitle(), $msg, array(),
296	296	array( 'action' => 'addrule',
297	297	'project' => $project,
298	298	'groupname' => $group->getGroupName() ) );
—	—	@@ -306,7 +306,7 @@
307	307	}
308	308	foreach ( $userProjects as $project ) {
309	309	$out .= Html::element( 'h2', array(), $project );
310		~~- $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-createnewsecuritygroup' ), array(),~~
	310	+ $out .= Linker::link( $this->getTitle(), wfMsgHtml( 'openstackmanager-createnewsecuritygroup' ), array(),
311	311	array( 'action' => 'create', 'project' => $project ) );
312	312	if ( isset( $projectArr["$project"] ) ) {
313	313	$projectOut = $groupheader;
—	—	@@ -503,7 +503,7 @@
504	504	}
505	505
506	506	$out = '<br />';
507		~~- $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backsecuritygrouplist' ) );~~
	507	+ $out .= Linker::link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backsecuritygrouplist' ) );
508	508
509	509	$this->getOutput()->addHTML( $out );
510	510	return true;
—	—	@@ -533,7 +533,7 @@
534	534	}
535	535
536	536	$out = '<br />';
537		~~- $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backsecuritygrouplist' ) );~~
	537	+ $out .= Linker::link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backsecuritygrouplist' ) );
538	538
539	539	$this->getOutput()->addHTML( $out );
540	540	return true;
—	—	@@ -562,7 +562,7 @@
563	563	}
564	564
565	565	$out = '<br />';
566		~~- $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backsecuritygrouplist' ) );~~
	566	+ $out .= Linker::link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backsecuritygrouplist' ) );
567	567
568	568	$this->getOutput()->addHTML( $out );
569	569	return true;
—	—	@@ -605,7 +605,7 @@
606	606	}
607	607
608	608	$out = '<br />';
609		~~- $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backsecuritygrouplist' ) );~~
	609	+ $out .= Linker::link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backsecuritygrouplist' ) );
610	610
611	611	$this->getOutput()->addHTML( $out );
612	612	return true;
—	—	@@ -651,7 +651,7 @@
652	652	}
653	653
654	654	$out = '<br />';
655		~~- $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backsecuritygrouplist' ) );~~
	655	+ $out .= Linker::link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backsecuritygrouplist' ) );
656	656
657	657	$this->getOutput()->addHTML( $out );
658	658	return true;
Index: trunk/extensions/OpenStackManager/special/SpecialNovaProject.php
—	—	@@ -225,7 +225,7 @@
226	226
227	227	$out = '';
228	228
229		~~- $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-createproject' ), array(), array( 'action' => 'create' ) );~~
	229	+ $out .= Linker::link( $this->getTitle(), wfMsgHtml( 'openstackmanager-createproject' ), array(), array( 'action' => 'create' ) );
230	230	$projectsOut = Html::element( 'th', array(), wfMsg( 'openstackmanager-projectname' ) );
231	231	$projectsOut .= Html::element( 'th', array(), wfMsg( 'openstackmanager-members' ) );
232	232	$projectsOut .= Html::element( 'th', array(), wfMsg( 'openstackmanager-roles' ) );
—	—	@@ -238,7 +238,7 @@
239	239	$projectName = $project->getProjectName();
240	240	$projectName = htmlentities( $projectName );
241	241	$title = Title::newFromText( $projectName, NS_NOVA_RESOURCE );
242		~~- $projectNameLink = Linker::( $title, $projectName );~~
	242	+ $projectNameLink = Linker::link( $title, $projectName );
243	243	$projectOut = Html::rawElement( 'td', array(), $projectNameLink );
244	244	$projectMembers = $project->getMembers();
245	245	$memberOut = '';
—	—	@@ -261,10 +261,10 @@
262	262	}
263	263	$roleMembers = Html::rawElement( 'ul', array(), $roleMembers );
264	264	$roleOut .= Html::rawElement( 'td', array(), $roleMembers );
265		~~- $link = Linker::( $specialRoleTitle, wfMsgHtml( 'openstackmanager-addrolemember' ), array(),~~
	265	+ $link = Linker::link( $specialRoleTitle, wfMsgHtml( 'openstackmanager-addrolemember' ), array(),
266	266	array( 'action' => 'addmember', 'projectname' => $projectName, 'rolename' => $role->getRoleName(), 'returnto' => 'Special:NovaProject' ) );
267	267	$actions = Html::rawElement( 'li', array(), $link );
268		~~- $link = Linker::( $specialRoleTitle, wfMsgHtml( 'openstackmanager-removerolemember' ), array(),~~
	268	+ $link = Linker::link( $specialRoleTitle, wfMsgHtml( 'openstackmanager-removerolemember' ), array(),
269	269	array( 'action' => 'deletemember', 'projectname' => $projectName, 'rolename' => $role->getRoleName(), 'returnto' => 'Special:NovaProject' ) );
270	270	$actions .= Html::rawElement( 'li', array(), $link );
271	271	$actions = Html::rawElement( 'ul', array(), $actions );
—	—	@@ -273,13 +273,13 @@
274	274	}
275	275	$rolesOut = Html::rawElement( 'table', array( 'class' => 'wikitable sortable collapsible' ), $rolesOut );
276	276	$projectOut .= Html::rawElement( 'td', array( 'class' => 'Nova_cell' ), $rolesOut );
277		~~- $link = Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-deleteproject' ), array(),~~
	277	+ $link = Linker::link( $this->getTitle(), wfMsgHtml( 'openstackmanager-deleteproject' ), array(),
278	278	array( 'action' => 'delete', 'projectname' => $projectName ) );
279	279	$actions = Html::rawElement( 'li', array(), $link );
280		~~- $link = Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-addmember' ), array(),~~
	280	+ $link = Linker::link( $this->getTitle(), wfMsgHtml( 'openstackmanager-addmember' ), array(),
281	281	array( 'action' => 'addmember', 'projectname' => $projectName ) );
282	282	$actions .= Html::rawElement( 'li', array(), $link );
283		~~- $link = Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-removemember' ), array(),~~
	283	+ $link = Linker::link( $this->getTitle(), wfMsgHtml( 'openstackmanager-removemember' ), array(),
284	284	array( 'action' => 'deletemember', 'projectname' => $projectName ) );
285	285	$actions .= Html::rawElement( 'li', array(), $link );
286	286	$actions = Html::rawElement( 'ul', array(), $actions );
—	—	@@ -366,7 +366,7 @@
367	367	$this->getOutput()->addWikiMsg( 'openstackmanager-createdproject' );
368	368
369	369	$out = '<br />';
370		~~- $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backprojectlist' ) );~~
	370	+ $out .= Linker::link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backprojectlist' ) );
371	371	$this->getOutput()->addHTML( $out );
372	372
373	373	return true;
—	—	@@ -388,7 +388,7 @@
389	389	}
390	390
391	391	$out = '<br />';
392		~~- $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backprojectlist' ) );~~
	392	+ $out .= Linker::link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backprojectlist' ) );
393	393	$this->getOutput()->addHTML( $out );
394	394
395	395	return true;
—	—	@@ -413,7 +413,7 @@
414	414	}
415	415
416	416	$out = '<br />';
417		~~- $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backprojectlist' ) );~~
	417	+ $out .= Linker::link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backprojectlist' ) );
418	418	$this->getOutput()->addHTML( $out );
419	419
420	420	return true;
—	—	@@ -441,7 +441,7 @@
442	442	}
443	443	$out = '<br />';
444	444
445		~~- $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backprojectlist' ) );~~
	445	+ $out .= Linker::link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backprojectlist' ) );
446	446	$this->getOutput()->addHTML( $out );
447	447
448	448	return true;
Index: trunk/extensions/OpenStackManager/special/SpecialNovaDomain.php
—	—	@@ -131,7 +131,7 @@
132	132	$this->setHeaders();
133	133	$this->getOutput()->setPagetitle( wfMsg( 'openstackmanager-domainlist' ) );
134	134
135		~~- $out = Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-createdomain' ), array(), array( 'action' => 'create' ) );~~
	135	+ $out = Linker::link( $this->getTitle(), wfMsgHtml( 'openstackmanager-createdomain' ), array(), array( 'action' => 'create' ) );
136	136	$domainsOut = Html::element( 'th', array(), wfMsg( 'openstackmanager-domainname' ) );
137	137	$domainsOut .= Html::element( 'th', array(), wfMsg( 'openstackmanager-fqdn' ) );
138	138	$domainsOut .= Html::element( 'th', array(), wfMsg( 'openstackmanager-location' ) );
—	—	@@ -145,7 +145,7 @@
146	146	$domainOut .= Html::element( 'td', array(), $fqdn );
147	147	$domainOut .= Html::element( 'td', array(), $location );
148	148	$msg = wfMsgHtml( 'openstackmanager-delete' );
149		~~- $link = Linker::( $this->getTitle(), $msg, array(),~~
	149	+ $link = Linker::link( $this->getTitle(), $msg, array(),
150	150	array( 'action' => 'delete', 'domainname' => $domainName ) );
151	151	$domainOut .= Html::rawElement( 'td', array(), $link );
152	152	$domainsOut .= Html::rawElement( 'tr', array(), $domainOut );
—	—	@@ -171,7 +171,7 @@
172	172	$this->getOutput()->addWikiMsg( 'openstackmanager-createddomain' );
173	173
174	174	$out = '<br />';
175		~~- $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backdomainlist' ) );~~
	175	+ $out .= Linker::link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backdomainlist' ) );
176	176	$this->getOutput()->addHTML( $out );
177	177
178	178	return true;
—	—	@@ -191,7 +191,7 @@
192	192	}
193	193
194	194	$out = '<br />';
195		~~- $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backdomainlist' ) );~~
	195	+ $out .= Linker::link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backdomainlist' ) );
196	196	$this->getOutput()->addHTML( $out );
197	197
198	198	return true;
Index: trunk/extensions/OpenStackManager/special/SpecialNovaVolume.php
—	—	@@ -339,7 +339,7 @@
340	340	$volumeId = $volume->getVolumeId();
341	341	$volumeId = htmlentities( $volumeId );
342	342	$title = Title::newFromText( $volumeId, NS_NOVA_RESOURCE );
343		~~- $volumeIdLink = Linker::( $title, $volumeId );~~
	343	+ $volumeIdLink = Linker::link( $title, $volumeId );
344	344	$volumeOut .= Html::rawElement( 'td', array(), $volumeIdLink );
345	345	$volumeOut .= Html::element( 'td', array(), $volume->getVolumeDescription() );
346	346	$volumeOut .= Html::element( 'td', array(), $volume->getVolumeStatus() );
—	—	@@ -351,24 +351,24 @@
352	352	$volumeOut .= Html::element( 'td', array(), $volume->getVolumeAvailabilityZone() );
353	353	$volumeOut .= Html::element( 'td', array(), $volume->getVolumeCreationTime() );
354	354	$msg = wfMsgHtml( 'openstackmanager-delete' );
355		~~- $link = Linker::( $this->getTitle(), $msg, array(),~~
	355	+ $link = Linker::link( $this->getTitle(), $msg, array(),
356	356	array( 'action' => 'delete',
357	357	'project' => $project,
358	358	'volumeid' => $volume->getVolumeId() ) );
359	359	$actions = Html::rawElement( 'li', array(), $link );
360	360	#$msg = wfMsgHtml( 'openstackmanager-rename' );
361		~~- #$actions .= Linker::( $this->getTitle(), $msg, array(),~~
	361	+ #$actions .= Linker::link( $this->getTitle(), $msg, array(),
362	362	# array( 'action' => 'rename',
363	363	# 'project' => $project,
364	364	# 'volumeid' => $volume->getVolumeId() ) );
365	365	$msg = wfMsgHtml( 'openstackmanager-attach' );
366		~~- $link = Linker::( $this->getTitle(), $msg, array(),~~
	366	+ $link = Linker::link( $this->getTitle(), $msg, array(),
367	367	array( 'action' => 'attach',
368	368	'project' => $project,
369	369	'volumeid' => $volume->getVolumeId() ) );
370	370	$actions .= Html::rawElement( 'li', array(), $link );
371	371	$msg = wfMsgHtml( 'openstackmanager-detach' );
372		~~- $link = Linker::( $this->getTitle(), $msg, array(),~~
	372	+ $link = Linker::link( $this->getTitle(), $msg, array(),
373	373	array( 'action' => 'detach',
374	374	'project' => $project,
375	375	'volumeid' => $volume->getVolumeId() ) );
—	—	@@ -383,7 +383,7 @@
384	384	}
385	385	foreach ( $userProjects as $project ) {
386	386	$out .= Html::element( 'h2', array(), $project );
387		~~- $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-createvolume' ), array(),~~
	387	+ $out .= Linker::link( $this->getTitle(), wfMsgHtml( 'openstackmanager-createvolume' ), array(),
388	388	array( 'action' => 'create', 'project' => $project ) );
389	389	if ( isset( $projectArr["$project"] ) ) {
390	390	$projectOut = $header;
—	—	@@ -410,7 +410,7 @@
411	411	}
412	412
413	413	$out = '<br />';
414		~~- $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backvolumelist' ) );~~
	414	+ $out .= Linker::link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backvolumelist' ) );
415	415
416	416	$this->getOutput()->addHTML( $out );
417	417	return true;
—	—	@@ -436,7 +436,7 @@
437	437	}
438	438
439	439	$out = '<br />';
440		~~- $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backvolumelist' ) );~~
	440	+ $out .= Linker::link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backvolumelist' ) );
441	441
442	442	$this->getOutput()->addHTML( $out );
443	443	return true;
—	—	@@ -456,7 +456,7 @@
457	457	}
458	458
459	459	$out = '<br />';
460		~~- $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backvolumelist' ) );~~
	460	+ $out .= Linker::link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backvolumelist' ) );
461	461
462	462	$this->getOutput()->addHTML( $out );
463	463	return true;
—	—	@@ -481,7 +481,7 @@
482	482	}
483	483
484	484	$out = '<br />';
485		~~- $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backvolumelist' ) );~~
	485	+ $out .= Linker::link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backvolumelist' ) );
486	486
487	487	$this->getOutput()->addHTML( $out );
488	488	return true;
Index: trunk/extensions/OpenStackManager/special/SpecialNovaKey.php
—	—	@@ -169,7 +169,7 @@
170	170	$out = '';
171	171
172	172	if ( $wgOpenStackManagerNovaKeypairStorage == 'nova' ) {
173		~~- $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-importkey' ), array(), array( 'action' => 'import' ) );~~
	173	+ $out .= Linker::link( $this->getTitle(), wfMsgHtml( 'openstackmanager-importkey' ), array(), array( 'action' => 'import' ) );
174	174	$projects = $this->userLDAP->getProjects();
175	175	foreach ( $projects as $project ) {
176	176	$userCredentials = $this->userLDAP->getCredentials();
—	—	@@ -189,7 +189,7 @@
190	190	$out .= Html::rawElement( 'table', array( 'id' => 'novakeylist', 'class' => 'wikitable sortable collapsible' ), $projectOut );
191	191	}
192	192	} elseif ( $wgOpenStackManagerNovaKeypairStorage == 'ldap' ) {
193		~~- $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-importkey' ), array(), array( 'action' => 'import' ) );~~
	193	+ $out .= Linker::link( $this->getTitle(), wfMsgHtml( 'openstackmanager-importkey' ), array(), array( 'action' => 'import' ) );
194	194	$keypairs = $this->userLDAP->getKeypairs();
195	195	$keysOut = '';
196	196	$keysOut .= Html::element( 'th', array(), wfMsg( 'openstackmanager-keys' ) );
—	—	@@ -197,7 +197,7 @@
198	198	foreach ( $keypairs as $hash => $key ) {
199	199	$keyOut = Html::element( 'td', array( 'class' => 'Nova_col' ), $key );
200	200	$msg = wfMsgHtml( 'openstackmanager-delete' );
201		~~- $link = Linker::( $this->getTitle(), $msg, array(), array( 'action' => 'delete', 'hash' => $hash ) );~~
	201	+ $link = Linker::link( $this->getTitle(), $msg, array(), array( 'action' => 'delete', 'hash' => $hash ) );
202	202	$action = Html::rawElement( 'li', array(), $link );
203	203	$action = Html::rawElement( 'ul', array(), $action );
204	204	$keyOut .= Html::rawElement( 'td', array(), $action );
—	—	@@ -238,7 +238,7 @@
239	239	}
240	240	$out = '<br />';
241	241
242		~~- $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backkeylist' ) );~~
	242	+ $out .= Linker::link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backkeylist' ) );
243	243	$this->getOutput()->addHTML( $out );
244	244	return true;
245	245	}
—	—	@@ -257,7 +257,7 @@
258	258	}
259	259	$out = '<br />';
260	260
261		~~- $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backkeylist' ) );~~
	261	+ $out .= Linker::link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backkeylist' ) );
262	262	$this->getOutput()->addHTML( $out );
263	263	return true;
264	264	}
Index: trunk/extensions/OpenStackManager/special/SpecialNovaPuppetGroup.php
—	—	@@ -443,7 +443,7 @@
444	444
445	445	$out = '';
446	446
447		~~- $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-createpuppetgroup' ), array(), array( 'action' => 'create' ) );~~
	447	+ $out .= Linker::link( $this->getTitle(), wfMsgHtml( 'openstackmanager-createpuppetgroup' ), array(), array( 'action' => 'create' ) );
448	448	$puppetGroups = OpenStackNovaPuppetGroup::getGroupList();
449	449	foreach ( $puppetGroups as $puppetGroup ) {
450	450	$puppetGroupId = $puppetGroup->getId();
—	—	@@ -451,30 +451,30 @@
452	452	$puppetGroupName = $puppetGroup->getName();
453	453	$puppetGroupName = "[$puppetGroupPosition] " . htmlentities( $puppetGroupName );
454	454	$specialPuppetGroupTitle = Title::newFromText( 'Special:NovaPuppetGroup' );
455		- $modify = Linker::( $specialPuppetGroupTitle, wfMsgHtml( 'openstackmanager-modify' ), array(), array( 'action' => 'modify', 'puppetgroupid' => $puppetGroupId, 'puppetgroupposition' => $puppetGroupPosition, 'returnto' => 'Special:NovaPuppetGroup' ) );
456		- $delete = Linker::( $specialPuppetGroupTitle, wfMsgHtml( 'openstackmanager-delete' ), array(), array( 'action' => 'delete', 'puppetgroupid' => $puppetGroupId, 'returnto' => 'Special:NovaPuppetGroup' ) );
	455	+ $modify = Linker::link( $specialPuppetGroupTitle, wfMsgHtml( 'openstackmanager-modify' ), array(), array( 'action' => 'modify', 'puppetgroupid' => $puppetGroupId, 'puppetgroupposition' => $puppetGroupPosition, 'returnto' => 'Special:NovaPuppetGroup' ) );
	456	+ $delete = Linker::link( $specialPuppetGroupTitle, wfMsgHtml( 'openstackmanager-delete' ), array(), array( 'action' => 'delete', 'puppetgroupid' => $puppetGroupId, 'returnto' => 'Special:NovaPuppetGroup' ) );
457	457	$out .= Html::rawElement( 'h2', array(), "$puppetGroupName ($modify, $delete)" );
458	458	$out .= Html::element( 'h3', array(), wfMsg( 'openstackmanager-puppetclasses' ) );
459		- $out .= Linker::( $specialPuppetGroupTitle, wfMsgHtml( 'openstackmanager-addpuppetclass' ), array(), array( 'action' => 'addclass', 'puppetgroupid' => $puppetGroupId, 'returnto' => 'Special:NovaPuppetGroup' ) );
	459	+ $out .= Linker::link( $specialPuppetGroupTitle, wfMsgHtml( 'openstackmanager-addpuppetclass' ), array(), array( 'action' => 'addclass', 'puppetgroupid' => $puppetGroupId, 'returnto' => 'Special:NovaPuppetGroup' ) );
460	460	$puppetGroupClasses = $puppetGroup->getClasses();
461	461	$puppetGroupVars = $puppetGroup->getVars();
462	462	if ( $puppetGroupClasses ) {
463	463	$classesOut = '';
464	464	foreach ( $puppetGroupClasses as $puppetGroupClass ) {
465		- $modify = Linker::( $specialPuppetGroupTitle, wfMsgHtml( 'openstackmanager-modify' ), array(), array( 'action' => 'modifyclass', 'puppetclassid' => $puppetGroupClass["id"], 'puppetclassposition' => $puppetGroupClass["position"], 'puppetgroupid' => $puppetGroupId, 'returnto' => 'Special:NovaPuppetGroup' ) );
466		- $delete = Linker::( $specialPuppetGroupTitle, wfMsgHtml( 'openstackmanager-delete' ), array(), array( 'action' => 'deleteclass', 'puppetclassid' => $puppetGroupClass["id"], 'returnto' => 'Special:NovaPuppetGroup' ) );
	465	+ $modify = Linker::link( $specialPuppetGroupTitle, wfMsgHtml( 'openstackmanager-modify' ), array(), array( 'action' => 'modifyclass', 'puppetclassid' => $puppetGroupClass["id"], 'puppetclassposition' => $puppetGroupClass["position"], 'puppetgroupid' => $puppetGroupId, 'returnto' => 'Special:NovaPuppetGroup' ) );
	466	+ $delete = Linker::link( $specialPuppetGroupTitle, wfMsgHtml( 'openstackmanager-delete' ), array(), array( 'action' => 'deleteclass', 'puppetclassid' => $puppetGroupClass["id"], 'returnto' => 'Special:NovaPuppetGroup' ) );
467	467	$classname = '[' . $puppetGroupClass["position"] . '] ' . htmlentities( $puppetGroupClass["name"] );
468	468	$classesOut .= Html::rawElement( 'li', array(), "$classname ($modify, $delete)" );
469	469	}
470	470	$out .= Html::rawElement( 'ul', array(), $classesOut );
471	471	}
472	472	$out .= Html::element( 'h3', array(), wfMsg( 'openstackmanager-puppetvars' ) );
473		- $out .= Linker::( $specialPuppetGroupTitle, wfMsgHtml( 'openstackmanager-addpuppetvar' ), array(), array( 'action' => 'addvar', 'puppetgroupid' => $puppetGroupId, 'returnto' => 'Special:NovaPuppetGroup' ) );
	473	+ $out .= Linker::link( $specialPuppetGroupTitle, wfMsgHtml( 'openstackmanager-addpuppetvar' ), array(), array( 'action' => 'addvar', 'puppetgroupid' => $puppetGroupId, 'returnto' => 'Special:NovaPuppetGroup' ) );
474	474	if ( $puppetGroupVars ) {
475	475	$varsOut = '';
476	476	foreach ( $puppetGroupVars as $puppetGroupVar ) {
477		- $modify = Linker::( $specialPuppetGroupTitle, wfMsgHtml( 'openstackmanager-modify' ), array(), array( 'action' => 'modifyvar', 'puppetvarid' => $puppetGroupVar["id"], 'puppetvarposition' => $puppetGroupVar["position"], 'puppetgroupid' => $puppetGroupId, 'returnto' => 'Special:NovaPuppetGroup' ) );
478		- $delete = Linker::( $specialPuppetGroupTitle, wfMsgHtml( 'openstackmanager-delete' ), array(), array( 'action' => 'deletevar', 'puppetvarid' => $puppetGroupVar["id"], 'returnto' => 'Special:NovaPuppetGroup' ) );
	477	+ $modify = Linker::link( $specialPuppetGroupTitle, wfMsgHtml( 'openstackmanager-modify' ), array(), array( 'action' => 'modifyvar', 'puppetvarid' => $puppetGroupVar["id"], 'puppetvarposition' => $puppetGroupVar["position"], 'puppetgroupid' => $puppetGroupId, 'returnto' => 'Special:NovaPuppetGroup' ) );
	478	+ $delete = Linker::link( $specialPuppetGroupTitle, wfMsgHtml( 'openstackmanager-delete' ), array(), array( 'action' => 'deletevar', 'puppetvarid' => $puppetGroupVar["id"], 'returnto' => 'Special:NovaPuppetGroup' ) );
479	479	$varname = '[' . $puppetGroupVar["position"] . '] ' . htmlentities( $puppetGroupVar["name"] );
480	480	$varsOut .= Html::rawElement( 'li', array(), "$varname ($modify, $delete)" );
481	481	}
—	—	@@ -499,7 +499,7 @@
500	500	}
501	501
502	502	$out = '<br />';
503		~~- $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backpuppetgrouplist' ) );~~
	503	+ $out .= Linker::link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backpuppetgrouplist' ) );
504	504	$this->getOutput()->addHTML( $out );
505	505
506	506	return true;
—	—	@@ -519,7 +519,7 @@
520	520	}
521	521
522	522	$out = '<br />';
523		~~- $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backpuppetgrouplist' ) );~~
	523	+ $out .= Linker::link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backpuppetgrouplist' ) );
524	524	$this->getOutput()->addHTML( $out );
525	525
526	526	return true;
—	—	@@ -539,7 +539,7 @@
540	540	}
541	541
542	542	$out = '<br />';
543		~~- $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backpuppetgrouplist' ) );~~
	543	+ $out .= Linker::link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backpuppetgrouplist' ) );
544	544	$this->getOutput()->addHTML( $out );
545	545
546	546	return true;
—	—	@@ -559,7 +559,7 @@
560	560	}
561	561	$out = '<br />';
562	562
563		~~- $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backpuppetgrouplist' ) );~~
	563	+ $out .= Linker::link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backpuppetgrouplist' ) );
564	564	$this->getOutput()->addHTML( $out );
565	565
566	566	return true;
—	—	@@ -579,7 +579,7 @@
580	580	}
581	581
582	582	$out = '<br />';
583		~~- $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backpuppetgrouplist' ) );~~
	583	+ $out .= Linker::link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backpuppetgrouplist' ) );
584	584	$this->getOutput()->addHTML( $out );
585	585
586	586	return true;
—	—	@@ -599,7 +599,7 @@
600	600	}
601	601	$out = '<br />';
602	602
603		~~- $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backpuppetgrouplist' ) );~~
	603	+ $out .= Linker::link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backpuppetgrouplist' ) );
604	604	$this->getOutput()->addHTML( $out );
605	605
606	606	return true;
—	—	@@ -619,7 +619,7 @@
620	620	}
621	621	$out = '<br />';
622	622
623		~~- $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backpuppetgrouplist' ) );~~
	623	+ $out .= Linker::link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backpuppetgrouplist' ) );
624	624	$this->getOutput()->addHTML( $out );
625	625
626	626	return true;
—	—	@@ -639,7 +639,7 @@
640	640	}
641	641	$out = '<br />';
642	642
643		~~- $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backpuppetgrouplist' ) );~~
	643	+ $out .= Linker::link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backpuppetgrouplist' ) );
644	644	$this->getOutput()->addHTML( $out );
645	645
646	646	return true;
—	—	@@ -659,7 +659,7 @@
660	660	}
661	661	$out = '<br />';
662	662
663		~~- $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backpuppetgrouplist' ) );~~
	663	+ $out .= Linker::link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backpuppetgrouplist' ) );
664	664	$this->getOutput()->addHTML( $out );
665	665
666	666	return true;
Index: trunk/extensions/OpenStackManager/special/SpecialNovaRole.php
—	—	@@ -219,9 +219,9 @@
220	220	$memberOut = Html::rawElement( 'ul', array(), $memberOut );
221	221	}
222	222	$roleOut .= Html::rawElement( 'td', array(), $memberOut );
223		~~- $link = Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-addrolemember' ), array(), array( 'action' => 'addmember', 'rolename' => $roleName, 'returnto' => 'Special:NovaRole' ) );~~
	223	+ $link = Linker::link( $this->getTitle(), wfMsgHtml( 'openstackmanager-addrolemember' ), array(), array( 'action' => 'addmember', 'rolename' => $roleName, 'returnto' => 'Special:NovaRole' ) );
224	224	$actions = Html::rawElement( 'li', array(), $link );
225		~~- $link = Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-removerolemember' ), array(), array( 'action' => 'deletemember', 'rolename' => $roleName, 'returnto' => 'Special:NovaRole' ) );~~
	225	+ $link = Linker::link( $this->getTitle(), wfMsgHtml( 'openstackmanager-removerolemember' ), array(), array( 'action' => 'deletemember', 'rolename' => $roleName, 'returnto' => 'Special:NovaRole' ) );
226	226	$actions .= Html::rawElement( 'li', array(), $link );
227	227	$actions = Html::rawElement( 'ul', array(), $actions );
228	228	$roleOut .= Html::rawElement( 'td', array(), $actions );
—	—	@@ -268,7 +268,7 @@
269	269
270	270	$out = '<br />';
271	271	$returnto = Title::newFromText( $formData['returnto'] );
272		~~- $out .= Linker::( $returnto, wfMsgHtml( 'openstackmanager-backprojectlist' ) );~~
	272	+ $out .= Linker::link( $returnto, wfMsgHtml( 'openstackmanager-backprojectlist' ) );
273	273	$this->getOutput()->addHTML( $out );
274	274
275	275	return true;
—	—	@@ -306,7 +306,7 @@
307	307
308	308	$out = '<br />';
309	309	$returnto = Title::newFromText( $formData['returnto'] );
310		~~- $out .= Linker::( $returnto, wfMsgHtml( 'openstackmanager-backprojectlist' ) );~~
	310	+ $out .= Linker::link( $returnto, wfMsgHtml( 'openstackmanager-backprojectlist' ) );
311	311	$this->getOutput()->addHTML( $out );
312	312
313	313	return true;
Index: trunk/extensions/OpenStackManager/special/SpecialNovaSudoer.php
—	—	@@ -210,7 +210,7 @@
211	211
212	212	$out = '';
213	213
214		~~- $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-createsudoer' ), array(), array( 'action' => 'create' ) );~~
	214	+ $out .= Linker::link( $this->getTitle(), wfMsgHtml( 'openstackmanager-createsudoer' ), array(), array( 'action' => 'create' ) );
215	215	$sudoersOut = Html::element( 'th', array(), wfMsg( 'openstackmanager-sudoername' ) );
216	216	$sudoersOut .= Html::element( 'th', array(), wfMsg( 'openstackmanager-sudoerusers' ) );
217	217	$sudoersOut .= Html::element( 'th', array(), wfMsg( 'openstackmanager-sudoerhosts' ) );
—	—	@@ -250,11 +250,11 @@
251	251	$sudoerOptions = Html::rawElement( 'ul', array(), $sudoerOptions );
252	252	$sudoerOut .= Html::rawElement( 'td', array(), $sudoerOptions );
253	253	$msg = wfMsgHtml( 'openstackmanager-modify' );
254		~~- $link = Linker::( $this->getTitle(), $msg, array(),~~
	254	+ $link = Linker::link( $this->getTitle(), $msg, array(),
255	255	array( 'action' => 'modify', 'sudoername' => $sudoerName ) );
256	256	$actions = Html::rawElement( 'li', array(), $link );
257	257	$msg = wfMsgHtml( 'openstackmanager-delete' );
258		~~- $link = Linker::( $this->getTitle(), $msg, array(),~~
	258	+ $link = Linker::link( $this->getTitle(), $msg, array(),
259	259	array( 'action' => 'delete', 'sudoername' => $sudoerName ) );
260	260	$actions .= Html::rawElement( 'li', array(), $link );
261	261	$actions = Html::rawElement( 'ul', array(), $actions );
—	—	@@ -302,7 +302,7 @@
303	303	$this->getOutput()->addWikiMsg( 'openstackmanager-createdsudoer' );
304	304
305	305	$out = '<br />';
306		~~- $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backsudoerlist' ) );~~
	306	+ $out .= Linker::link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backsudoerlist' ) );
307	307	$this->getOutput()->addHTML( $out );
308	308
309	309	return true;
—	—	@@ -323,7 +323,7 @@
324	324	}
325	325
326	326	$out = '<br />';
327		~~- $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backsudoerlist' ) );~~
	327	+ $out .= Linker::link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backsudoerlist' ) );
328	328	$this->getOutput()->addHTML( $out );
329	329
330	330	return true;
—	—	@@ -368,7 +368,7 @@
369	369	}
370	370
371	371	$out = '<br />';
372		~~- $out .= Linker::( $this->getTitle(), wfMsgHtml( 'openstackmanager-backsudoerlist' ) );~~
	372	+ $out .= Linker::link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backsudoerlist' ) );
373	373	$this->getOutput()->addHTML( $out );
374	374
375	375	return true;

Past revisions this follows-up on

Revision	Commit summary	Author	Date
r107243	Update $sk->link to Linker::link	reedy	23:33, 24 December 2011

Status & tagging log

11:33, 25 December 2011 Nikerabbit (talk | contribs) changed the status of r107252 [removed: new added: ok]