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

Fixing fatal error #5505

Browse Source
skala
Julio Montoya 13 years ago
parent 4f19c99464
commit f7cffdd3fd
6 changed files with 133 additions and 129 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. 19
      main/inc/lib/fileDisplay.lib.php
  2. 198
      main/inc/lib/message.lib.php
  3. 24
      main/inc/lib/text.lib.php
  4. 11
      main/messages/inbox.php
  5. 6
      main/messages/outbox.php
  6. 4
      tests/main/inc/lib/message.lib.test.php

19
main/inc/lib/fileDisplay.lib.php
Unescape View File

@ -111,25 +111,6 @@ function choose_image($file_name)
return 'defaut.gif';
}
/**
* Transform the file size in a human readable format.
*
* @param int Size of the file in bytes
* @return string A human readable representation of the file size
*/
function format_file_size($file_size) {
$file_size = intval($file_size);
if($file_size >= 1073741824) {
$file_size = round($file_size / 1073741824 * 100) / 100 . 'G';
} elseif($file_size >= 1048576) {
$file_size = round($file_size / 1048576 * 100) / 100 . 'M';
} elseif($file_size >= 1024) {
$file_size = round($file_size / 1024 * 100) / 100 . 'k';
} else {
$file_size = $file_size . 'B';
}
return $file_size;
}
/**
* Transform a UNIX time stamp in human readable format date.

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

@ -1247,51 +1247,113 @@ class MessageManager
$div = Display::div($form->return_form(), array('id' => $id.'_div', 'style' => 'display:none'));
return $div;
}
}
//@todo this functions should be in the message class
static function inbox_display() {
global $charset;
$success = get_lang('SelectedMessagesDeleted');
$html = '';
//@todo this functions should be in the message class
if (isset ($_REQUEST['action'])) {
switch ($_REQUEST['action']) {
case 'delete' :
$number_of_selected_messages = count($_POST['id']);
foreach ($_POST['id'] as $index => $message_id) {
MessageManager::delete_message_by_user_receiver(api_get_user_id(), $message_id);
}
$html .= Display::return_message(api_xml_http_response_encode($success), 'normal', false);
break;
case 'deleteone' :
MessageManager::delete_message_by_user_receiver(api_get_user_id(), $_GET['id']);
$html .= Display::return_message(api_xml_http_response_encode($success),'confirmation', false);
break;
}
}
function inbox_display() {
global $charset;
$success = get_lang('SelectedMessagesDeleted');
$html = '';
// display sortable table with messages of the current user
$table = new SortableTable('message_inbox', array('MessageManager','get_number_of_messages'), array('MessageManager','get_message_data'),3,20,'DESC');
$table->set_header(0, '', false,array ('style' => 'width:15px;'));
$title=api_xml_http_response_encode(get_lang('Title'));
$action=api_xml_http_response_encode(get_lang('Modify'));
$table->set_header(1,api_xml_http_response_encode(get_lang('Messages')),false);
$table->set_header(2,api_xml_http_response_encode(get_lang('Date')),true, array('style' => 'width:180px;'));
$table->set_header(3,$action,false,array ('style' => 'width:70px;'));
if ($_REQUEST['f']=='social') {
$parameters['f'] = 'social';
$table->set_additional_parameters($parameters);
}
$table->set_form_actions(array ('delete' => get_lang('DeleteSelectedMessages')));
$html .= $table->return_table();
return $html;
}
if (isset ($_REQUEST['action'])) {
switch ($_REQUEST['action']) {
case 'delete' :
$number_of_selected_messages = count($_POST['id']);
foreach ($_POST['id'] as $index => $message_id) {
MessageManager::delete_message_by_user_receiver(api_get_user_id(), $message_id);
}
$html .= Display::return_message(api_xml_http_response_encode($success), 'normal', false);
break;
case 'deleteone' :
MessageManager::delete_message_by_user_receiver(api_get_user_id(), $_GET['id']);
$html .= Display::return_message(api_xml_http_response_encode($success),'confirmation', false);
break;
}
}
// display sortable table with messages of the current user
$table = new SortableTable('message_inbox', array('MessageManager','get_number_of_messages'), array('MessageManager','get_message_data'),3,20,'DESC');
$table->set_header(0, '', false,array ('style' => 'width:15px;'));
$title=api_xml_http_response_encode(get_lang('Title'));
$action=api_xml_http_response_encode(get_lang('Modify'));
$table->set_header(1,api_xml_http_response_encode(get_lang('Messages')),false);
$table->set_header(2,api_xml_http_response_encode(get_lang('Date')),true, array('style' => 'width:180px;'));
$table->set_header(3,$action,false,array ('style' => 'width:70px;'));
if ($_REQUEST['f']=='social') {
$parameters['f'] = 'social';
$table->set_additional_parameters($parameters);
}
$table->set_form_actions(array ('delete' => get_lang('DeleteSelectedMessages')));
$html .= $table->return_table();
return $html;
static function outbox_display() {
$request=api_is_xml_http_request();
global $charset;
$social_link = false;
if ($_REQUEST['f']=='social') {
$social_link ='f=social';
}
$success = get_lang('SelectedMessagesDeleted').'&nbsp</b><br /><a href="outbox.php?'.$social_link.'">'.get_lang('BackToOutbox').'</a>';
if (isset ($_REQUEST['action'])) {
switch ($_REQUEST['action']) {
case 'delete' :
$number_of_selected_messages = count($_POST['id']);
if ($number_of_selected_messages!=0) {
foreach ($_POST['id'] as $index => $message_id) {
MessageManager::delete_message_by_user_receiver(api_get_user_id(), $message_id);
}
}
$html .= Display::return_message(api_xml_http_response_encode($success),'normal', false);
break;
case 'deleteone' :
MessageManager::delete_message_by_user_receiver(api_get_user_id(), $_GET['id']);
$html .=Display::return_message(api_xml_http_response_encode($success), 'normal', false);
$html .= '<br/>';
break;
}
}
// display sortable table with messages of the current user
$table = new SortableTable('message_outbox', array('MessageManager','get_number_of_messages_sent'), array('MessageManager','get_message_data_sent'),3,20,'DESC');
$parameters['f'] = Security::remove_XSS($_GET['f']);
$table->set_additional_parameters($parameters);
$table->set_header(0, '', false,array ('style' => 'width:15px;'));
$title = api_xml_http_response_encode(get_lang('Title'));
$action= api_xml_http_response_encode(get_lang('Modify'));
$table->set_header(1, api_xml_http_response_encode(get_lang('Messages')),false);
//$table->set_header(2, $title,true);
$table->set_header(2, api_xml_http_response_encode(get_lang('Date')),true,array ('style' => 'width:160px;'));
$table->set_header(3,$action, false,array ('style' => 'width:70px;'));
if ($request===true) {
$html .= '<form name="form_send_out" id="form_send_out" action="" method="post">';
$html .= '<input type="hidden" name="action" value="delete" />';
$html .= $table->return_table();
$html .= '</form>';
if (get_number_of_messages_send_mask() > 0) {
$html .= '<a href="javascript:void(0)" onclick="selectall_cheks()">'.api_xml_http_response_encode(get_lang('SelectAll')).'</a>&nbsp;&nbsp;&nbsp;';
$html .= '<a href="javascript:void(0)" onclick="unselectall_cheks()">'.api_xml_http_response_encode(get_lang('UnSelectAll')).'</a>&nbsp;&nbsp;&nbsp;';
$html .= '<button class="save" name="delete" type="button" value="'.api_xml_http_response_encode(get_lang('DeleteSelectedMessages')).'" onclick="submit_form(\'outbox\')">'.api_xml_http_response_encode(get_lang('DeleteSelectedMessages')).'</button>';
}
} else {
$table->set_form_actions(array ('delete' => get_lang('DeleteSelectedMessages')));
$html .= $table->return_table();
}
return $html;
}
}
function get_number_of_messages_mask() {
return MessageManager::get_number_of_messages();
}
@ -1304,66 +1366,6 @@ function get_message_data_mask($from, $number_of_items, $column, $direction) {
return MessageManager::get_message_data($from, $number_of_items, $column, $direction);
}
function outbox_display() {
$request=api_is_xml_http_request();
global $charset;
$social_link = false;
if ($_REQUEST['f']=='social') {
$social_link ='f=social';
}
$success = get_lang('SelectedMessagesDeleted').'&nbsp</b><br /><a href="outbox.php?'.$social_link.'">'.get_lang('BackToOutbox').'</a>';
if (isset ($_REQUEST['action'])) {
switch ($_REQUEST['action']) {
case 'delete' :
$number_of_selected_messages = count($_POST['id']);
if ($number_of_selected_messages!=0) {
foreach ($_POST['id'] as $index => $message_id) {
MessageManager::delete_message_by_user_receiver(api_get_user_id(), $message_id);
}
}
$html .= Display::return_message(api_xml_http_response_encode($success),'normal', false);
break;
case 'deleteone' :
MessageManager::delete_message_by_user_receiver(api_get_user_id(), $_GET['id']);
$html .=Display::return_message(api_xml_http_response_encode($success), 'normal', false);
$html .= '<br/>';
break;
}
}
// display sortable table with messages of the current user
$table = new SortableTable('message_outbox', array('MessageManager','get_number_of_messages_sent'), array('MessageManager','get_message_data_sent'),3,20,'DESC');
$parameters['f'] = Security::remove_XSS($_GET['f']);
$table->set_additional_parameters($parameters);
$table->set_header(0, '', false,array ('style' => 'width:15px;'));
$title = api_xml_http_response_encode(get_lang('Title'));
$action= api_xml_http_response_encode(get_lang('Modify'));
$table->set_header(1, api_xml_http_response_encode(get_lang('Messages')),false);
//$table->set_header(2, $title,true);
$table->set_header(2, api_xml_http_response_encode(get_lang('Date')),true,array ('style' => 'width:160px;'));
$table->set_header(3,$action, false,array ('style' => 'width:70px;'));
if ($request===true) {
$html .= '<form name="form_send_out" id="form_send_out" action="" method="post">';
$html .= '<input type="hidden" name="action" value="delete" />';
$html .= $table->return_table();
$html .= '</form>';
if (get_number_of_messages_send_mask() > 0) {
$html .= '<a href="javascript:void(0)" onclick="selectall_cheks()">'.api_xml_http_response_encode(get_lang('SelectAll')).'</a>&nbsp;&nbsp;&nbsp;';
$html .= '<a href="javascript:void(0)" onclick="unselectall_cheks()">'.api_xml_http_response_encode(get_lang('UnSelectAll')).'</a>&nbsp;&nbsp;&nbsp;';
$html .= '<button class="save" name="delete" type="button" value="'.api_xml_http_response_encode(get_lang('DeleteSelectedMessages')).'" onclick="submit_form(\'outbox\')">'.api_xml_http_response_encode(get_lang('DeleteSelectedMessages')).'</button>';
}
} else {
$table->set_form_actions(array ('delete' => get_lang('DeleteSelectedMessages')));
$html .= $table->return_table();
}
return $html;
}
function get_number_of_messages_send_mask() {
return MessageManager::get_number_of_messages_sent();

24
main/inc/lib/text.lib.php
Unescape View File

@ -722,6 +722,26 @@ function implode_with_key($glue, $array) {
}
return $string;
}
return '';
return '';
}
/**
* Transform the file size in a human readable format.
*
* @param int Size of the file in bytes
* @return string A human readable representation of the file size
*/
function format_file_size($file_size) {
$file_size = intval($file_size);
if($file_size >= 1073741824) {
$file_size = round($file_size / 1073741824 * 100) / 100 . 'G';
} elseif($file_size >= 1048576) {
$file_size = round($file_size / 1048576 * 100) / 100 . 'M';
} elseif($file_size >= 1024) {
$file_size = round($file_size / 1024 * 100) / 100 . 'k';
} else {
$file_size = $file_size . 'B';
}
return $file_size;
}

