Skip to content

Commit

Permalink
Version 18.40 [hot-fix #710]
Browse files Browse the repository at this point in the history
  • Loading branch information
Ilia Rostovtsev committed Apr 6, 2017
1 parent 9b47038 commit d05cfe7
Show file tree
Hide file tree
Showing 12 changed files with 32 additions and 22 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
## Changelog

#### Version 18.41-beta26 (05 April, 2017)
#### Version 18.41-beta27 (06 April, 2017)
* Added ability to install patched version of the theme directly from GitHub, to get early access on the new features [#707](https://github.com/qooob/authentic-theme/issues/707)
* Added console script for updating the theme [#703](https://github.com/qooob/authentic-theme/issues/703)
* Added error handler for saving files in background calls [#689](https://github.com/qooob/authentic-theme/issues/689)
* Added controls for operations in icon mode [#684](https://github.com/qooob/authentic-theme/issues/684)
* Added ability to display version patch number [#676](https://github.com/qooob/authentic-theme/issues/676)
* Fixed bugs [#687](https://github.com/qooob/authentic-theme/issues/687) [#688](https://github.com/qooob/authentic-theme/issues/688) [#692](https://github.com/qooob/authentic-theme/issues/692) [#693](https://github.com/qooob/authentic-theme/issues/693) [#695](https://github.com/qooob/authentic-theme/issues/695) [#696](https://github.com/qooob/authentic-theme/issues/696) [#697](https://github.com/qooob/authentic-theme/issues/697) [#698](https://github.com/qooob/authentic-theme/issues/698) [#699](https://github.com/qooob/authentic-theme/issues/699) [#700](https://github.com/qooob/authentic-theme/issues/700) [#701](https://github.com/qooob/authentic-theme/issues/701) [#702](https://github.com/qooob/authentic-theme/issues/702) [#704](https://github.com/qooob/authentic-theme/issues/704) [#706](https://github.com/qooob/authentic-theme/issues/706) [#51526](https://www.virtualmin.com/node/51526)
* Fixed bugs [#687](https://github.com/qooob/authentic-theme/issues/687) [#688](https://github.com/qooob/authentic-theme/issues/688) [#692](https://github.com/qooob/authentic-theme/issues/692) [#693](https://github.com/qooob/authentic-theme/issues/693) [#695](https://github.com/qooob/authentic-theme/issues/695) [#696](https://github.com/qooob/authentic-theme/issues/696) [#697](https://github.com/qooob/authentic-theme/issues/697) [#698](https://github.com/qooob/authentic-theme/issues/698) [#699](https://github.com/qooob/authentic-theme/issues/699) [#700](https://github.com/qooob/authentic-theme/issues/700) [#701](https://github.com/qooob/authentic-theme/issues/701) [#702](https://github.com/qooob/authentic-theme/issues/702) [#704](https://github.com/qooob/authentic-theme/issues/704) [#706](https://github.com/qooob/authentic-theme/issues/706) [#710](https://github.com/qooob/authentic-theme/issues/710) [#51526](https://www.virtualmin.com/node/51526)

### Version 18.40 (21 March, 2017)
* Added ability to use theme configuration for all users [#640](https://github.com/qooob/authentic-theme/issues/640#issuecomment-287572703)
Expand Down
2 changes: 1 addition & 1 deletion authentic-init.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -613,7 +613,7 @@ sub usermin_available
$__usermin_config =~ s/webmin/usermin/;

if ( !-d $__usermin_config . '/authentic-theme' ) {
mkdir( $__usermin_config . '/authentic-theme', "0755" );
mkdir( $__usermin_config . '/authentic-theme', 0755 );
}

if ( -r $__usermin_root . $_module
Expand Down
30 changes: 20 additions & 10 deletions authentic-lib.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1781,18 +1781,14 @@ sub embed_logo
. $logo
. ".png" ) )
{
# Update logo in case it changed
# Update logo for Webmin
copy_source_dest( $config_directory . "/authentic-theme/" . $logo . ".png",
$root_directory . "/authentic-theme/images" );

# Push logo update in case Usermin is installed
if ( usermin_available() ) {
copy_source_dest( $usermin_config_directory . "/authentic-theme/" . $logo . ".png",
$usermin_root_directory . "/authentic-theme/images" );
if ( -r $usermin_config_directory . "/authentic-theme/logo_welcome.png" ) {
copy_source_dest( $usermin_config_directory . "/authentic-theme/logo_welcome.png",
$usermin_root_directory . "/authentic-theme/images" );
}
}
}
if ( -r $root_directory . "/authentic-theme/images/" . $logo . ".png" ) {
Expand Down Expand Up @@ -1901,10 +1897,24 @@ sub get_authentic_version
return ( $installed_version, $remote_version );
}

sub __config_dir_available
sub theme_config_dir_available
{
if ( !-d $config_directory . '/authentic-theme' ) {
mkdir( $config_directory . '/authentic-theme', "0755" );
my $_wm_at_conf_dir = $config_directory . '/authentic-theme';

if ( !-d $_wm_at_conf_dir ) {
mkdir( $_wm_at_conf_dir, 0755 );
} else {
chmod(0755, $_wm_at_conf_dir);
}

if ( usermin_available() ) {
( my $_um_at_conf_dir = $config_directory ) =~ s/webmin/usermin/;

if ( !-d $_um_at_conf_dir ) {
mkdir( $_um_at_conf_dir, 0755 );
} else {
chmod(0755, $_um_at_conf_dir);
}
}
}

Expand Down Expand Up @@ -2792,7 +2802,7 @@ sub _settings

if ( $t eq 'save' || $t eq 'restore' ) {

__config_dir_available();
theme_config_dir_available();

if ( $t eq 'save' ) {
!foreign_available("webmin")
Expand Down Expand Up @@ -3152,7 +3162,7 @@ sub init
{

# Make sure that config directory exists
__config_dir_available();
theme_config_dir_available();

# Register hooks
$t_uri____i = ( $t_uri_cloudmin == -1 ? 'dom' : 'sid' );
Expand Down
2 changes: 1 addition & 1 deletion settings-editor_write.cgi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ do "authentic-theme/authentic-lib.pm";

!foreign_available("webmin") && error( $Atext{'theme_error_access_not_root'} );

__config_dir_available();
theme_config_dir_available();

unlink_file( $in{'file'} );
write_file_contents( $in{'file'}, $in{'data'} );
Expand Down
2 changes: 1 addition & 1 deletion settings-favorites_save.cgi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ do "authentic-theme/authentic-lib.pm";

!foreign_available("webmin") && error( $Atext{'theme_error_access_not_root'} );

__config_dir_available();
theme_config_dir_available();

$in =~ s/\t\n\r//g;
$in =~ /\{(?:\{.*\}|[^{])*\}/sg;
Expand Down
2 changes: 1 addition & 1 deletion settings-upload_save.cgi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ do "authentic-theme/authentic-lib.pm";

!foreign_available("webmin") && error( $Atext{'theme_error_access_not_root'} );

__config_dir_available();
theme_config_dir_available();

my $lr = "/authentic-theme/logo.png";
my $lrd = "/authentic-theme/images/logo.png";
Expand Down
2 changes: 1 addition & 1 deletion unauthenticated/css/authentic.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4467,7 +4467,7 @@ input[type='range']:focus::-ms-fill-upper {
tr.atshover:hover td kbd,
tr.atshover:hover td code,
tr.atshover:hover td div,
tr.atshover:hover td span,
tr.atshover:hover td span:not(.awobject),
tr.atshover:hover td {
background-color: #f5f5f5 !important
}
Expand Down
2 changes: 1 addition & 1 deletion unauthenticated/css/authentic.min.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion unauthenticated/css/bundle.min.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion unauthenticated/css/palettes/nightrider.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ html[data-background-style='nightRider'] body[data-module*='htaccess-htpasswd']
html[data-background-style='nightRider'] tr.atshover:hover td kbd,
html[data-background-style='nightRider'] tr.atshover:hover td code,
html[data-background-style='nightRider'] tr.atshover:hover td div,
html[data-background-style='nightRider'] tr.atshover:hover td:not(.atscontent) span,
html[data-background-style='nightRider'] tr.atshover:hover td:not(.atscontent) span:not(.awobject),
html[data-background-style='nightRider'] tr.atshover:hover td,
html[data-background-style='nightRider'] #atsettings>form>div>table>tbody>tr>td>table>tbody>tr.atshover:hover,
html[data-background-style='nightRider'] #atsettings>form>div>table>tbody>tr>td>table>tbody>tr.atshover:hover td div,
Expand Down
2 changes: 1 addition & 1 deletion unauthenticated/css/palettes/nightrider.min.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion version
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.40-git-201704052119
18.40-git-201704061248

0 comments on commit d05cfe7

Please sign in to comment.