Minor - format code

pull/3924/head
Julio Montoya 3 years ago
parent 930ebbbff1
commit 207c203366
  1. 4
      public/main/badge/issued.php
  2. 4
      public/main/exercise/question_stats.php
  3. 2
      public/main/inc/ajax/message.ajax.php
  4. 4
      public/main/inc/lib/course_category.lib.php
  5. 4
      public/main/inc/lib/notification.lib.php
  6. 10
      public/main/inc/lib/usermanager.lib.php
  7. 8
      public/main/inc/lib/webservices/Rest.php
  8. 1
      public/main/social/view_promoted_message.php
  9. 2
      public/main/ticket/new_ticket.php

@ -97,7 +97,7 @@ if ($skillIssue->getAcquiredLevel()) {
$author = api_get_user_info($skillIssue->getArgumentationAuthorId()); $author = api_get_user_info($skillIssue->getArgumentationAuthorId());
$tempDate = DateTime::createFromFormat('Y-m-d H:i:s', $skillIssueDate); $tempDate = DateTime::createFromFormat('Y-m-d H:i:s', $skillIssueDate);
$linkedinOrganizationId = api_get_configuration_value('linkedin_organization_id'); $linkedinOrganizationId = api_get_configuration_value('linkedin_organization_id');
if (($linkedinOrganizationId === false)) { if ((false === $linkedinOrganizationId)) {
$linkedinOrganizationId = null; $linkedinOrganizationId = null;
} }
@ -269,7 +269,7 @@ if ($allowExport) {
$skills = $objSkill->get($skillId); $skills = $objSkill->get($skillId);
// $unbakedBadge = api_get_path(SYS_UPLOAD_PATH).'badges/'.$skills['icon']; // $unbakedBadge = api_get_path(SYS_UPLOAD_PATH).'badges/'.$skills['icon'];
// if (!is_file($unbakedBadge)) { // if (!is_file($unbakedBadge)) {
$unbakedBadge = api_get_path(SYS_PUBLIC_PATH).'img/icons/128/badges-default.png'; $unbakedBadge = api_get_path(SYS_PUBLIC_PATH).'img/icons/128/badges-default.png';
// } // }
// $unbakedBadge = file_get_contents($unbakedBadge); // $unbakedBadge = file_get_contents($unbakedBadge);

@ -105,8 +105,8 @@ $orderedData = [];
if ($form->validate()) { if ($form->validate()) {
$questions = ExerciseLib::getWrongQuestionResults($courseId, $exerciseId, $sessionId, $groups, $users); $questions = ExerciseLib::getWrongQuestionResults($courseId, $exerciseId, $sessionId, $groups, $users);
foreach ($questions as $data) { foreach ($questions as $data) {
$questionId = (int) $data['question_id']; $questionId = (int) $data['question_id'];
$total = ExerciseLib::getTotalQuestionAnswered( $total = ExerciseLib::getTotalQuestionAnswered(
$courseId, $courseId,
$exerciseId, $exerciseId,

@ -2,8 +2,6 @@
/* For licensing terms, see /license.txt */ /* For licensing terms, see /license.txt */
use Chamilo\CoreBundle\Entity\Message;
$_dont_save_user_course_access = true; $_dont_save_user_course_access = true;
/** /**

@ -442,9 +442,7 @@ class CourseCategory
$deleteIcon, $deleteIcon,
$deleteUrl, $deleteUrl,
[ [
'onclick' 'onclick' => 'javascript: if (!confirm(\''.addslashes(
=>
'javascript: if (!confirm(\''.addslashes(
api_htmlentities(sprintf(get_lang('Please confirm your choice')), ENT_QUOTES) api_htmlentities(sprintf(get_lang('Please confirm your choice')), ENT_QUOTES)
).'\')) return false;', ).'\')) return false;',
] ]

@ -32,6 +32,7 @@ class Notification extends Model
const NOTIFICATION_TYPE_GROUP = 3; const NOTIFICATION_TYPE_GROUP = 3;
const NOTIFICATION_TYPE_WALL_MESSAGE = 4; const NOTIFICATION_TYPE_WALL_MESSAGE = 4;
const NOTIFICATION_TYPE_DIRECT_MESSAGE = 5; const NOTIFICATION_TYPE_DIRECT_MESSAGE = 5;
public $table; public $table;
public $columns = [ public $columns = [
'id', 'id',
@ -54,9 +55,6 @@ class Notification extends Model
public $adminEmail; public $adminEmail;
public $titlePrefix; public $titlePrefix;
/**
* Constructor.
*/
public function __construct() public function __construct()
{ {
$this->table = Database::get_main_table(TABLE_NOTIFICATION); $this->table = Database::get_main_table(TABLE_NOTIFICATION);

@ -4512,11 +4512,11 @@ class UserManager
/** /**
* Add subscribed users to a user by relation type. * Add subscribed users to a user by relation type.
* *
* @param int $userId The user id * @param int $userId The user id
* @param array $subscribedUsersId The id of subscribed users * @param array $subscribedUsersId The id of subscribed users
* @param int $relationType The relation type * @param int $relationType The relation type
* @param bool $deleteUsersBeforeInsert * @param bool $deleteUsersBeforeInsert
* @param bool $deleteOtherAssignedUsers * @param bool $deleteOtherAssignedUsers
*/ */
public static function subscribeUsersToUser( public static function subscribeUsersToUser(
$userId, $userId,

@ -249,8 +249,6 @@ class Rest extends WebService
/** /**
* @param int $lastMessageId * @param int $lastMessageId
*
* @return array
*/ */
/*public function getUserMessages($lastMessageId = 0) /*public function getUserMessages($lastMessageId = 0)
{ {
@ -263,9 +261,6 @@ class Rest extends WebService
return $messages; return $messages;
}*/ }*/
/**
* @return array
*/
/*public function getUserReceivedMessages() /*public function getUserReceivedMessages()
{ {
$lastMessages = MessageManager::getReceivedMessages($this->user->getId(), 0); $lastMessages = MessageManager::getReceivedMessages($this->user->getId(), 0);
@ -277,9 +272,6 @@ class Rest extends WebService
return $messages; return $messages;
}*/ }*/
/**
* @return array
*/
/*public function getUserSentMessages() /*public function getUserSentMessages()
{ {
$lastMessages = MessageManager::getSentMessages($this->user->getId(), 0); $lastMessages = MessageManager::getSentMessages($this->user->getId(), 0);

@ -29,7 +29,6 @@ Event::registerLog($logInfo);
//$social_menu_block = SocialManager::show_social_menu('inbox'); //$social_menu_block = SocialManager::show_social_menu('inbox');
throw new Exception('Fix MessageManager::showMessageBox'); throw new Exception('Fix MessageManager::showMessageBox');
//$message .= MessageManager::showMessageBox($messageId, Message::MESSAGE_TYPE_PROMOTED); //$message .= MessageManager::showMessageBox($messageId, Message::MESSAGE_TYPE_PROMOTED);
if (!empty($message)) { if (!empty($message)) {

@ -229,7 +229,7 @@ $form->addHidden('user_id_request', '', ['id' => 'user_id_request']);
$form->addHidden('project_id', $projectId); $form->addHidden('project_id', $projectId);
$form->addHidden('other_area', '', ['id' => 'other_area']); $form->addHidden('other_area', '', ['id' => 'other_area']);
$form->addHidden('email', '', ['id' => 'email']); $form->addHidden('email', '', ['id' => 'email']);
$form->addSelect('category_id', get_lang('Category'), $categoryList, ['id' => 'category_id', 'for' => 'category_id',]); $form->addSelect('category_id', get_lang('Category'), $categoryList, ['id' => 'category_id', 'for' => 'category_id']);
$form->addElement('text', 'subject', get_lang('Subject'), ['id' => 'subject']); $form->addElement('text', 'subject', get_lang('Subject'), ['id' => 'subject']);
$form->addHtmlEditor( $form->addHtmlEditor(
'content', 'content',

Loading…
Cancel
Save