Browse Source

Add sessions count and extend timeout for new AJAX version checker - refs #6216

Yannick Warnier 11 năm trước cách đây
mục cha
commit
3b6b153344
2 tập tin đã thay đổi với 7 bổ sung138 xóa
  1. 2 137
      main/admin/index.php
  2. 5 1
      main/inc/ajax/admin.ajax.php

+ 2 - 137
main/admin/index.php

@@ -307,6 +307,7 @@ $admin_ajax_url = api_get_path(WEB_AJAX_PATH).'admin.ajax.php';
 $tpl = new Template();
 $tpl->assign('web_admin_ajax_url', $admin_ajax_url);
 $tpl->assign('blocks', $blocks);
+// The template contains the call to the AJAX version checker
 $admin_template = $tpl->get_template('admin/settings_index.tpl');
 $content = $tpl->fetch($admin_template);
 $tpl->assign('content', $content);
@@ -334,140 +335,4 @@ function register_site() {
     // Reload the settings.
 }
 
-
-/**
- * Displays either the text for the registration or the message that the installation is (not) up to date
- *
- * @return string html code
- * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
- * @version august 2006
- * @todo have a 6monthly re-registration
- */
-function version_check() {
-    $tbl_settings = Database :: get_main_table(TABLE_MAIN_SETTINGS_CURRENT);
-    $sql = 'SELECT selected_value FROM  '.$tbl_settings.' WHERE variable="registered" ';
-    $result = Database::query($sql);
-    $row = Database::fetch_array($result, 'ASSOC');
-
-    // The site has not been registered yet.
-    $return = '';
-    if ($row['selected_value'] == 'false') {
-        $return .= get_lang('VersionCheckExplanation');
-        $return .= '<form class="well" action="'.api_get_self().'" id="VersionCheck" name="VersionCheck" method="post">';
-        $return .= '<label class="checkbox"><input type="checkbox" name="donotlistcampus" value="1" id="checkbox" />'.get_lang('HideCampusFromPublicPlatformsList');
-        $return .= '</label><button type="submit" class="btn btn-primary" name="Register" value="'.get_lang('EnableVersionCheck').'" id="register" >'.get_lang('EnableVersionCheck').'</button>';
-        $return .= '</form>';
-        check_system_version();
-    } else {
-        // site not registered. Call anyway
-        $return .= check_system_version();
-    }
-    return $return;
-}
-
-/**
- * Check if the current installation is up to date
- * The code is borrowed from phpBB and slighlty modified
- * @author The phpBB Group <support@phpbb.com> (the code)
- * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University (the modifications)
- * @author Yannick Warnier <ywarnier@beeznest.org> for the move to HTTP request
- * @copyright (C) 2001 The phpBB Group
- * @return language string with some layout (color)
- */
-function check_system_version() {
-    global $_configuration;
-    $system_version = trim($_configuration['system_version']); // the chamilo version of your installation
-
-    if (ini_get('allow_url_fopen') == 1) {
-        // The number of courses
-        $number_of_courses = Statistics::count_courses();
-
-        // The number of users
-        $number_of_users = Statistics::count_users();
-        $number_of_active_users = Statistics::count_users(null,null,null,true);
-        $number_of_sessions = Statistics::count_sessions();
-
-        $data = array(
-            'url' => api_get_path(WEB_PATH),
-            'campus' => api_get_setting('siteName'),
-            'contact' => api_get_setting('emailAdministrator'),
-            'version' => $system_version,
-            'numberofcourses' => $number_of_courses,
-            'numberofusers' => $number_of_users,
-            'numberofactiveusers' => $number_of_active_users,
-            'numberofsessions' => $number_of_sessions,
-            //The donotlistcampus setting recovery should be improved to make
-            // it true by default - this does not affect numbers counting
-            'donotlistcampus' => api_get_setting('donotlistcampus'),
-            'organisation' => api_get_setting('Institution'),
-            'language' => api_get_setting('platformLanguage'),
-            'adminname' => api_get_setting('administratorName').' '.api_get_setting('administratorSurname'),
-        );
-
-        $res = _http_request('version.chamilo.org', 80, '/version.php', $data);
-
-        if ($res != 0) {
-            $version_info = $res;
-
-            if ($system_version != $version_info) {
-                $output = '<br /><span style="color:red">' . get_lang('YourVersionNotUpToDate') . '. '.get_lang('LatestVersionIs').' <b>Chamilo '.$version_info.'</b>. '.get_lang('YourVersionIs').' <b>Chamilo '.$system_version. '</b>. '.str_replace('http://www.chamilo.org', '<a href="http://www.chamilo.org">http://www.chamilo.org</a>', get_lang('PleaseVisitOurWebsite')).'</span>';
-            } else {
-                $output = '<br /><span style="color:green">'.get_lang('VersionUpToDate').': Chamilo '.$version_info.'</span>';
-            }
-        } else {
-            $output = '<span style="color:red">' . get_lang('ImpossibleToContactVersionServerPleaseTryAgain') . '</span>';
-        }
-    } else {
-        $output = '<span style="color:red">' . get_lang('AllowurlfopenIsSetToOff') . '</span>';
-    }
-    return $output;
-}
-
-/**
- * Function to make an HTTP request through fsockopen (specialised for GET)
- * Derived from Jeremy Saintot: http://www.php.net/manual/en/function.fsockopen.php#101872
- * @param string IP or hostname
- * @param int    Target port
- * @param string URI (defaults to '/')
- * @param array  GET data
- * @param float  Timeout
- * @param bool   Include HTTP Request headers?
- * @param bool   Include HTTP Response headers?
- */
-function _http_request($ip, $port = 80, $uri = '/', $getdata = array(), $timeout = 1, $req_hdr = false, $res_hdr = false) {
-    $verb = 'GET';
-    $ret = '';
-    $getdata_str = count($getdata) ? '?' : '';
-
-    foreach ($getdata as $k => $v) {
-                $getdata_str .= urlencode($k) .'='. urlencode($v) . '&';
-    }
-
-    $crlf = "\r\n";
-    $req = $verb .' '. $uri . $getdata_str .' HTTP/1.1' . $crlf;
-    $req .= 'Host: '. $ip . $crlf;
-    $req .= 'User-Agent: Mozilla/5.0 Firefox/3.6.12' . $crlf;
-    $req .= 'Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8' . $crlf;
-    $req .= 'Accept-Language: en-us,en;q=0.5' . $crlf;
-    $req .= 'Accept-Encoding: deflate' . $crlf;
-    $req .= 'Accept-Charset: utf-8;q=0.7,*;q=0.7' . $crlf;
-
-    $req .= $crlf;
-
-    if ($req_hdr) { $ret .= $req; }
-    if (($fp = @fsockopen($ip, $port, $errno, $errstr, $timeout)) == false) {
-        return "Error $errno: $errstr\n";
-    }
-
-    stream_set_timeout($fp, $timeout);
-    $r = @fwrite($fp, $req);
-    $line = @fread($fp,512);
-    $ret .= $line;
-    fclose($fp);
-
-    if (!$res_hdr) {
-        $ret = substr($ret, strpos($ret, "\r\n\r\n") + 4);
-    }
-
-    return trim($ret);
-}
+// Note: version checking mechanism has now been moved to main/inc/ajax/admin.ajax.php

