Fixing version check via ajax see #6216

main/admin/index.php

@@ -295,9 +295,11 @@ if (api_is_platform_admin()) {
     //Version check
     $blocks['version_check']['icon']  = Display::return_icon('logo.png', 'Chamilo.org', array(), ICON_SIZE_SMALL, false);
 	$blocks['version_check']['label'] = get_lang('VersionCheck');
-	//$blocks['version_check']['extra'] = version_check();
+	$blocks['version_check']['extra'] = '<div class="admin-block-version"></div>';
     $blocks['version_check']['search_form'] = null;
     $blocks['version_check']['items'] = null;
+    //$blocks['version_check']['class'] = '';
+
 }
 $admin_ajax_url = api_get_path(WEB_AJAX_PATH).'admin.ajax.php';
 
@@ -310,8 +312,6 @@ $tpl->assign('content', $content);
 $tpl->assign('message', $message);
 $tpl->display_one_col_template();
 
-
-
 /**
  * This setting changes the registration status for the campus
  *
@@ -324,11 +324,11 @@ function register_site() {
     $tbl_settings = Database :: get_main_table(TABLE_MAIN_SETTINGS_CURRENT);
 
     $sql = "UPDATE $tbl_settings SET selected_value='true' WHERE variable='registered'";
-    $result = Database::query($sql);
+    Database::query($sql);
 
     if ($_POST['donotlistcampus']) {
         $sql = "UPDATE $tbl_settings SET selected_value='true' WHERE variable='donotlistcampus'";
-        $result = Database::query($sql);
+        Database::query($sql);
     }
     // Reload the settings.
 }

main/inc/ajax/admin.ajax.php

@@ -42,12 +42,12 @@ switch ($action) {
  * @return string html code
  * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
  * @version august 2006
- * @todo have a 6monthly re-registration
+ * @todo have a 6 monthly 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" ';
+    $sql = 'SELECT selected_value FROM '.$tbl_settings.' WHERE variable = "registered" ';
     $result = Database::query($sql);
     $row = Database::fetch_array($result, 'ASSOC');
 
@@ -55,7 +55,7 @@ function version_check()
     $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 .= '<form class="well" action="'.api_get_path(WEB_CODE_PATH).'admin/index.php" 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>';

main/template/default/admin/settings_index.tpl

@@ -1,64 +1,42 @@
 <script>
 $(document).ready(function() {
-    $.ajax({    
-        url:'{{web_admin_ajax_url}}?a=version',
+    $.ajax({
+        url:'{{ web_admin_ajax_url }}?a=version',
         success:function(version){
             $(".admin-block-version").html(version);
-        } 
+        }
     });
-});    
+});
 </script>
 
 <div id="settings">
-    <!--
-    <ul>
-        <li><a href="#tabs-1">Users</a></li>
-        <li><a href="#tabs-2">Courses</a></li>
-        <li><a href="#tabs-3">Platform</a></li>
-        <li><a href="#tabs-4">Aenean lacinia</a></li>
-        <li><a href="#tabs-5">Aenean lacinia</a></li>
-        <li><a href="#tabs-6">Aenean lacinia</a></li>
-        <li><a href="#tabs-7">Aenean lacinia</a></li>
-        <li><a href="#tabs-8">Aenean lacinia</a></li>        
-    </ul>
-    -->        
     <div class="row">
     {% for block_item in blocks %}
-        <div id="tabs-{{loop.index}}" class="span6">
-        {% if block_item.label == 'VersionCheck'|get_lang %}
-               <div id="tabs-{{loop.index}}" class="admin-block-version">  
-        {% endif %}  
-            <div class="well_border">
-                <h4>{{block_item.icon}} {{block_item.label}}</h4>                
+        <div id="tabs-{{ loop.index }}" class="span6">
+            <div class="well_border {{ block_item.class }}">
+                <h4>{{ block_item.icon }} {{ block_item.label }}</h4>
                 <div style="list-style-type:none">
                     {{ block_item.search_form }}
-                </div>                           
+                </div>
                 {% if block_item.items is not null %}
                     <ul>
     		    	{% for url in block_item.items %}
-    		    		<li><a href="{{url.url}}">{{ url.label }}</a></li>	    	
+    		    		<li>
+                            <a href="{{ url.url }}">
+                                {{ url.label }}
+                            </a>
+                        </li>
     				{% endfor %}
-                    </ul>    	
-                {% endif %}
-                
-                {% if block_item.label == 'VersionCheck'|get_lang %}
-                    <div class="admin-block-version"> 
-                {% endif %}
-                
-                {% if block_item.label == 'VersionCheck'|get_lang %}
-                    </div> 
+                    </ul>
                 {% endif %}
+
                 {% if block_item.extra is not null %}
                     <div>
                     {{ block_item.extra }}
                     </div>
                 {% endif %}
-                                
             </div>
-        {% if block_item.label == 'VersionCheck'|get_lang %}
-               </div>  
-        {% endif %}
-        </div>        
+        </div>
     {% endfor %}
     </div>
 </div>