Skip to content

Commit 990d7a2

Browse files
committed
v2.0.0
1 parent 8ad43ae commit 990d7a2

24 files changed

+104
-36
lines changed

CHANGELOG.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
# Change Log
22

3-
## [1.1.3] -
3+
## [2.0.0] - 2016-05-27
44
### Fixed
55
- Fixed #104
66
- Fixed "Nested quantifiers in regex" caused by some dir names
7+
- Switched to Mojo::JSON thus resolving localization issues in popup messages
8+
- Fixed Webmin 1.800 update issue
79

810
### Added
911
- Upload can be cancelled

README.md

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,7 @@ Note that _dpkg_ way simply updates module without creating concurrent versions
4646
## Update
4747
As of version 1.1.0 Filemin automatically checks for udpate and offers to install it if available.
4848
However currently Webmin itself bundles outdated 0.9 branch of the module and new version of Filemin is always downgraded with Webmin update.
49-
To avoid the issue version 1.1.2 of Filemin has built-in protection from such "updates", so if you have this version or higher when you're updating your Webmin you may encounter the following message:
50-
```
51-
dpkg: error processing archive /var/cache/apt/archives/webmin_1.795_all.deb (--unpack):
52-
unable to create `/usr/share/webmin/filemin/config.cgi.dpkg-new' (while processing `./usr/share/webmin/filemin/config.cgi'): Permission denied
53-
```
54-
Just ignore it!
49+
To avoid the issue version 2.0.0 of Filemin install additional Filemin Updater module. Just click "Filemin Updater" option in "Others" menu of Webmin to reinstall Filemin.
5550

5651
##Note for FreeBSD users.
5752
FreeBSD users are recommended to install _shared-mime-info_ package.
198 KB
Binary file not shown.
1.36 MB
Binary file not shown.

distrib/filemin-2.0.0.linux.wbm.gz

1.36 MB
Binary file not shown.
1.16 MB
Binary file not shown.

filemin-updater.bsd.tar.gz

2.45 KB
Binary file not shown.

filemin-updater.tar.gz

2.45 KB
Binary file not shown.

filemin-updater/images/icon.gif

1.48 KB
Loading

filemin-updater/index.cgi

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
#!/usr/bin/perl
2+
3+
use WebminCore;
4+
&init_config();
5+
&foreign_require("webmin", "webmin-lib.pl");
6+
7+
my $vc = eval #102 fix
8+
{
9+
require version;
10+
version->import();
11+
1;
12+
};
13+
14+
$webprefix = $gconfig{'webprefix'};
15+
16+
&ui_print_unbuffered_header(undef, "Filemin Updater", "", undef, 1 , 0, 0);
17+
18+
# Check for updates
19+
if($remote_user eq 'root' & $vc) {
20+
print $text{'checking_for_update'};
21+
my $url = 'https://github.com/Real-Gecko/filemin/raw/master/module.info';
22+
my $tempfile = transname();
23+
my %remote_module_info = ();
24+
my %module_info = ();
25+
my ($host, $port, $page, $ssl) = &parse_http_url($url);
26+
&http_download($host, $port, $page, $tempfile, undef, undef, $ssl)
27+
&read_file($tempfile, \%remote_module_info);
28+
%module_info = &get_module_info('filemin');
29+
my $remote = version->parse($remote_module_info{'version'});
30+
my $local = version->parse($module_info{'version'});
31+
if($local < $remote) {
32+
my $os = $gconfig{'os_type'};
33+
if(index($os, 'linux') != -1) {
34+
$os = 'linux';
35+
} elsif (index($os, 'freebsd') != -1){
36+
$os = 'freebsd';
37+
} else {
38+
&error('WHAT???');
39+
}
40+
my $url = "https://github.com/Real-Gecko/filemin/raw/master/distrib/filemin-$remote.$os.wbm.gz";
41+
my $tempfile = transname();
42+
my ($host, $port, $page, $ssl) = &parse_http_url($url);
43+
&http_download($host, $port, $page, $tempfile, undef, \&progress_callback, $ssl);
44+
$irv = &webmin::install_webmin_module($tempfile);
45+
if (!ref($irv)) {
46+
print &text('update_failed', $irv),"<p>\n";
47+
}
48+
else {
49+
print &text('module_updated', "<b>$irv->[0]->[0]</b>", "<b>$irv->[2]->[0]</b>"),"\n";
50+
print "<a href='$webprefix/filemin/index.cgi'>Filemin</a>";
51+
}
52+
} else {
53+
print $text{'module_up_to_date'};
54+
};
55+
}
56+
57+
&ui_print_footer("/", $text{'index'});

0 commit comments

Comments
 (0)