Skip to content

Commit 5434354

Browse files
jcameronjcameron
committed
Replace incorrect target=_new with target=_blank
1 parent 5c50422 commit 5434354

17 files changed

+58
-21
lines changed

Diff for: ‎EC2-IMAGES

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
- Install CentOS / Debian rightscale image
2+
3+
- Fix /etc/motd
4+
5+
- Update EC2 tools
6+
wget http://s3.amazonaws.com/ec2-downloads/ec2-ami-tools.noarch.rpm && rpm -Uvh ec2-ami-tools.noarch.rpm
7+
8+
- Install Virtualmin GPL
9+
10+
- Update all packages / versions to 5.6
11+
12+
- Add /etc/webmin/start to /etc/rc.local , if needed
13+
14+
- Make sure quotas come back after reboot
15+
16+
- Disable rightscale bootup actions?
17+
18+
- Enable external IP detection via dns_ip=* in /etc/webmin/virtual-server/config
19+
20+
- Disable resolv.conf check via dns_check=0 in /etc/webmin/virtual-server/config
21+
22+
- Set root password to *
23+
24+
- Config check
25+
26+
- Updated detected OS in Webmin Configuration
27+
28+
- Hide new features
29+
30+
- Manually enable pre-loading
31+
32+
- Test with new system
33+
34+
- Copy to other regions
35+
- Create bucket in new region
36+
- Copy all files to new bucket
37+
- Set bucket permissions to za-team listable

Diff for: ‎RELEASE

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
x fudu
1212
x lentor
1313
x xencentos
14-
- xengpl
14+
x xengpl
1515

1616
x Generate british english with :
1717
cd /usr/local/webadmin

