fixes #2789 - no internet connectivity check if there is non on purpose

This commit is contained in:
Thomas Mueller 2013-04-08 22:41:20 +02:00
parent ccde0212b1
commit 46722d8282
2 changed files with 9 additions and 1 deletions

View File

@ -126,7 +126,10 @@ $CONFIG = array(
/* Check if ownCloud is up to date */
"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",
/* File for the owncloud logger to log to, (default is ownloud.log in the data dir */

View File

@ -635,6 +635,11 @@ class OC_Util {
*/
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.
$connected = @fsockopen("www.owncloud.org", 80);
if ($connected) {