chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Hiding \"My production images\" title from social network if it's empty

Browse Source
skala
Julio Montoya 16 years ago
parent 33e634b36a
commit b098d8a0db
2 changed files with 28 additions and 26 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 43
      main/inc/lib/usermanager.lib.php
  2. 11
      main/social/profile.php

43
main/inc/lib/usermanager.lib.php
Unescape View File

@ -1,11 +1,11 @@
<?php // $Id: usermanager.lib.php 22378 2009-07-26 19:58:38Z yannoo $ <?php
/* For licensing terms, see /dokeos_license.txt */ /* For licensing terms, see /license.txt */
/** /**
============================================================================== ==============================================================================
* This library provides functions for user management. * This library provides functions for user management.
* Include/require it in your code to use its functionality. * Include/require it in your code to use its functionality.
* *
* @package dokeos.library * @package chamilo.library
* @author Julio Montoya <gugli100@gmail.com> Social network groups added 2009/12 * @author Julio Montoya <gugli100@gmail.com> Social network groups added 2009/12
============================================================================== ==============================================================================
*/ */
@ -100,22 +100,22 @@ class UserManager
//$password = ($userPasswordCrypted ? md5($password) : $password); //$password = ($userPasswordCrypted ? md5($password) : $password);
$current_date = date('Y-m-d H:i:s', time()); $current_date = date('Y-m-d H:i:s', time());
$sql = "INSERT INTO $table_user $sql = "INSERT INTO $table_user
SET lastname = '".Database::escape_string(trim($lastName))."', SET lastname = '".Database::escape_string(trim($lastName))."',
firstname = '".Database::escape_string(trim($firstName))."', firstname = '".Database::escape_string(trim($firstName))."',
username = '".Database::escape_string(trim($loginName))."', username = '".Database::escape_string(trim($loginName))."',
status = '".Database::escape_string($status)."', status = '".Database::escape_string($status)."',
password = '".Database::escape_string($password)."', password = '".Database::escape_string($password)."',
email = '".Database::escape_string($email)."', email = '".Database::escape_string($email)."',
official_code = '".Database::escape_string($official_code)."', official_code = '".Database::escape_string($official_code)."',
picture_uri = '".Database::escape_string($picture_uri)."', picture_uri = '".Database::escape_string($picture_uri)."',
creator_id = '".Database::escape_string($creator_id)."', creator_id = '".Database::escape_string($creator_id)."',
auth_source = '".Database::escape_string($auth_source)."', auth_source = '".Database::escape_string($auth_source)."',
phone = '".Database::escape_string($phone)."', phone = '".Database::escape_string($phone)."',
language = '".Database::escape_string($language)."', language = '".Database::escape_string($language)."',
registration_date = '".$current_date."', registration_date = '".$current_date."',
expiration_date = '".Database::escape_string($expiration_date)."', expiration_date = '".Database::escape_string($expiration_date)."',
hr_dept_id = '".Database::escape_string($hr_dept_id)."', hr_dept_id = '".Database::escape_string($hr_dept_id)."',
active = '".Database::escape_string($active)."'"; active = '".Database::escape_string($active)."'";
$result = Database::query($sql); $result = Database::query($sql);
if ($result) { if ($result) {
//echo "id returned"; //echo "id returned";
@ -1960,10 +1960,9 @@ class UserManager
* Get the users files upload from his share_folder * Get the users files upload from his share_folder
* @param string User ID * @param string User ID
* @param string course directory * @param string course directory
* @param int deprecated
* @return int User ID (or false if not found) * @return int User ID (or false if not found)
*/ */
public static function get_user_upload_files_by_course($user_id, $course, $column = 2) { public static function get_user_upload_files_by_course($user_id, $course) {
$return = ''; $return = '';
if (!empty($user_id) && !empty($course)) { if (!empty($user_id) && !empty($course)) {
$user_id = intval($user_id); $user_id = intval($user_id);
@ -1986,7 +1985,9 @@ class UserManager
foreach ($file_list as $file) { foreach ($file_list as $file) {
$return .= '<li><a href="'.$web_path.urlencode($file).'" target="_blank">'.htmlentities($file).'</a>'; $return .= '<li><a href="'.$web_path.urlencode($file).'" target="_blank">'.htmlentities($file).'</a>';
} }
$return .= '</ul>'; if (count($file_list) > 0) {
$return .= '</ul>';
}
} }
} }
return $return; return $return;

11
main/social/profile.php
Unescape View File

@ -1,10 +1,10 @@
<?php //$id: $ <?php //$id: $
/* For licensing terms, see /dokeos_license.txt */ /* For licensing terms, see /license.txt */
/** /**
* This is the profile social main page * This is the profile social main page
* @author Julio Montoya <gugli100@gmail.com> * @author Julio Montoya <gugli100@gmail.com>
* @author Isaac Flores Paz <florespaz_isaac@hotmail.com> * @author Isaac Flores Paz <florespaz_isaac@hotmail.com>
* @package dokeos.social * @package chamilo.social
*/ */
$language_file = array('userInfo'); $language_file = array('userInfo');
@ -516,6 +516,7 @@ echo '<div id="social-content-right">';
} }
// COURSES LIST // COURSES LIST
if ($show_full_profile) { if ($show_full_profile) {
if ( is_array($list) ) { if ( is_array($list) ) {
echo '<div class="social-box-main1">'; echo '<div class="social-box-main1">';
@ -530,9 +531,7 @@ echo '<div id="social-content-right">';
foreach($list as $key=>$value) { foreach($list as $key=>$value) {
if ( empty($value[2]) ) { //if out of any session if ( empty($value[2]) ) { //if out of any session
echo $value[1]; echo $value[1];
//echo '<div id="loading'.$i.'">&nbsp;</div>'; echo '<div id="social_content'.$i.'" style="background : #EFEFEF; padding:0px; ">';
//class="social-profile-rounded maincourse"
echo '<div id="social_content'.$i.'" style="background : #EFEFEF; padding:0px; ">';
echo '</div>'; echo '</div>';
$i++; $i++;
} }
@ -545,6 +544,7 @@ echo '<div id="social-content-right">';
$listInactives[] = $value; $listInactives[] = $value;
} }
} }
echo '</div>';
echo '</div>'; echo '</div>';
echo '</div>'; echo '</div>';
echo '</div>'; echo '</div>';
@ -624,6 +624,7 @@ echo '<div id="social-content-right">';
echo '</div>'; echo '</div>';
} }
// Images uploaded by course // Images uploaded by course
if (!empty($file_list)) { if (!empty($file_list)) {
echo '<div><h3>'.get_lang('ImagesUploaded').'</h3></div>'; echo '<div><h3>'.get_lang('ImagesUploaded').'</h3></div>';
echo '<div class="social-content-information">'; echo '<div class="social-content-information">';

Write Preview
Loading…
Cancel
Save