Diff for: ‎edit_domain.cgi

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ print &ui_hidden_table_start($text{'edit_header'}, "width=100%", 2,
3232
# Domain name, with link
3333
$dname = &show_domain_name($d);
3434
print &ui_table_row($text{'edit_domain'},
35-
$d->{'web'} ? "<tt><a target=_new href=http://$d->{'dom'}/>$dname</a></tt>"
35+
$d->{'web'} ? "<tt><a target=_blank/g href=http://$d->{'dom'}/>$dname</a></tt>"
3636
: "<tt>$dname</tt>");
3737

3838
if ($dname ne $d->{'dom'}) {

Diff for: ‎edit_html.cgi

+2-2
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ print "</table>\n";
7676
# Tell the user if something was saved
7777
$port = $d->{'web_port'} == 80 ? "" : ":".$d->{'web_port'};
7878
if ($in{'saved'}) {
79-
print "<p><b>",&text('html_saved', "<a href='http://$d->{'dom'}$port/$in{'edit'}' target=_new><tt>$in{'edit'}</tt></a>"),"</b><p>\n";
79+
print "<p><b>",&text('html_saved', "<a href='http://$d->{'dom'}$port/$in{'edit'}' target=_blank/g><tt>$in{'edit'}</tt></a>"),"</b><p>\n";
8080
}
8181

8282
if ($editing) {
@@ -99,7 +99,7 @@ if ($editing) {
9999
print &ui_hr();
100100
print "<b>";
101101
if ($editing == 1) {
102-
print &text('html_editing', "<a href='http://$d->{'dom'}$port/$in{'edit'}' target=_new><tt>$in{'edit'}</tt></a>");
102+
print &text('html_editing', "<a href='http://$d->{'dom'}$port/$in{'edit'}' target=_blank/g><tt>$in{'edit'}</tt></a>");
103103
}
104104
else {
105105
print &text('html_creating', "<tt>$in{'create'}</tt>");

Diff for: ‎edit_newscripts.cgi

+2-2
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ foreach $script (sort { $a->{'sortcategory'} cmp $b->{'sortcategory'} ||
6565
'value' => $script->{'name'},
6666
'checked' => $script->{'avail_only'} },
6767
$script->{'site'} ?
68-
"<a href='$script->{'site'}' target=_new>".
68+
"<a href='$script->{'site'}' target=_blank/g>".
6969
"$script->{'desc'}</a>" : $script->{'desc'},
7070
$script->{'longdesc'},
7171
$text{'newscripts_'.$script->{'source'}},
@@ -291,7 +291,7 @@ foreach $as (sort { $a->[0]->{'dom'} cmp $b->[0]->{'dom'} } @all_scripts) {
291291
$script->{'vdesc'}->{$sinfo->{'version'}} ||
292292
$sinfo->{'version'},
293293
$sinfo->{'url'} && !$sinfo->{'deleted'} ?
294-
"<a href='$sinfo->{'url'}' target=_new>$path</a>" :
294+
"<a href='$sinfo->{'url'}' target=_blank/g>$path</a>" :
295295
$path,
296296
$status,
297297
]);

Diff for: ‎edit_script.cgi

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ if ($sinfo->{'deleted'}) {
3737
# Show install URL
3838
if ($sinfo->{'url'}) {
3939
print &ui_table_row($text{'scripts_iurl'},
40-
"<a href='$sinfo->{'url'}' target=_new>".
40+
"<a href='$sinfo->{'url'}' target=_blank/g>".
4141
"$sinfo->{'url'}</a>");
4242
}
4343
print &ui_table_row($text{'scripts_itime'}, &make_date($sinfo->{'time'}));
@@ -68,7 +68,7 @@ if ($sinfo->{'user'}) {
6868
# Show original website
6969
if ($script->{'site'}) {
7070
print &ui_table_row($text{'scripts_isite'},
71-
"<a href='$script->{'site'}' target=_new>".
71+
"<a href='$script->{'site'}' target=_blank/g>".
7272
"$script->{'site'}</a>");
7373
}
7474

Diff for: ‎list_scripts.cgi

+2-2
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ foreach $sinfo (sort { lc($smap{$a->{'name'}}->{'desc'}) cmp
6565
$script->{'vdesc'}->{$sinfo->{'version'}} ||
6666
$sinfo->{'version'},
6767
$sinfo->{'url'} && !$sinfo->{'deleted'} ?
68-
"<a href='$sinfo->{'url'}' target=_new>$path</a>" :
68+
"<a href='$sinfo->{'url'}' target=_blank/g>$path</a>" :
6969
$path,
7070
$dbdesc,
7171
$status,
@@ -163,7 +163,7 @@ foreach $script (sort { $a->{'sortcategory'} cmp
163163
{ 'type' => 'radio', 'name' => 'script',
164164
'value' => $script->{'name'},
165165
'checked' => $in{'search'} && @scripts == 1 },
166-
$script->{'site'} ? "<a href='$script->{'site'}' target=_new>".
166+
$script->{'site'} ? "<a href='$script->{'site'}' target=_blank/g>".
167167
"$script->{'desc'}</a>" : $script->{'desc'},
168168
$vsel." ".
169169
"<input type=image name=fast ".

Diff for: ‎mass_scripts.cgi

+1-1
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ else {
152152
&show_domain_name($sinfo->{'dom'}),
153153
$sinfo->{'version'},
154154
$sinfo->{'url'} ?
155-
"<a href='$sinfo->{'url'}' target=_new>$path</a>" :
155+
"<a href='$sinfo->{'url'}' target=_blank/g>$path</a>" :
156156
$path,
157157
$utype,
158158
]);

Diff for: ‎script_form.cgi

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ if ($ok) {
8787
# Show original website
8888
if ($script->{'site'}) {
8989
print &ui_table_row($text{'scripts_isite'},
90-
"<a href='$script->{'site'}' target=_new>".
90+
"<a href='$script->{'site'}' target=_blank/g>".
9191
"$script->{'site'}</a>");
9292
}
9393

Diff for: ‎scripts/django.pl

+1-1
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ sub script_django_install
397397
local $adminurl = $url."admin/";
398398
local $rp = $opts->{'dir'};
399399
$rp =~ s/^$d->{'home'}\///;
400-
return (1, "Initial Django installation complete. Go to <a target=_new href='$adminurl'>$adminurl</a> to manage it. Django is a development environment, so it doesn't do anything by itself!", "Under $rp", $url, $domuser, $dompass);
400+
return (1, "Initial Django installation complete. Go to <a target=_blank/g href='$adminurl'>$adminurl</a> to manage it. Django is a development environment, so it doesn't do anything by itself!", "Under $rp", $url, $domuser, $dompass);
401401
}
402402

403403
# script_django_uninstall(&domain, version, &opts)

Diff for: ‎scripts/dokuwiki.pl

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ sub script_dokuwiki_install
125125
local $url = &script_path_url($d, $opts);
126126
local $rp = $opts->{'dir'};
127127
$rp =~ s/^$d->{'home'}\///;
128-
return (1, "DokuWiki installation complete. Go to <a target=_new href='$url'>$url</a> to use it.", "Under $rp", $url);
128+
return (1, "DokuWiki installation complete. Go to <a target=_blank/g href='$url'>$url</a> to use it.", "Under $rp", $url);
129129
}
130130

131131
# script_dokuwiki_uninstall(&domain, version, &opts)

Diff for: ‎scripts/phpmyadmin.pl

+1-1
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ sub script_phpmyadmin_install
293293
# Return a URL for the user
294294
local $rp = $opts->{'dir'};
295295
$rp =~ s/^$d->{'home'}\///;
296-
return (1, "phpMyAdmin installation complete. It can be accessed at <a target=_new href='$url'>$url</a>.", "Under $rp", $url, $dbuser, $dbpass);
296+
return (1, "phpMyAdmin installation complete. It can be accessed at <a target=_blank/g href='$url'>$url</a>.", "Under $rp", $url, $dbuser, $dbpass);
297297
}
298298

299299
# script_phpmyadmin_uninstall(&domain, version, &opts)

Diff for: ‎scripts/phppgadmin.pl

+1-1
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ sub script_phppgadmin_install
174174
local $url = &script_path_url($d, $opts);
175175
local $rp = $opts->{'dir'};
176176
$rp =~ s/^$d->{'home'}\///;
177-
return (1, "phpPgAdmin installation complete. It can be accessed at <a target=_new href='$url'>$url</a>.", "Under $rp", $url, $dbuser, $dbpass);
177+
return (1, "phpPgAdmin installation complete. It can be accessed at <a target=_blank/g href='$url'>$url</a>.", "Under $rp", $url, $dbuser, $dbpass);
178178
}
179179

180180
# script_phppgadmin_uninstall(&domain, version, &opts)

Diff for: ‎scripts/roundcube.pl

+1-1
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ sub script_roundcube_install
283283
local $url = &script_path_url($d, $opts);
284284
local $rp = $opts->{'dir'};
285285
$rp =~ s/^$d->{'home'}\///;
286-
return (1, "RoundCube installation complete. It can be accessed at <a target=_new href='$url'>$url</a>.", "Under $rp using $dbphptype database $dbname", $url);
286+
return (1, "RoundCube installation complete. It can be accessed at <a target=_blank/g href='$url'>$url</a>.", "Under $rp using $dbphptype database $dbname", $url);
287287
}
288288

289289
# script_roundcube_uninstall(&domain, version, &opts)

Diff for: ‎scripts/squirrelmail.pl

+1-1
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ sub script_squirrelmail_install
336336
local $url = &script_path_url($d, $opts);
337337
local $rp = $opts->{'dir'};
338338
$rp =~ s/^$d->{'home'}\///;
339-
return (1, "SquirrelMail installation complete. It can be accessed at <a target=_new href='$url'>$url</a>.", $dbname ? "Under $rp using $dbphptype database $dbname" : "Under $rp", $url);
339+
return (1, "SquirrelMail installation complete. It can be accessed at <a target=_blank/g href='$url'>$url</a>.", $dbname ? "Under $rp using $dbphptype database $dbname" : "Under $rp", $url);
340340
}
341341

342342
# script_squirrelmail_uninstall(&domain, version, &opts)

Diff for: ‎scripts/whmcs.pl

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ sub script_whmcs_params
7474
$rv .= &ui_table_row("WHMCS license key",
7575
&ui_textbox("licensekey", undef, 30));
7676
$rv .= &ui_table_row(" ",
77-
"You must purchase an <a href='http://www.whmcs.com/members/aff.php?aff=4115' target=_new>WHMCS license</a> before installing this script");
77+
"You must purchase an <a href='http://www.whmcs.com/members/aff.php?aff=4115' target=_blank/g>WHMCS license</a> before installing this script");
7878
}
7979
return $rv;
8080
}
@@ -416,7 +416,7 @@ sub script_whmcs_install
416416
local $rp = $opts->{'dir'};
417417
$rp =~ s/^$d->{'home'}\///;
418418
local $adminurl = $url."admin/";
419-
return (1, "WHMCS installation complete. It can be accessed at <a href=$url target=_new>$url</a> and managed at <a href=$adminurl target=_new>$adminurl</a>. For more information, see <a href=http://wiki.whmcs.com/Installing_WHMCS target=_new>http://wiki.whmcs.com/Installing_WHMCS</a> and <a href=http://wiki.whmcs.com/Virtualmin_Pro target=_new>http://wiki.whmcs.com/Virtualmin_Pro</a>.",
419+
return (1, "WHMCS installation complete. It can be accessed at <a href=$url target=_blank/g>$url</a> and managed at <a href=$adminurl target=_blank/g>$adminurl</a>. For more information, see <a href=http://wiki.whmcs.com/Installing_WHMCS target=_blank/g>http://wiki.whmcs.com/Installing_WHMCS</a> and <a href=http://wiki.whmcs.com/Virtualmin_Pro target=_blank/g>http://wiki.whmcs.com/Virtualmin_Pro</a>.",
420420
"Under $rp using $dbphptype database $dbname", $url,
421421
$domuser, $dompass);
422422
}

Diff for: ‎virtual-server-lib-funcs.pl

+1-1
Original file line numberDiff line numberDiff line change
@@ -13856,7 +13856,7 @@ sub get_provider_link
1385613856
}
1385713857
if ($logo && $logo ne "none") {
1385813858
local $html;
13859-
$html .= "<a href='$link' target=_new>" if ($link);
13859+
$html .= "<a href='$link' target=_blank/g>" if ($link);
1386013860
$html .= "<img src='$image' border=0>";
1386113861
$html .= "</a>" if ($link);
1386213862
return wantarray ? ( $html, $logo, $link ) : $html;

0 commit comments

Comments
 (0)