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

Fix query, format code.

Browse Source
1.10.x
Julio Montoya 11 years ago
parent 1a90642d4e
commit d39bd6ef17
6 changed files with 29 additions and 27 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. 16
      main/admin/special_exports.php
  2. 9
      main/coursecopy/classes/CourseBuilder.class.php
  3. 4
      main/coursecopy/classes/CourseSelectForm.class.php
  4. 2
      main/coursecopy/classes/CourseSession.class.php
  5. 2
      main/inc/lib/course.lib.php
  6. 23
      main/webservices/cm_webservice_inbox.php

16
main/admin/special_exports.php
Unescape View File

@ -1,5 +1,6 @@
<?php
/* For licensing terms, see /license.txt */
/**
* Special exports
*
@ -7,6 +8,7 @@
* @author Julio Montoya Fixing pclzip folder + some clean <gugli100@gmail.com>
* @package chamilo.include.export
*/
// including the global file
$cidReset = true;
require_once '../inc/global.inc.php';
@ -204,7 +206,7 @@ function fullexportspecial(){
$code_course = '';
$list_course = array();
$zip_folder = new PclZip($FileZip['TEMP_FILE_ZIP']);
$list_course = Database::get_course_list();
$list_course = CourseManager::get_course_list();
$tbl_document = Database::get_course_table(TABLE_DOCUMENT);
$tbl_property = Database::get_course_table(TABLE_ITEM_PROPERTY);
@ -217,7 +219,7 @@ function fullexportspecial(){
} else {
$querypath = $FileZip['PATH'];
}
$course_id = $_course['real_id'];
$course_id = $_course['real_id'];
//Add tem to the zip file course
$sql = "SELECT path FROM $tbl_document AS docs, $tbl_property AS props
@ -238,10 +240,12 @@ function fullexportspecial(){
}
//Add tem to the zip file session course
$code_course = $_course['code'];
$sql_session = "SELECT id, name, c_id
FROM $tbl_session_course
INNER JOIN $tbl_session ON session_id = id
WHERE course_code = '$code_course' ";
$sql_session = "SELECT s.id, name, c_id
FROM $tbl_session_course sc
INNER JOIN $tbl_session s
ON sc.session_id = s.id
WHERE c_id = '$course_id' ";
$query_session = Database::query($sql_session);
while ($rows_session = Database::fetch_assoc($query_session)) {
$session_id = $rows_session['id'];

9
main/coursecopy/classes/CourseBuilder.class.php
Unescape View File

@ -1317,10 +1317,11 @@ class CourseBuilder
); //current platform encoding
$code_course = $_course['code'];
$courseId = $_course['real_id'];
$sql_session = "SELECT id, name, c_id
FROM $tbl_session_course
INNER JOIN $tbl_session ON session_id = id
WHERE c_id = '$courseId' ";
$sql_session = "SELECT s.id, name, c_id
FROM $tbl_session_course sc
INNER JOIN $tbl_session s
ON sc.session_id = s.id
WHERE sc.c_id = '$courseId' ";
$query_session = Database::query($sql_session);
while ($rows_session = Database::fetch_assoc($query_session)) {
$session = new CourseSession(

4
main/coursecopy/classes/CourseSelectForm.class.php
Unescape View File

@ -561,9 +561,9 @@ class CourseSelectForm
* @param array $hidden_fiels Hidden fields to add to the form.
* @param boolean the document array will be serialize. This is used in the course_copy.php file
*/
function display_form_session_export($list_course, $hidden_fields = null, $avoid_serialize = false)
public static function display_form_session_export($list_course, $hidden_fields = null, $avoid_serialize = false)
{
?>
?>
<script>
function exp(item) {
el = document.getElementById('div_'+item);

2
main/coursecopy/classes/CourseSession.class.php
Unescape View File

@ -20,7 +20,7 @@ class CourseSession extends Resource
*/
public function __construct($id,$title)
{
parent::__construct($id,RESOURCE_SESSION_COURSE);
parent::__construct($id, RESOURCE_SESSION_COURSE);
$this->title = $title;
}

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

@ -5686,7 +5686,7 @@ class CourseManager
public static function get_course_list()
{
$table = Database::get_main_table(TABLE_MAIN_COURSE);
return Database::store_result(self::query("SELECT *, id as real_id FROM $table"));
return Database::store_result(Database::query("SELECT *, id as real_id FROM $table"));
}
/**

23
main/webservices/cm_webservice_inbox.php
Unescape View File

@ -1,9 +1,6 @@
<?php
require_once(dirname(__FILE__).'/../inc/global.inc.php');
$libpath = api_get_path(LIBRARY_PATH);
require_once $libpath.'message.lib.php';
require_once $libpath.'usermanager.lib.php';
require_once(dirname(__FILE__).'/cm_webservice.php');
/**
@ -11,8 +8,8 @@ require_once(dirname(__FILE__).'/cm_webservice.php');
*
* @author marcosousa
*/
class WSCMInbox extends WSCM {
class WSCMInbox extends WSCM
{
public function unreadMessage($username, $password)
{
if($this->verifyUserPass($username, $password) == "valid")
@ -22,7 +19,7 @@ class WSCMInbox extends WSCM {
$condition_msg_status = ' msg_status = 1 '; // define('MESSAGE_STATUS_UNREAD', '1');
$sql_query = "SELECT COUNT(*) as number_messages FROM $table_message WHERE $condition_msg_status AND user_receiver_id=".$user_id;
$sql_result = Database::query($sql_query);
$result = Database::fetch_array($sql_result);
return $result['number_messages'];
@ -30,11 +27,11 @@ class WSCMInbox extends WSCM {
return "0";
}
public function get_message_id($username, $password, $from, $number_of_items)
{
{
if($this->verifyUserPass($username, $password) == "valid")
{
{
$user_id = UserManager::get_user_id_from_username($username);
$table_message = Database::get_main_table(TABLE_MESSAGE);
@ -48,7 +45,7 @@ class WSCMInbox extends WSCM {
while ($result = Database::fetch_row($sql_result)) {
$message .= $result[0]."#";
}
return $message;
} else
@ -84,7 +81,7 @@ class WSCMInbox extends WSCM {
break;
default :
$field_table = "title";
}
}
$table_message = Database::get_main_table(TABLE_MESSAGE);
@ -193,7 +190,7 @@ class WSCMInbox extends WSCM {
$query = "INSERT INTO $table_message(user_sender_id, user_receiver_id, msg_status, send_date, title, content, group_id, parent_id, update_date ) ".
" VALUES ('$user_sender_id', '$receiver_user_id', '1', '".api_get_utc_datetime()."','$subject','$content','$group_id','$parent_id', '".api_get_utc_datetime()."')";
$result = Database::query($query);
$query = "INSERT INTO $table_message(user_sender_id, user_receiver_id, msg_status, send_date, title, content, group_id, parent_id, update_date ) ".
" VALUES ('$user_sender_id', '$receiver_user_id', '4', '".api_get_utc_datetime()."','$subject','$content','$group_id','$parent_id', '".api_get_utc_datetime()."')";
$result = Database::query($query);
@ -225,4 +222,4 @@ $aqui = new WSCMInbox();
print_r($aqui->message_send("aluno", "356a192b7913b04c54574d18c28d46e6395428ab", "1", "Título da mensagem", "Conteúdo da mensagem com ç ã"));
*/
*/

Write Preview
Loading…
Cancel
Save