From dd485c16d49362695cebbdd4e2dbba09f74578c4 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Tue, 27 Dec 2011 15:01:11 +0100
Subject: [PATCH] Adding hot courses block (partial) see #4200

---
 index.php                                     |  3 ++
 main/css/base.css                             | 11 +++--
 main/inc/ajax/course_home.ajax.php            | 12 ++++--
 main/inc/lib/course.lib.php                   | 43 +++++++++++++++----
 main/inc/lib/database.lib.php                 |  2 +-
 main/inc/lib/userportal.lib.php               |  6 +--
 main/inc/local.inc.php                        |  4 +-
 .../default/auth/courses_categories.php       | 26 +++++------
 main/template/default/layout/head.tpl         | 26 ++++++++++-
 main/template/default/layout/layout_2_col.tpl | 20 +++++++--
 user_portal.php                               |  4 +-
 11 files changed, 116 insertions(+), 41 deletions(-)

diff --git a/index.php b/index.php
index 0dca4ef031..d6c16d6e68 100644
--- a/index.php
+++ b/index.php
@@ -26,6 +26,7 @@ if (!api_is_anonymous()) {
 	$header_title = " ";
 }
 
+$htmlHeadXtra[] = api_get_jquery_ui_js();
 $htmlHeadXtra[] = api_get_jquery_libraries_js(array('bxslider'));
 $htmlHeadXtra[] ='
 <script type="text/javascript">
@@ -181,6 +182,8 @@ if (!api_is_anonymous()) {
 	}
 }
 
+$controller->tpl->assign('hot_courses',             $controller->return_hot_courses());
+
 $controller->tpl->assign('announcements_block', 	$controller->return_announcements());
 $controller->tpl->assign('home_page_block', 		$controller->return_home_page());
 $controller->tpl->assign('notice_block',			$controller->return_notice());
diff --git a/main/css/base.css b/main/css/base.css
index ae3749525e..1e7cf3c256 100644
--- a/main/css/base.css
+++ b/main/css/base.css
@@ -1810,8 +1810,8 @@ button:hover {
     float:left;
     margin:10px;
     padding:12px;
-    width:250px;
-    min-height:294px;
+    width:95%;
+    /* min-height:294px; */
     color: #BBBBBB; 
 }
 
