Merge

main/document/upload.php

@@ -1,26 +1,5 @@
 <?php // $Id: upload.php 22201 2009-07-17 19:57:03Z cfasanando $
-/*
-==============================================================================
-	Dokeos - elearning and course management software
-
-	Copyright (c) 2004-2005 Dokeos S.A.
-	Copyright (c) 2003 Ghent University (UGent)
-	Copyright (c) 2001 Universite catholique de Louvain (UCL)
-	Copyright (c) various contributors
-
-	For a full list of contributors, see "credits.txt".
-	The full license can be read in "license.txt".
-
-	This program is free software; you can redistribute it and/or
-	modify it under the terms of the GNU General Public License
-	as published by the Free Software Foundation; either version 2
-	of the License, or (at your option) any later version.
-
-	See the GNU General Public License for more details.
-
-	Contact: Dokeos, 181 rue Royale, B-1000 Brussels, Belgium, info@dokeos.com
-==============================================================================
-*/
+/* For licensing terms, see /chamilo_license.txt */
 /**
 ==============================================================================
 * Main script for the documents tool
@@ -545,16 +524,10 @@ echo(build_directory_selector($folders,$path,$group_properties['directory']));
 <?php
 
 $form = new FormValidator('upload','POST',api_get_self(),'','enctype="multipart/form-data"');
-
-// form title
-$form->addElement('header', '', $nameTools);
-
 $form->addElement('hidden','curdirpath',$path);
-
 $form->addElement('file','user_upload',get_lang('File'),'id="user_upload" size="45"');
 
-if(api_get_setting('use_document_title')=='true')
-{
+if(api_get_setting('use_document_title')=='true') {
 	$form->addElement('text','title',get_lang('Title'),array('size'=>'20','style' => 'width:300px','id' => 'title_file'));
 	$form->addElement('textarea','comment',get_lang('Comment'),'wrap="virtual" style="width:300px;"');
 }

main/social/groups.php

@@ -397,6 +397,8 @@ if ($group_id != 0 ) {
 		// Pop groups -----		
 		$results = GroupPortalManager::get_groups_by_popularity(4,false);
 		$grid_pop_groups = array();
+		
+		if (is_array($results) && count($results) > 0) {
 			foreach ($results as $result) {
 				$id = $result['id'];
 				$url_open  = '<a href="groups.php?id='.$id.'">';
@@ -425,9 +427,8 @@ if ($group_id != 0 ) {
 					
 				$item_4 = '<div class="box_description_group_actions" >'.$url_open.get_lang('SeeMore').$url_close.'</div>';			
 				$grid_item_2 = $item_1.$item_2.$item_3.$item_4;							
-						
 				$grid_pop_groups[]= array($grid_item_1,$grid_item_2);							
-						
+			}
 		}
 
 		// display groups (newest, mygroups, pop)
@@ -436,8 +437,8 @@ if ($group_id != 0 ) {
 		   		$view_group = $_GET['view'];
 		   		switch ($view_group) {
 		   			case 'mygroups' :		   			                  
-		   				echo '<div class="social-groups-text3">'.api_strtoupper(get_lang('MyGroups')).'</div>';                  
 		        		if (count($grid_my_groups) > 0) {
+		        			echo '<div class="social-groups-text3">'.api_strtoupper(get_lang('MyGroups')).'</div>';
 		        			Display::display_sortable_grid('mygroups', array(), $grid_my_groups, array('hide_navigation'=>true, 'per_page' => 2), $query_vars, false, array(true, true, true,false));
 		        		}
 		        		break;
@@ -455,8 +456,8 @@ if ($group_id != 0 ) {
 		        		break;					 
 		   		}		   		
 		   	} else {		   		                  
-		   		echo '<div class="social-groups-text3">'.api_strtoupper(get_lang('MyGroups')).'</div>';                  
 		        if (count($grid_my_groups) > 0) {
+		        	echo '<div class="social-groups-text3">'.api_strtoupper(get_lang('MyGroups')).'</div>';
 		        	Display::display_sortable_grid('mygroups', array(), $grid_my_groups, array('hide_navigation'=>true, 'per_page' => 2), $query_vars, false, array(true, true, true,false));
 		        }		        	        	                 		
 				if (count($grid_newest_groups) > 0) {