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

Minor - format code.

Browse Source
pull/2487/head
jmontoyaa 8 years ago
parent 7eef4c88bf
commit d155b854f4
7 changed files with 26 additions and 32 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. 2
      main/inc/ajax/chat.ajax.php
  2. 4
      main/inc/ajax/message.ajax.php
  3. 2
      main/inc/lib/TicketManager.php
  4. 4
      main/inc/lib/chat.lib.php
  5. 8
      main/inc/lib/message.lib.php
  6. 36
      main/inc/lib/social.lib.php
  7. 2
      main/install/configuration.dist.php

2
main/inc/ajax/chat.ajax.php
Unescape View File

@ -16,7 +16,6 @@ if (api_get_setting('allow_global_chat') == 'false') {
if (api_is_anonymous()) { if (api_is_anonymous()) {
exit; exit;
} }
$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : null; $action = isset($_REQUEST['action']) ? $_REQUEST['action'] : null;
// Course Chat // Course Chat
@ -45,7 +44,6 @@ if ($chat->isChatBlockedByExercises()) {
$chat->setUserStatus(0); $chat->setUserStatus(0);
exit; exit;
} }
switch ($action) { switch ($action) {
case 'chatheartbeat': case 'chatheartbeat':
$chat->heartbeat(); $chat->heartbeat();

4
main/inc/ajax/message.ajax.php
Unescape View File

@ -24,7 +24,7 @@ switch ($action) {
$count_unread_message = 0; $count_unread_message = 0;
if (api_get_setting('allow_message_tool') == 'true') { if (api_get_setting('allow_message_tool') == 'true') {
// get count unread message and total invitations // get count unread message and total invitations
$count_unread_message = MessageManager::get_number_of_messages(true); $count_unread_message = MessageManager::getNumberOfMessages(true);
} }
if (api_get_setting('allow_social_tool') == 'true') { if (api_get_setting('allow_social_tool') == 'true') {
@ -44,8 +44,6 @@ switch ($action) {
} }
$total_invitations = intval($number_of_new_messages_of_friend) + $group_pending_invitations + intval($count_unread_message); $total_invitations = intval($number_of_new_messages_of_friend) + $group_pending_invitations + intval($count_unread_message);
} }
//$total_invitations = !empty($total_invitations) ? Display::badge($total_invitations) : '';
echo $total_invitations; echo $total_invitations;
break; break;
case 'send_message': case 'send_message':

2
main/inc/lib/TicketManager.php
Unescape View File

@ -1387,7 +1387,7 @@ class TicketManager
/** /**
* @return mixed * @return mixed
*/ */
public static function get_number_of_messages() public static function getNumberOfMessages()
{ {
$table_support_tickets = Database::get_main_table(TABLE_TICKET_TICKET); $table_support_tickets = Database::get_main_table(TABLE_TICKET_TICKET);
$table_support_messages = Database::get_main_table( $table_support_messages = Database::get_main_table(

4
main/inc/lib/chat.lib.php
Unescape View File

@ -106,7 +106,7 @@ class Chat extends Model
/** /**
* Starts a chat session and returns JSON array of status and chat history * Starts a chat session and returns JSON array of status and chat history
* @return void (prints output in JSON format) * @return bool (prints output in JSON format)
*/ */
public function startSession() public function startSession()
{ {
@ -119,7 +119,7 @@ class Chat extends Model
'items' => $chats 'items' => $chats
); );
echo json_encode($return); echo json_encode($return);
exit; return true;
} }
/** /**

8
main/inc/lib/message.lib.php
Unescape View File

@ -70,7 +70,7 @@ class MessageManager
* @param bool $unread * @param bool $unread
* @return int * @return int
*/ */
public static function get_number_of_messages($unread = false) public static function getNumberOfMessages($unread = false)
{ {
$table = Database::get_main_table(TABLE_MESSAGE); $table = Database::get_main_table(TABLE_MESSAGE);
if ($unread) { if ($unread) {
@ -1055,7 +1055,7 @@ class MessageManager
* @param void * @param void
* @return integer * @return integer
*/ */
public static function get_number_of_messages_sent() public static function getNumberOfMessagesSent()
{ {
$table = Database::get_main_table(TABLE_MESSAGE); $table = Database::get_main_table(TABLE_MESSAGE);
$keyword = Session::read('message_sent_search_keyword'); $keyword = Session::read('message_sent_search_keyword');
@ -1829,7 +1829,7 @@ class MessageManager
// display sortable table with messages of the current user // display sortable table with messages of the current user
$table = new SortableTable( $table = new SortableTable(
'message_inbox', 'message_inbox',
array('MessageManager', 'get_number_of_messages'), array('MessageManager', 'getNumberOfMessages'),
array('MessageManager', 'get_message_data'), array('MessageManager', 'get_message_data'),
3, 3,
20, 20,
@ -1894,7 +1894,7 @@ class MessageManager
// display sortable table with messages of the current user // display sortable table with messages of the current user
$table = new SortableTable( $table = new SortableTable(
'message_outbox', 'message_outbox',
array('MessageManager', 'get_number_of_messages_sent'), array('MessageManager', 'getNumberOfMessagesSent'),
array('MessageManager', 'get_message_data_sent'), array('MessageManager', 'get_message_data_sent'),
3, 3,
20, 20,

36
main/inc/lib/social.lib.php
Unescape View File

@ -290,8 +290,8 @@ class SocialManager extends UserManager
*/ */
public static function get_message_number_invitation_by_user_id($user_receiver_id) public static function get_message_number_invitation_by_user_id($user_receiver_id)
{ {
$tbl_message = Database::get_main_table(TABLE_MESSAGE); $table = Database::get_main_table(TABLE_MESSAGE);
$sql = 'SELECT COUNT(*) as count_message_in_box FROM '.$tbl_message.' $sql = 'SELECT COUNT(*) as count_message_in_box FROM '.$table.'
WHERE WHERE
user_receiver_id='.intval($user_receiver_id).' AND user_receiver_id='.intval($user_receiver_id).' AND
msg_status='.MESSAGE_STATUS_INVITATION_PENDING; msg_status='.MESSAGE_STATUS_INVITATION_PENDING;
@ -308,8 +308,8 @@ class SocialManager extends UserManager
*/ */
public static function getCountMessagesSent($sender_id) public static function getCountMessagesSent($sender_id)
{ {
$tbl_message = Database::get_main_table(TABLE_MESSAGE); $table = Database::get_main_table(TABLE_MESSAGE);
$sql = 'SELECT COUNT(*) FROM '.$tbl_message.' $sql = 'SELECT COUNT(*) FROM '.$table.'
WHERE WHERE
user_sender_id='.intval($sender_id).' AND user_sender_id='.intval($sender_id).' AND
msg_status < 5'; msg_status < 5';
@ -326,8 +326,8 @@ class SocialManager extends UserManager
*/ */
public static function getCountMessagesReceived($receiver_id) public static function getCountMessagesReceived($receiver_id)
{ {
$tbl_message = Database::get_main_table(TABLE_MESSAGE); $table = Database::get_main_table(TABLE_MESSAGE);
$sql = 'SELECT COUNT(*) FROM '.$tbl_message.' $sql = 'SELECT COUNT(*) FROM '.$table.'
WHERE WHERE
user_receiver_id='.intval($receiver_id).' AND user_receiver_id='.intval($receiver_id).' AND
msg_status < 4'; msg_status < 4';
@ -348,9 +348,9 @@ class SocialManager extends UserManager
return 0; return 0;
} }
$tbl_message = Database::get_main_table(TABLE_MESSAGE); $table = Database::get_main_table(TABLE_MESSAGE);
$sql = 'SELECT COUNT(*) $sql = 'SELECT COUNT(*)
FROM '.$tbl_message.' FROM '.$table.'
WHERE WHERE
user_sender_id='.intval($userId).' AND user_sender_id='.intval($userId).' AND
(msg_status = '.MESSAGE_STATUS_WALL.' OR (msg_status = '.MESSAGE_STATUS_WALL.' OR
@ -375,9 +375,9 @@ class SocialManager extends UserManager
return []; return [];
} }
$tbl_message = Database::get_main_table(TABLE_MESSAGE); $table = Database::get_main_table(TABLE_MESSAGE);
$sql = 'SELECT user_sender_id, send_date, title, content $sql = 'SELECT user_sender_id, send_date, title, content
FROM '.$tbl_message.' FROM '.$table.'
WHERE WHERE
user_receiver_id = '.intval($userId).' AND user_receiver_id = '.intval($userId).' AND
msg_status = '.MESSAGE_STATUS_INVITATION_PENDING; msg_status = '.MESSAGE_STATUS_INVITATION_PENDING;
@ -460,8 +460,8 @@ class SocialManager extends UserManager
return false; return false;
} }
$tbl_message = Database::get_main_table(TABLE_MESSAGE); $table = Database::get_main_table(TABLE_MESSAGE);
$sql = "UPDATE $tbl_message $sql = "UPDATE $table
SET msg_status = ".MESSAGE_STATUS_INVITATION_ACCEPTED." SET msg_status = ".MESSAGE_STATUS_INVITATION_ACCEPTED."
WHERE WHERE
user_sender_id = ".((int) $user_send_id)." AND user_sender_id = ".((int) $user_send_id)." AND
@ -486,8 +486,8 @@ class SocialManager extends UserManager
if (empty($user_send_id) || empty($user_receiver_id)) { if (empty($user_send_id) || empty($user_receiver_id)) {
return false; return false;
} }
$tbl_message = Database::get_main_table(TABLE_MESSAGE); $table = Database::get_main_table(TABLE_MESSAGE);
$sql = 'DELETE FROM '.$tbl_message.' $sql = 'DELETE FROM '.$table.'
WHERE WHERE
user_sender_id = '.((int) $user_send_id).' AND user_sender_id = '.((int) $user_send_id).' AND
user_receiver_id='.((int) $user_receiver_id).' AND user_receiver_id='.((int) $user_receiver_id).' AND
@ -507,9 +507,9 @@ class SocialManager extends UserManager
*/ */
public static function qualify_friend($id_friend_qualify, $type_qualify) public static function qualify_friend($id_friend_qualify, $type_qualify)
{ {
$tbl_user_friend = Database::get_main_table(TABLE_MAIN_USER_REL_USER); $table = Database::get_main_table(TABLE_MAIN_USER_REL_USER);
$user_id = api_get_user_id(); $user_id = api_get_user_id();
$sql = 'UPDATE '.$tbl_user_friend.' SET relation_type='.((int) $type_qualify).' $sql = 'UPDATE '.$table.' SET relation_type='.((int) $type_qualify).'
WHERE user_id = '.((int) $user_id).' AND friend_user_id='.(int) $id_friend_qualify; WHERE user_id = '.((int) $user_id).' AND friend_user_id='.(int) $id_friend_qualify;
Database::query($sql); Database::query($sql);
} }
@ -684,8 +684,6 @@ class SocialManager extends UserManager
} }
$result .= '</li>'; $result .= '</li>';
$session = ''; $session = '';
if (!empty($my_course['session_name']) && !empty($my_course['id_session'])) { if (!empty($my_course['session_name']) && !empty($my_course['id_session'])) {
// Request for the name of the general coach // Request for the name of the general coach
@ -857,7 +855,7 @@ class SocialManager extends UserManager
); );
// get count unread message and total invitations // get count unread message and total invitations
$count_unread_message = MessageManager::get_number_of_messages(true); $count_unread_message = MessageManager::getNumberOfMessages(true);
$count_unread_message = !empty($count_unread_message) ? Display::badge($count_unread_message) : null; $count_unread_message = !empty($count_unread_message) ? Display::badge($count_unread_message) : null;
$number_of_new_messages_of_friend = self::get_message_number_invitation_by_user_id(api_get_user_id()); $number_of_new_messages_of_friend = self::get_message_number_invitation_by_user_id(api_get_user_id());

2
main/install/configuration.dist.php
Unescape View File

@ -713,5 +713,5 @@ $_configuration['gradebook_badge_sidebar'] = [
// Add user activation by confirmation email // Add user activation by confirmation email
// This option prevents the new user to login in the platform if your account is not confirmed via email // This option prevents the new user to login in the platform if your account is not confirmed via email
// You need add a new option called "confirmation" to the registration settings // You need add a new option called "confirmation" to the registration settings
//INSERT INTO settings_options (variable, value, display_text) VALUES ('allow_registration', 'confirmation', 'MailConfirmation') //INSERT INTO settings_options (variable, value, display_text) VALUES ('allow_registration', 'confirmation', 'MailConfirmation');
// ------ (End) Custom DB changes // ------ (End) Custom DB changes

Write Preview
Loading…
Cancel
Save