@@ -1843,10 +1843,15 @@ button:hover {
 }
 
 .categories-course-description {
-    margin-left:10px;
+    margin-left:18px;
     font-family:arial;
     font-size:11px;
     margin-bottom: 10px;
+	float:left;
+}
+
+.categories-course-links div {
+	padding-left:10px;
 }
 
 .categories-course-description .course-block-title {
diff --git a/main/inc/ajax/course_home.ajax.php b/main/inc/ajax/course_home.ajax.php
index 0f5d5d9ee7..6569531aff 100644
--- a/main/inc/ajax/course_home.ajax.php
+++ b/main/inc/ajax/course_home.ajax.php
@@ -71,16 +71,20 @@ switch ($action) {
 	case 'show_course_information' :
 	
 		$language_file = array('course_description');
-		require_once '../global.inc.php';			
-        if (api_is_anonymous()) {
-            exit;
-        }		
+		require_once '../global.inc.php';
 		
 		// Get the name of the database course.		
 		$tbl_course_description = Database::get_course_table(TABLE_COURSE_DESCRIPTION);
 		
 		$course_info = api_get_course_info($_GET['code']);
 		
+		if ($course_info['visibility'] != COURSE_VISIBILITY_OPEN_WORLD) {
+			if (api_is_anonymous()) {
+				exit;
+			}		
+		}
+		
+		
 		echo Display::tag('h2', $course_info['name']);
 		echo '<br />';
 	
diff --git a/main/inc/lib/course.lib.php b/main/inc/lib/course.lib.php
index 8b7c50ab1f..4e612cb619 100644
--- a/main/inc/lib/course.lib.php
+++ b/main/inc/lib/course.lib.php
@@ -3591,15 +3591,40 @@ class CourseManager {
             Database::delete($table_user_course_vote, array('c_id = ? AND session_id = ? AND url_id = ?' => $params));
         }
     }
-    
-    function return_hot_courses($limit = 5) {
-        $table_course_ranking       = Database::get_main_table(TABLE_STATISTIC_TRACK_COURSE_RANKING);        
-        $params['url_id'] = api_get_current_access_url_id();
+	
+	//Stats functions
+    
+    function return_hot_courses($days = 30, $limit = 5) {
+		$limit  = intval($limit);
+        $table_course_access	= Database::get_main_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS);                
+		$today					= api_get_utc_datetime();
+		$today_diff				= time() -intval($days)*24*60*60;
+		$today_diff				= api_get_utc_datetime($today_diff);
+		//WHERE login_course_date <= '$today' AND login_course_date >= '$today_diff'
+		
+		//$table_course_access table uses the now() and interval ... 
+		
+        $sql = "SELECT COUNT(course_access_id) course_count, course_code FROM $table_course_access 
+				WHERE login_course_date <= now() AND login_course_date > DATE_SUB(now(), INTERVAL $days DAY)
+				GROUP BY course_code
+				ORDER BY course_count DESC 
+				LIMIT $limit";
+		$result = Database::query($sql);
+		$courses = array();
+		if (Database::num_rows($result)) {
+			$courses = Database::store_result($result, 'ASSOC');
+			foreach ($courses as &$my_course) {
+				$my_course['extra_info'] = api_get_course_info($my_course['course_code']);				
+			}
+		}		
+		return $courses;
+    }
+	
+	function return_most_accessed_courses($limit = 5) {
+		$table_course_ranking	= Database::get_main_table(TABLE_STATISTIC_TRACK_COURSE_RANKING);        
+        $params['url_id']		= api_get_current_access_url_id();
         
-        $result = Database::select('c_id, accesses, points, users', $table_course_ranking, array('where' => array('url_id = ?' => $params), 'order' => array('accesses DESC, users DESC, points DESC'), 'limit' => $limit), 'all', true);
+        $result = Database::select('c_id, accesses, points, users', $table_course_ranking, array('where' => array('url_id = ?' => $params), 'order' => array('accesses DESC'), 'limit' => $limit), 'all', true);
         return $result;
-        
-    }
-
-    
+	}    
 } //end class CourseManager
