Fix query, format code.

1.10.x
Julio Montoya 11 years ago
parent 1a90642d4e
commit d39bd6ef17
  1. 14
      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. 7
      main/webservices/cm_webservice_inbox.php

@ -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);
@ -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'];

@ -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(

@ -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);

@ -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;
}

@ -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"));
}
/**

@ -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")

Loading…
Cancel
Save