Merge pull request #2798 from owncloud/fixing-2789-master
fixes #2789 - no internet connectivity check if there is non on purpose
This commit is contained in:
commit
74f90eabe4
|
@ -126,7 +126,10 @@ $CONFIG = array(
|
||||||
/* Check if ownCloud is up to date */
|
/* Check if ownCloud is up to date */
|
||||||
"updatechecker" => true,
|
"updatechecker" => true,
|
||||||
|
|
||||||
/* Place to log to, can be owncloud and syslog (owncloud is log menu item in admin menu) */
|
/* Are we connected to the internet or are we running in a closed network? */
|
||||||
|
"has_internet_connection" => true,
|
||||||
|
|
||||||
|
/* Place to log to, can be owncloud and syslog (owncloud is log menu item in admin menu) */
|
||||||
"log_type" => "owncloud",
|
"log_type" => "owncloud",
|
||||||
|
|
||||||
/* File for the owncloud logger to log to, (default is ownloud.log in the data dir */
|
/* File for the owncloud logger to log to, (default is ownloud.log in the data dir */
|
||||||
|
|
|
@ -635,6 +635,11 @@ class OC_Util {
|
||||||
*/
|
*/
|
||||||
public static function isinternetconnectionworking() {
|
public static function isinternetconnectionworking() {
|
||||||
|
|
||||||
|
// in case there is no internet connection on purpose there is no need to display a warning
|
||||||
|
if (!\OC_Config::getValue("has_internet_connection", true)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
// try to connect to owncloud.org to see if http connections to the internet are possible.
|
// try to connect to owncloud.org to see if http connections to the internet are possible.
|
||||||
$connected = @fsockopen("www.owncloud.org", 80);
|
$connected = @fsockopen("www.owncloud.org", 80);
|
||||||
if ($connected) {
|
if ($connected) {
|
||||||
|
|
Loading…
Reference in New Issue