\ No newline at end of file
diff --git a/main/inc/lib/database.lib.php b/main/inc/lib/database.lib.php
index 8b72165ede..c3af22e4fa 100644
--- a/main/inc/lib/database.lib.php
+++ b/main/inc/lib/database.lib.php
@@ -1154,7 +1154,7 @@ class Database {
      * @todo known issues, it doesn't work when using LIKE conditions example: array('where'=>array('course_code LIKE "?%"'))
     */
 
-    public static function select($columns = '*' , $table_name,  $conditions = array(), $type_result = 'all', $option = 'ASSOC') {
+    public static function select($columns, $table_name,  $conditions = array(), $type_result = 'all', $option = 'ASSOC') {
         $conditions = self::parse_conditions($conditions);
         
         //@todo we could do a describe here to check the columns ...
diff --git a/main/inc/lib/userportal.lib.php b/main/inc/lib/userportal.lib.php
index baf212448a..0ae2ab8fe6 100644
--- a/main/inc/lib/userportal.lib.php
+++ b/main/inc/lib/userportal.lib.php
@@ -1325,7 +1325,7 @@ class IndexManager {
 		}
 	}
 
-        function return_hot_courses() {
-            return CourseManager::return_hot_courses();
-        }
+	function return_hot_courses() {
+		return CourseManager::return_hot_courses();		
+	}
 }
diff --git a/main/inc/local.inc.php b/main/inc/local.inc.php
index 33749b6058..222e8a7388 100644
--- a/main/inc/local.inc.php
+++ b/main/inc/local.inc.php
@@ -928,7 +928,7 @@ if ((isset($uidReset) && $uidReset) || (isset($cidReset) && $cidReset)) { // ses
 				$result = Database::query($sql);
                 $row 	= Database::store_result($result);
            
-                if (isset($row) && $row[0]['id_coach'] == $_user['user_id']) {
+                if (isset($row) && isset($row[0]) && $row[0]['id_coach'] == $_user['user_id']) {
 					$_courseUser['role'] = 'Professor';
 	                $is_courseMember     = true;
 	                $is_courseTutor      = true;
@@ -941,7 +941,7 @@ if ((isset($uidReset) && $uidReset) || (isset($cidReset) && $cidReset)) { // ses
 	                	$is_courseAdmin = false;
 					}
 					api_session_register('_courseUser');
-	            } elseif(isset($row) && $row[0]['session_admin_id']==$_user['user_id']) { 
+	            } elseif( isset($row) && isset($row[0]) && $row[0]['session_admin_id']==$_user['user_id']) { 
 					$_courseUser['role'] = 'Professor';
 	                $is_courseMember     = false;
 	                $is_courseTutor      = false;
diff --git a/main/template/default/auth/courses_categories.php b/main/template/default/auth/courses_categories.php
index 2e8e59cf86..e03412d31e 100644
--- a/main/template/default/auth/courses_categories.php
+++ b/main/template/default/auth/courses_categories.php
@@ -163,13 +163,7 @@ $stok = Security::get_token();
                 //<div class="course-block-main-item"><div class="left">'.get_lang('Teacher').'</div><div class="course-block-teacher right">'.$tutor_name.'</div></div>
                 //<div class="course-block-main-item"><div class="left">'.get_lang('CreationDate').'</div><div class="course-block-date">'.api_format_date($creation_date,DATE_FORMAT_SHORT).'</div></div>
                 echo '<div class="categories-block-course">
-                        <div class="categories-content-course">
-                            <div class="categories-course-description">
-                                <div class="course-block-title">'.cut($title, 60).'</div>
-                                '.$rating.'        
-                                
-                                
-                            </div>';
+                        <div class="categories-content-course">';
                 
                 echo '<div class="categories-course-picture"><center>';
                 if (api_get_setting('show_courses_descriptions_in_catalog') == 'true') {
@@ -178,18 +172,24 @@ $stok = Security::get_token();
                     echo '</a>';
                 } else {
                     echo '<img src="'.$course_medium_image.'" />';
-                }
-                
-                echo '</center>
-                            </div>
-                            <div class="course-block-popularity"><span>'.get_lang('ConnectionsLastMonth').'</span><div class="course-block-popularity-score">'.$count_connections.'</div></div>';
+                }                
+                echo '</center></div>';
+				
+				
+				echo '<div class="categories-course-description">
+						<div class="course-block-title">'.cut($title, 60).'</div>
+						'.$rating.'
+					 </div>';
+				
+				echo '<div class="course-block-popularity"><span>'.get_lang('ConnectionsLastMonth').'</span><div class="course-block-popularity-score">'.$count_connections.'</div></div>';
                 echo '</div>';
                 
                 echo '<div class="categories-course-links">';
                     // we display the icon to subscribe or the text already subscribed
                     if (!in_array($course['code'], $user_coursecodes)) {
                         if ($course['subscribe'] == SUBSCRIBE_ALLOWED) {
-                            echo '<div class="course-link-desc left"><a class="a_button orange medium" href="'. api_get_self().'?action=subscribe_course&amp;sec_token='.$stok.'&amp;subscribe_course='.$course['code'].'&amp;search_term='.$search_term.'&amp;category_code='.$code.'">'.get_lang('Subscribe').'</a></div>';
+                            echo '<div class="course-link-desc right">
+								<a class="a_button gray small" href="'. api_get_self().'?action=subscribe_course&amp;sec_token='.$stok.'&amp;subscribe_course='.$course['code'].'&amp;search_term='.$search_term.'&amp;category_code='.$code.'">'.get_lang('Subscribe').'</a></div>';
                         }
                     }
                     if (api_get_setting('show_courses_descriptions_in_catalog') == 'true') {
diff --git a/main/template/default/layout/head.tpl b/main/template/default/layout/head.tpl
index 2bff92e8a8..888f512651 100644
--- a/main/template/default/layout/head.tpl
+++ b/main/template/default/layout/head.tpl
@@ -46,8 +46,30 @@ if ( ( navigator.userAgent.toLowerCase().indexOf('msie') != -1 ) && ( navigator.
 {$favico}
 
 <script type="text/javascript">
-$(document).ready(function(){	
-	$('.topbar').dropdown();	
+$(document).ready(function(){
+	$('.topbar').dropdown();
+
+	$('.ajax').live('click', function() {
+		var url     = this.href;
+		var dialog  = $("#dialog");
+		if ($("#dialog").length == 0) {
+			dialog  = $('<div id="dialog" style="display:hidden"></div>').appendTo('body');
+		}
+
+		// load remote content
+		dialog.load(
+				url,                    
+				{},
+				function(responseText, textStatus, XMLHttpRequest) {
+					dialog.dialog({
+						modal	: true, 
+						width	: 540, 
+						height	: 400,              
+					});	                    
+		});
+		//prevent the browser to follow the link
+		return false;
+	});
 });
 </script>
 
diff --git a/main/template/default/layout/layout_2_col.tpl b/main/template/default/layout/layout_2_col.tpl
index d6c992edeb..62f5b2705d 100644
--- a/main/template/default/layout/layout_2_col.tpl
+++ b/main/template/default/layout/layout_2_col.tpl
@@ -18,11 +18,25 @@
 		{$announcements_block}
 
                 {if !(empty($hot_courses)) }	
-                     <h3>Hottest courses</h3>
-                    {foreach $hot_courses as $hot_course}
+                     <h3>{"HottestCourses"|get_lang}</h3>
+                    {foreach $hot_courses as $hot_course}						
                         <div class="categories-block-course">
                             <div class="categories-content-course">
-                                Course id: {$hot_course.c_id}
+                                <h4>{$hot_course.extra_info.name}</h4>								
+								{"Visits"|get_lang} : {$hot_course.course_count}
+								
+								{if ($hot_course.extra_info.visibility == 3)} 
+									<a class="ajax a_button white small" title="" href="{'WEB_AJAX_PATH'|get_path}course_home.ajax.php?a=show_course_information&code={$hot_course.course_code}">
+										{"Description"|get_lang}
+									</a>
+								{/if}								
+								
+								{* World *}
+								{if ($hot_course.extra_info.visibility == 3)}
+								 <a class="a_button gray small" title="" href="{'WEB_COURSE_PATH'|get_path}{$hot_course.extra_info.path}/index.php">
+										{"GoToCourse"|get_lang}
+									</a>
+								{/if}								
                             </div>
                         </div>
                     {/foreach}
diff --git a/user_portal.php b/user_portal.php
index 9b1fd44a7b..c2bd0622b1 100644
--- a/user_portal.php
+++ b/user_portal.php
@@ -35,6 +35,8 @@ if (isset($_SESSION['this_section']))
 require_once './main/inc/global.inc.php';
 require_once api_get_path(LIBRARY_PATH).'userportal.lib.php';
 
+$htmlHeadXtra[] = api_get_jquery_ui_js();
+
 api_block_anonymous_users(); // Only users who are logged in can proceed.
 
 /* Constants and CONFIGURATION parameters */
@@ -226,7 +228,7 @@ if (stripos("flash_yes", $_SESSION['sniff_check_some_activex'])===0 || stripos("
 	//$controller->tpl->assign('sniff_notification',  $sniff_notification);
 }    
 
-$controller->tpl->assign('hot_courses',                 $controller->return_hot_courses());
+//$controller->tpl->assign('hot_courses',                 $controller->return_hot_courses());
 
 $controller->tpl->assign('plugin_courses_block', 		$controller->return_courses_main_plugin());
 $controller->tpl->assign('profile_block', 				$controller->return_profile_block());