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 9 years ago
parent a3af85f276
commit 322b6a4c5a
2 changed files with 39 additions and 24 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. 32
      main/inc/ajax/lp.ajax.php
  2. 31
      main/inc/ajax/message.ajax.php

32
main/inc/ajax/lp.ajax.php
Unescape View File

@ -297,40 +297,50 @@ exit;
* Classes to create a special data structure to manipulate LP Items
* used only in this file
* @todo move in a file
* @todo use PSR
*/
class LP_item_order_list {
class LP_item_order_list
{
public $list = array();
public function __construct() {
public function __construct()
{
$this->list = array();
}
public function add($in_LP_item_order_item) {
public function add($in_LP_item_order_item)
{
$this->list[] = $in_LP_item_order_item;
}
public function get_item_with_same_parent($in_parent_id) {
public function get_item_with_same_parent($in_parent_id)
{
$out_res = new LP_item_order_list();
for ($i=0; $i < count($this->list); $i++) {
for ($i = 0; $i < count($this->list); $i++) {
if ($this->list[$i]->parent_item_id == $in_parent_id) {
$out_res->add($this->list[$i]);
}
}
return $out_res;
}
public function get_list_of_parents() {
public function get_list_of_parents()
{
$tab_out_res = array();
foreach ($this->list as $LP_item) {
if (!in_array($LP_item->parent_item_id, $tab_out_res)) {
$tab_out_res[] = $LP_item->parent_item_id;
}
}
return $tab_out_res;
}
public function set_parameters_for_id($in_id, $in_value, $in_parameters) {
for ($i=0; $i < count($this->list); $i++) {
public function set_parameters_for_id($in_id, $in_value, $in_parameters)
{
for ($i = 0; $i < count($this->list); $i++) {
if ($this->list[$i]->id == $in_id) {
$this->list[$i]->$in_parameters = $in_value;
break;
@ -340,14 +350,16 @@ class LP_item_order_list {
}
class LP_item_order_item {
class LP_item_order_item
{
public $id = 0;
public $parent_item_id = 0;
public $previous_item_id = 0;
public $next_item_id = 0;
public $display_order = 0;
public function __construct($in_id=0, $in_parent_id=0) {
public function __construct($in_id = 0, $in_parent_id = 0)
{
$this->id = $in_id;
$this->parent_item_id = $in_parent_id;
}

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

@ -36,22 +36,22 @@ switch ($action) {
echo '';
break;
}
$track_online_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ONLINE);
$tbl_my_user = Database::get_main_table(TABLE_MAIN_USER);
$tbl_my_user_friend = Database::get_main_table(TABLE_MAIN_USER_REL_USER);
$tbl_user = Database::get_main_table(TABLE_MAIN_USER);
$tbl_access_url_rel_user = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$search = Database::escape_string($_REQUEST['q']);
$track_online_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ONLINE);
$tbl_my_user = Database::get_main_table(TABLE_MAIN_USER);
$tbl_my_user_friend = Database::get_main_table(TABLE_MAIN_USER_REL_USER);
$tbl_user = Database::get_main_table(TABLE_MAIN_USER);
$tbl_access_url_rel_user = Database:: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$search = Database::escape_string($_REQUEST['q']);
$access_url_id = api_get_multiple_access_url() == 'true' ? api_get_current_access_url_id() : 1;
$user_id = api_get_user_id();
$is_western_name_order = api_is_western_name_order();
$access_url_id = api_get_multiple_access_url() == 'true' ? api_get_current_access_url_id() : 1;
$user_id = api_get_user_id();
$is_western_name_order = api_is_western_name_order();
$likeCondition = " AND (firstname LIKE '%$search%' OR lastname LIKE '%$search%' OR email LIKE '%$search%') ";
if (api_get_setting('allow_social_tool')=='true' && api_get_setting('allow_message_tool') == 'true') {
if (api_get_setting('allow_social_tool') === 'true' && api_get_setting('allow_message_tool') === 'true') {
// All users
if (api_get_setting('allow_send_message_to_all_platform_users') == 'true' || api_is_platform_admin() ) {
if (api_get_setting('allow_send_message_to_all_platform_users') === 'true' || api_is_platform_admin() ) {
if ($access_url_id != 0) {
$sql = "SELECT DISTINCT u.user_id as id, u.firstname, u.lastname, u.email
FROM $tbl_user u LEFT JOIN $tbl_access_url_rel_user r ON u.user_id = r.user_id
@ -97,8 +97,11 @@ switch ($action) {
$likeCondition";
}
}
} elseif (api_get_setting('allow_social_tool')=='false' && api_get_setting('allow_message_tool')=='true') {
if (api_get_setting('allow_send_message_to_all_platform_users') == 'true') {
} elseif (
api_get_setting('allow_social_tool') === 'false' &&
api_get_setting('allow_message_tool') === 'true'
) {
if (api_get_setting('allow_send_message_to_all_platform_users') === 'true') {
$sql = "SELECT DISTINCT u.user_id as id, u.firstname, u.lastname, u.email
FROM $tbl_user u LEFT JOIN $tbl_access_url_rel_user r ON u.user_id = r.user_id
WHERE
@ -109,7 +112,7 @@ switch ($action) {
} else {
$time_limit = api_get_setting('time_limit_whosonline');
$online_time = time() - $time_limit*60;
$limit_date = api_get_utc_datetime($online_time);
$limit_date = api_get_utc_datetime($online_time);
$sql = "SELECT SELECT DISTINCT u.user_id as id, u.firstname, u.lastname, u.email
FROM $tbl_my_user u INNER JOIN $track_online_table t
ON u.user_id=t.login_user_id

Write Preview
Loading…
Cancel
Save