+ 5 - 1
main/inc/ajax/admin.ajax.php

@@ -91,6 +91,9 @@ function check_system_version()
         $number_of_users = Statistics::count_users();
         $number_of_active_users = Statistics::count_users(null, null, null, true);
 
+        // The number of sessions
+        $number_of_sessions = Statistics::count_sessions();
+
         $data = array(
             'url' => api_get_path(WEB_PATH),
             'campus' => api_get_setting('siteName'),
@@ -99,6 +102,7 @@ function check_system_version()
             'numberofcourses' => $number_of_courses,
             'numberofusers' => $number_of_users,
             'numberofactiveusers' => $number_of_active_users,
+            'numberofsessions' => $number_of_sessions,
             //The donotlistcampus setting recovery should be improved to make
             // it true by default - this does not affect numbers counting
             'donotlistcampus' => api_get_setting('donotlistcampus'),
@@ -137,7 +141,7 @@ function check_system_version()
  * @param bool   Include HTTP Request headers?
  * @param bool   Include HTTP Response headers?
  */
-function _http_request($ip, $port = 80, $uri = '/', $getdata = array(), $timeout = 1, $req_hdr = false, $res_hdr = false)
+function _http_request($ip, $port = 80, $uri = '/', $getdata = array(), $timeout = 5, $req_hdr = false, $res_hdr = false)
 {
     $verb = 'GET';
     $ret = '';