From c68119025dc24f20e5709f68fa10d2ceca89dcd5 Mon Sep 17 00:00:00 2001 From: Yannick Warnier Date: Fri, 15 Jan 2010 20:24:31 -0500 Subject: [PATCH] Added error message when cannot contact version server --- main/admin/index.php | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/main/admin/index.php b/main/admin/index.php index b5cd851273..07c75c85f5 100755 --- a/main/admin/index.php +++ b/main/admin/index.php @@ -400,15 +400,19 @@ function check_dokeos_version2() $version_url= 'http://version.chamilo.org/version.php?url='.urlencode(api_get_path(WEB_PATH)).'&campus='.urlencode(api_get_setting('siteName')).'&contact='.urlencode(api_get_setting('emailAdministrator')).'&version='.urlencode($dokeos_version).'&numberofcourses='.urlencode($number_of_courses).'&numberofusers='.urlencode($number_of_users).'&donotlistcampus='.api_get_setting('donotlistcampus').'&organisation='.urlencode(api_get_setting('Institution')).'&adminname='.urlencode(api_get_setting('administratorName').' '.api_get_setting('administratorSurname')); $handle=@fopen($version_url,'r'); - $version_info=trim(@fread($handle, 1024)); - - if ($dokeos_version<>$version_info) - { - $output='
' . get_lang('YourVersionNotUpToDate') . '. '.get_lang('LatestVersionIs').' Dokeos '.$version_info.'. '.get_lang('YourVersionIs').' Dokeos '.$dokeos_version. '. '.str_replace('http://www.dokeos.com','http://www.dokeos.com',get_lang('PleaseVisitDokeos')).''; - } - else - { - $output = '
'.get_lang('VersionUpToDate').': Dokeos '.$version_info.''; + if ($handle !== false) { + $version_info=trim(@fread($handle, 1024)); + + if ($dokeos_version<>$version_info) + { + $output='
' . get_lang('YourVersionNotUpToDate') . '. '.get_lang('LatestVersionIs').' Dokeos '.$version_info.'. '.get_lang('YourVersionIs').' Dokeos '.$dokeos_version. '. '.str_replace('http://www.dokeos.com','http://www.dokeos.com',get_lang('PleaseVisitDokeos')).''; + } + else + { + $output = '
'.get_lang('VersionUpToDate').': Dokeos '.$version_info.''; + } + } else { + $output = '' . get_lang('ImpossibleToContactVersionServerPleaseTryAgain') . ''; } } else