Add an error message upon theme update for no connection to GitHub or its API rate limit excess

iliajie · iliajie · commit d51929e05580 · 2018-11-15T15:10:46.000+03:00
diff --git a/authentic-lib.pm b/authentic-lib.pm
@@ -1921,8 +1921,8 @@ sub theme_update_incompatible
     my $usermin_compatible_version;
     my @notice;
     my $force_button =
-'<a data-git="1" data-stable="0" data-force="1" class="authentic_update text-darker" href="javascript:;">'
-                      . $theme_text{'theme_xhred_global_click_here'} . '</a>';
+      '<a data-git="1" data-stable="0" data-force="1" class="authentic_update text-darker" href="javascript:;">' .
+      $theme_text{'theme_xhred_global_click_here'} . '</a>';
     my $usermin_enabled_updates = ($theme_config{'settings_sysinfo_theme_updates_for_usermin'} ne 'false' ? 1 : 0);
     my ($authentic_remote_version) = $authentic_remote_data =~ /^version=(.*)/gm;
 
@@ -3126,6 +3126,12 @@ sub get_xhr_request
                         $authentic_remote_data = theme_remote_version(1, 0, 1);
                     }
 
+                    if ($authentic_remote_data eq '0') {
+                        @update_rs = { "no_connection" => $theme_text{'theme_git_update_locked'} };
+                        print convert_to_json(\@update_rs);
+                        exit;
+                    }
+
                     @update_rs = theme_update_incompatible($authentic_remote_data);
                     if (@update_rs) {
                         print convert_to_json(\@update_rs);
diff --git a/lang/ca.UTF-8 b/lang/ca.UTF-8
@@ -975,4 +975,4 @@ theme_xhred_filemanager_context_clipboard_selection=Copy selection to clipboard
 
 settings_hotkey_slider=Hotkey for toggling side slider
 
-
+theme_git_update_locked=Theme update cannot be completed due to no connection to GitHub or its API rate limit excess. For latter, unauthenticated requests, the rate limit allows for up to 60 requests per hour. Try again later or use console to do it manually via update script.
diff --git a/lang/cz.UTF-8 b/lang/cz.UTF-8
@@ -974,4 +974,4 @@ theme_xhred_filemanager_context_clipboard_selection=Copy selection to clipboard
 
 settings_hotkey_slider=Hotkey for toggling side slider
 
-
+theme_git_update_locked=Theme update cannot be completed due to no connection to GitHub or its API rate limit excess. For latter, unauthenticated requests, the rate limit allows for up to 60 requests per hour. Try again later or use console to do it manually via update script.
diff --git a/lang/da.UTF-8 b/lang/da.UTF-8
@@ -975,4 +975,4 @@ theme_xhred_filemanager_context_clipboard_selection=Copy selection to clipboard
 
 settings_hotkey_slider=Hotkey for toggling side slider
 
-
+theme_git_update_locked=Theme update cannot be completed due to no connection to GitHub or its API rate limit excess. For latter, unauthenticated requests, the rate limit allows for up to 60 requests per hour. Try again later or use console to do it manually via update script.
diff --git a/lang/de.UTF-8 b/lang/de.UTF-8
@@ -966,4 +966,4 @@ theme_xhred_filemanager_context_clipboard_selection=Copy selection to clipboard
 
 settings_hotkey_slider=Hotkey for toggling side slider
 
-
+theme_git_update_locked=Theme update cannot be completed due to no connection to GitHub or its API rate limit excess. For latter, unauthenticated requests, the rate limit allows for up to 60 requests per hour. Try again later or use console to do it manually via update script.
diff --git a/lang/en.UTF-8 b/lang/en.UTF-8
@@ -974,3 +974,5 @@ theme_xhred_search_in_servermanager=Search Cloudmin
 theme_xhred_filemanager_context_clipboard_selection=Copy selection to clipboard
 
 settings_hotkey_slider=Hotkey for toggling side slider
+
+theme_git_update_locked=Theme update cannot be completed due to no connection to GitHub or its API rate limit excess. For latter, unauthenticated requests, the rate limit allows for up to 60 requests per hour. Try again later or use console to do it manually via update script.
diff --git a/lang/es.UTF-8 b/lang/es.UTF-8
@@ -975,4 +975,4 @@ theme_xhred_filemanager_context_clipboard_selection=Copy selection to clipboard
 
 settings_hotkey_slider=Hotkey for toggling side slider
 
-
+theme_git_update_locked=Theme update cannot be completed due to no connection to GitHub or its API rate limit excess. For latter, unauthenticated requests, the rate limit allows for up to 60 requests per hour. Try again later or use console to do it manually via update script.
diff --git a/lang/fr.UTF-8 b/lang/fr.UTF-8
@@ -975,4 +975,4 @@ theme_xhred_filemanager_context_clipboard_selection=Copy selection to clipboard
 
 settings_hotkey_slider=Hotkey for toggling side slider
 
-
+theme_git_update_locked=Theme update cannot be completed due to no connection to GitHub or its API rate limit excess. For latter, unauthenticated requests, the rate limit allows for up to 60 requests per hour. Try again later or use console to do it manually via update script.
diff --git a/lang/id.UTF-8 b/lang/id.UTF-8
@@ -977,4 +977,4 @@ theme_xhred_filemanager_context_clipboard_selection=Copy selection to clipboard
 
 settings_hotkey_slider=Hotkey for toggling side slider
 
-
+theme_git_update_locked=Theme update cannot be completed due to no connection to GitHub or its API rate limit excess. For latter, unauthenticated requests, the rate limit allows for up to 60 requests per hour. Try again later or use console to do it manually via update script.
diff --git a/lang/it.UTF-8 b/lang/it.UTF-8
@@ -975,4 +975,4 @@ theme_xhred_filemanager_context_clipboard_selection=Copy selection to clipboard
 
 settings_hotkey_slider=Hotkey for toggling side slider
 
-
+theme_git_update_locked=Theme update cannot be completed due to no connection to GitHub or its API rate limit excess. For latter, unauthenticated requests, the rate limit allows for up to 60 requests per hour. Try again later or use console to do it manually via update script.
diff --git a/lang/ja_JP.UTF-8 b/lang/ja_JP.UTF-8
@@ -972,4 +972,4 @@ theme_xhred_filemanager_context_clipboard_selection=Copy selection to clipboard
 
 settings_hotkey_slider=Hotkey for toggling side slider
 
-
+theme_git_update_locked=Theme update cannot be completed due to no connection to GitHub or its API rate limit excess. For latter, unauthenticated requests, the rate limit allows for up to 60 requests per hour. Try again later or use console to do it manually via update script.
diff --git a/lang/nl.UTF-8 b/lang/nl.UTF-8
@@ -975,4 +975,4 @@ theme_xhred_filemanager_context_clipboard_selection=Copy selection to clipboard
 
 settings_hotkey_slider=Hotkey for toggling side slider
 
-
+theme_git_update_locked=Theme update cannot be completed due to no connection to GitHub or its API rate limit excess. For latter, unauthenticated requests, the rate limit allows for up to 60 requests per hour. Try again later or use console to do it manually via update script.
diff --git a/lang/no.UTF-8 b/lang/no.UTF-8
@@ -831,4 +831,4 @@ theme_xhred_filemanager_context_clipboard_selection=Copy selection to clipboard
 
 settings_hotkey_slider=Hotkey for toggling side slider
 
-
+theme_git_update_locked=Theme update cannot be completed due to no connection to GitHub or its API rate limit excess. For latter, unauthenticated requests, the rate limit allows for up to 60 requests per hour. Try again later or use console to do it manually via update script.
diff --git a/lang/pl.UTF-8 b/lang/pl.UTF-8
@@ -975,4 +975,4 @@ theme_xhred_filemanager_context_clipboard_selection=Copy selection to clipboard
 
 settings_hotkey_slider=Hotkey for toggling side slider
 
-
+theme_git_update_locked=Theme update cannot be completed due to no connection to GitHub or its API rate limit excess. For latter, unauthenticated requests, the rate limit allows for up to 60 requests per hour. Try again later or use console to do it manually via update script.
diff --git a/lang/pt.UTF-8 b/lang/pt.UTF-8
@@ -975,4 +975,4 @@ theme_xhred_filemanager_context_clipboard_selection=Copy selection to clipboard
 
 settings_hotkey_slider=Hotkey for toggling side slider
 
-
+theme_git_update_locked=Theme update cannot be completed due to no connection to GitHub or its API rate limit excess. For latter, unauthenticated requests, the rate limit allows for up to 60 requests per hour. Try again later or use console to do it manually via update script.
diff --git a/lang/ro_RO.UTF-8 b/lang/ro_RO.UTF-8
@@ -973,4 +973,4 @@ theme_xhred_filemanager_context_clipboard_selection=Copy selection to clipboard
 
 settings_hotkey_slider=Hotkey for toggling side slider
 
-
+theme_git_update_locked=Theme update cannot be completed due to no connection to GitHub or its API rate limit excess. For latter, unauthenticated requests, the rate limit allows for up to 60 requests per hour. Try again later or use console to do it manually via update script.
diff --git a/lang/ru.UTF-8 b/lang/ru.UTF-8
@@ -978,4 +978,4 @@ theme_xhred_filemanager_context_clipboard_selection=Copy selection to clipboard
 
 settings_hotkey_slider=Hotkey for toggling side slider
 
-
+theme_git_update_locked=Theme update cannot be completed due to no connection to GitHub or its API rate limit excess. For latter, unauthenticated requests, the rate limit allows for up to 60 requests per hour. Try again later or use console to do it manually via update script.
diff --git a/lang/sq.UTF-8 b/lang/sq.UTF-8
@@ -986,4 +986,4 @@ theme_xhred_filemanager_context_clipboard_selection=Copy selection to clipboard
 
 settings_hotkey_slider=Hotkey for toggling side slider
 
-
+theme_git_update_locked=Theme update cannot be completed due to no connection to GitHub or its API rate limit excess. For latter, unauthenticated requests, the rate limit allows for up to 60 requests per hour. Try again later or use console to do it manually via update script.
diff --git a/lang/sv.UTF-8 b/lang/sv.UTF-8
@@ -972,4 +972,4 @@ theme_xhred_filemanager_context_clipboard_selection=Kopiera markerat till urklip
 
 settings_hotkey_slider=Snabbtangent för att växla sidomenyn
 
-
+theme_git_update_locked=Theme update cannot be completed due to no connection to GitHub or its API rate limit excess. For latter, unauthenticated requests, the rate limit allows for up to 60 requests per hour. Try again later or use console to do it manually via update script.
diff --git a/lang/zh_CN.UTF-8 b/lang/zh_CN.UTF-8
@@ -972,3 +972,4 @@ theme_xhred_filemanager_context_clipboard_selection=Copy selection to clipboard
 
 settings_hotkey_slider=Hotkey for toggling side slider
 
+theme_git_update_locked=Theme update cannot be completed due to no connection to GitHub or its API rate limit excess. For latter, unauthenticated requests, the rate limit allows for up to 60 requests per hour. Try again later or use console to do it manually via update script.
diff --git a/theme.info b/theme.info
@@ -1,7 +1,7 @@
 desc=Authentic Theme
 longdesc=Webmin/Usermin/Virtualmin/Cloudmin theme based on Bootstrap and Font Awesome (https://github.com/authentic-theme/authentic-theme)
 version=19.20
-mversion=01
+mversion=02
 depends=1.900 1.750
 webmin=1
 usermin=1
diff --git a/unauthenticated/js/bundle.min.js b/unauthenticated/js/bundle.min.js

Original file line number	Diff line number	Diff line change
`@@ -975,4 +975,4 @@ theme_xhred_filemanager_context_clipboard_selection=Copy selection to clipboard`
`975`	`975`
`976`	`976`	`settings_hotkey_slider=Hotkey for toggling side slider`
`977`	`977`
`978`		`-`
	`978`	`+theme_git_update_locked=Theme update cannot be completed due to no connection to GitHub or its API rate limit excess. For latter, unauthenticated requests, the rate limit allows for up to 60 requests per hour. Try again later or use console to do it manually via update script.`
Original file line number	Diff line number	Diff line change
`@@ -974,4 +974,4 @@ theme_xhred_filemanager_context_clipboard_selection=Copy selection to clipboard`
`974`	`974`
`975`	`975`	`settings_hotkey_slider=Hotkey for toggling side slider`
`976`	`976`
`977`		`-`
	`977`	`+theme_git_update_locked=Theme update cannot be completed due to no connection to GitHub or its API rate limit excess. For latter, unauthenticated requests, the rate limit allows for up to 60 requests per hour. Try again later or use console to do it manually via update script.`
Original file line number	Diff line number	Diff line change
`@@ -966,4 +966,4 @@ theme_xhred_filemanager_context_clipboard_selection=Copy selection to clipboard`
`966`	`966`
`967`	`967`	`settings_hotkey_slider=Hotkey for toggling side slider`
`968`	`968`
`969`		`-`
	`969`	`+theme_git_update_locked=Theme update cannot be completed due to no connection to GitHub or its API rate limit excess. For latter, unauthenticated requests, the rate limit allows for up to 60 requests per hour. Try again later or use console to do it manually via update script.`
Original file line number	Diff line number	Diff line change
`@@ -977,4 +977,4 @@ theme_xhred_filemanager_context_clipboard_selection=Copy selection to clipboard`
`977`	`977`
`978`	`978`	`settings_hotkey_slider=Hotkey for toggling side slider`
`979`	`979`
`980`		`-`
	`980`	`+theme_git_update_locked=Theme update cannot be completed due to no connection to GitHub or its API rate limit excess. For latter, unauthenticated requests, the rate limit allows for up to 60 requests per hour. Try again later or use console to do it manually via update script.`
Original file line number	Diff line number	Diff line change
`@@ -972,4 +972,4 @@ theme_xhred_filemanager_context_clipboard_selection=Copy selection to clipboard`
`972`	`972`
`973`	`973`	`settings_hotkey_slider=Hotkey for toggling side slider`
`974`	`974`
`975`		`-`
	`975`	`+theme_git_update_locked=Theme update cannot be completed due to no connection to GitHub or its API rate limit excess. For latter, unauthenticated requests, the rate limit allows for up to 60 requests per hour. Try again later or use console to do it manually via update script.`
Original file line number	Diff line number	Diff line change
`@@ -831,4 +831,4 @@ theme_xhred_filemanager_context_clipboard_selection=Copy selection to clipboard`
`831`	`831`
`832`	`832`	`settings_hotkey_slider=Hotkey for toggling side slider`
`833`	`833`
`834`		`-`
	`834`	`+theme_git_update_locked=Theme update cannot be completed due to no connection to GitHub or its API rate limit excess. For latter, unauthenticated requests, the rate limit allows for up to 60 requests per hour. Try again later or use console to do it manually via update script.`
Original file line number	Diff line number	Diff line change
`@@ -973,4 +973,4 @@ theme_xhred_filemanager_context_clipboard_selection=Copy selection to clipboard`
`973`	`973`
`974`	`974`	`settings_hotkey_slider=Hotkey for toggling side slider`
`975`	`975`
`976`		`-`
	`976`	`+theme_git_update_locked=Theme update cannot be completed due to no connection to GitHub or its API rate limit excess. For latter, unauthenticated requests, the rate limit allows for up to 60 requests per hour. Try again later or use console to do it manually via update script.`
Original file line number	Diff line number	Diff line change
`@@ -978,4 +978,4 @@ theme_xhred_filemanager_context_clipboard_selection=Copy selection to clipboard`
`978`	`978`
`979`	`979`	`settings_hotkey_slider=Hotkey for toggling side slider`
`980`	`980`
`981`		`-`
	`981`	`+theme_git_update_locked=Theme update cannot be completed due to no connection to GitHub or its API rate limit excess. For latter, unauthenticated requests, the rate limit allows for up to 60 requests per hour. Try again later or use console to do it manually via update script.`
Original file line number	Diff line number	Diff line change
`@@ -986,4 +986,4 @@ theme_xhred_filemanager_context_clipboard_selection=Copy selection to clipboard`
`986`	`986`
`987`	`987`	`settings_hotkey_slider=Hotkey for toggling side slider`
`988`	`988`
`989`		`-`
	`989`	`+theme_git_update_locked=Theme update cannot be completed due to no connection to GitHub or its API rate limit excess. For latter, unauthenticated requests, the rate limit allows for up to 60 requests per hour. Try again later or use console to do it manually via update script.`
Original file line number	Diff line number	Diff line change
`@@ -972,3 +972,4 @@ theme_xhred_filemanager_context_clipboard_selection=Copy selection to clipboard`
`972`	`972`
`973`	`973`	`settings_hotkey_slider=Hotkey for toggling side slider`
`974`	`974`
	`975`	`+theme_git_update_locked=Theme update cannot be completed due to no connection to GitHub or its API rate limit excess. For latter, unauthenticated requests, the rate limit allows for up to 60 requests per hour. Try again later or use console to do it manually via update script.`