11
main/messages/inbox.php
Unescape View File

@ -9,6 +9,7 @@
// name of the language file that needs to be included
$language_file = array('registration','messages','userInfo');
$cidReset = true;
require_once '../inc/global.inc.php';
api_block_anonymous_users();
@ -81,12 +82,12 @@ if (isset($_GET['form_reply']) || isset($_GET['form_delete'])) {
if (isset($user_reply) && !is_null($user_id_by_email) && strlen($info_reply[0]) >0) {
MessageManager::send_message($user_id_by_email, $title, $content);
$show_message .= MessageManager::return_message($user_id_by_email,'confirmation');
$social_right_content .= inbox_display();
$social_right_content .= MessageManager::inbox_display();
exit;
} elseif (is_null($user_id_by_email)) {
$message_box=get_lang('ErrorSendingMessage');
$show_message .= Display::return_message(api_xml_http_response_encode($message_box),'error');
$social_right_content .= inbox_display();
$social_right_content .= MessageManager::inbox_display();
exit;
}
} elseif (trim($info_delete[0])=='delete' ) {
@ -95,7 +96,7 @@ if (isset($_GET['form_reply']) || isset($_GET['form_delete'])) {
}
$message_box=get_lang('SelectedMessagesDeleted');
$show_message .= Display::return_message(api_xml_http_response_encode($message_box));
$social_right_content .= inbox_display();
$social_right_content .= MessageManager::inbox_display();
exit;
}
}
@ -146,7 +147,7 @@ if (api_get_setting('allow_social_tool') == 'true') {
//MAIN CONTENT
if (!isset($_GET['del_msg'])) {
$social_right_content .= inbox_display();
$social_right_content .= MessageManager::inbox_display();
} else {
$num_msg = intval($_POST['total']);
for ($i=0;$i<$num_msg;$i++) {
@ -155,7 +156,7 @@ if (!isset($_GET['del_msg'])) {
$show_message .= MessageManager::delete_message_by_user_receiver(api_get_user_id(), $_POST['_'.$i]);
}
}
$social_right_content .= inbox_display();
$social_right_content .= MessageManager::inbox_display();
}
if (api_get_setting('allow_social_tool') == 'true') {

6
main/messages/outbox.php
Unescape View File

@ -134,16 +134,16 @@ if ($action == 'delete') {
MessageManager::delete_message_by_user_sender(api_get_user_id(), $delete_list_id[$i]);
}
$delete_list_id=array();
$social_right_content .= outbox_display();
$social_right_content .= MessageManager::outbox_display();
} elseif($action =='deleteone') {
$delete_list_id=array();
$id = Security::remove_XSS($_GET['id']);
MessageManager::delete_message_by_user_sender(api_get_user_id(),$id);
$delete_list_id=array();
$social_right_content .= outbox_display();
$social_right_content .= MessageManager::outbox_display();
} else {
$social_right_content .= outbox_display();
$social_right_content .= MessageManager::outbox_display();
}
if (api_get_setting('allow_social_tool') == 'true') {

4
tests/main/inc/lib/message.lib.test.php
Unescape View File

@ -43,7 +43,7 @@ class TestMessage extends UnitTestCase {
function testInboxDisplay() {
global $charset;
ob_start();
$res=inbox_display();
$res=MessageManager::inbox_display();
$this->assertTrue(is_null($res));
ob_end_clean();
//var_dump($res);
@ -52,7 +52,7 @@ class TestMessage extends UnitTestCase {
function testOutboxDisplay() {
global $charset;
ob_start();
$res=outbox_display();
$res=MessageManager::outbox_display();
$this->assertTrue(is_null($res));
ob_end_clean();
//var_dump($res);

Write Preview
Loading…
Cancel
Save