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

Remove use of Database::error()

Browse Source
1.10.x
Julio Montoya 11 years ago
parent a2144b6d5a
commit 80982cc02d
8 changed files with 32 additions and 40 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. 18
      main/inc/lib/blog.lib.php
  2. 6
      main/newscorm/aicc.class.php
  3. 2
      main/newscorm/scorm.class.php
  4. 19
      main/reports/reports.cli.php
  5. 6
      main/reports/reports.cron.php
  6. 3
      main/webservices/registration.soap.php
  7. 8
      main/wiki/wiki.inc.php
  8. 10
      plugin/buycourses/src/function.php

18
main/inc/lib/blog.lib.php
Unescape View File

@ -2129,16 +2129,14 @@ class Blog
$row[] = Display::icon_mailto_link($myrow["email"]); $row[] = Display::icon_mailto_link($myrow["email"]);
$sql = "SELECT bt.title task $sql = "SELECT bt.title task
FROM " . Database::get_course_table(TABLE_BLOGS_TASKS_REL_USER) . " btu FROM " . Database::get_course_table(TABLE_BLOGS_TASKS_REL_USER) . " btu
INNER JOIN " . Database::get_course_table(TABLE_BLOGS_TASKS) . " bt ON btu.task_id = bt.task_id INNER JOIN " . Database::get_course_table(TABLE_BLOGS_TASKS) . " bt
WHERE btu.c_id = $course_id AND ON btu.task_id = bt.task_id
bt.c_id = $course_id AND WHERE btu.c_id = $course_id AND
btu.blog_id = $blog_id AND bt.c_id = $course_id AND
btu.user_id = " . $myrow['user_id']; btu.blog_id = $blog_id AND
btu.user_id = " . $myrow['user_id'];
if (!($sql_res = Database::query($sql))) { $sql_res = Database::query($sql);
die(Database::error());
}
$task = ''; $task = '';

6
main/newscorm/aicc.class.php
Unescape View File

@ -283,13 +283,13 @@ class aicc extends learnpath
"$parent, $previous, 0, " . "$parent, $previous, 0, " .
"'$prereq', 0" . "'$prereq', 0" .
")"; ")";
$res_item = Database::query($sql_item); Database::query($sql_item);
if ($this->debug > 1) { error_log('New LP - In aicc::import_aicc() - inserting item : '.$sql_item.' : '.Database::error(), 0); } if ($this->debug > 1) { error_log('New LP - In aicc::import_aicc() - inserting item : '.$sql_item.' : ', 0); }
$item_id = Database::insert_id(); $item_id = Database::insert_id();
// Now update previous item to change next_item_id. // Now update previous item to change next_item_id.
if ($previous != 0) { if ($previous != 0) {
$upd = "UPDATE $new_lp_item SET next_item_id = $item_id WHERE c_id = $course_id AND id = $previous"; $upd = "UPDATE $new_lp_item SET next_item_id = $item_id WHERE c_id = $course_id AND id = $previous";
$upd_res = Database::query($upd); Database::query($upd);
// Update the previous item id. // Update the previous item id.
} }
$previous = $item_id; $previous = $item_id;

2
main/newscorm/scorm.class.php
Unescape View File

@ -398,7 +398,7 @@ class scorm extends learnpath
VALUES ($course_id, $lp_id, '$type', '$identifier', '$title', '$path' , 0, $max_score, $value_add $parent, $previous, 0, '$prereq', ".$item['rel_order'] .", '".$item['datafromlms']."', '".$item['parameters']."' )"; VALUES ($course_id, $lp_id, '$type', '$identifier', '$title', '$path' , 0, $max_score, $value_add $parent, $previous, 0, '$prereq', ".$item['rel_order'] .", '".$item['datafromlms']."', '".$item['parameters']."' )";
Database::query($sql); Database::query($sql);
if ($this->debug > 1) { error_log('New LP - In import_manifest(), inserting item : '.$sql.' : '.Database::error(), 0); } if ($this->debug > 1) { error_log('New LP - In import_manifest(), inserting item : '.$sql, 0); }
$item_id = Database::insert_id(); $item_id = Database::insert_id();
// Now update previous item to change next_item_id. // Now update previous item to change next_item_id.
$upd = "UPDATE $new_lp_item SET next_item_id = $item_id WHERE c_id = $course_id AND id = $previous"; $upd = "UPDATE $new_lp_item SET next_item_id = $item_id WHERE c_id = $course_id AND id = $previous";

19
main/reports/reports.cli.php
Unescape View File

@ -1,4 +1,6 @@
<?php <?php
/* For licensing terms, see /license.txt */
require_once 'reports.lib.php'; require_once 'reports.lib.php';
$longopts = array( $longopts = array(
@ -34,28 +36,23 @@ if (array_key_exists('help', $options))
echo "help message\n"; echo "help message\n";
else if (array_key_exists('clearAll', $options)) { else if (array_key_exists('clearAll', $options)) {
reports_clearAll(); reports_clearAll();
echo Database::error();
} else if (array_key_exists('build', $options)) { } else if (array_key_exists('build', $options)) {
reports_build(); reports_build();
echo Database::error();
} else if (array_key_exists('addDBKeys', $options)) { } else if (array_key_exists('addDBKeys', $options)) {
reports_addDBKeys(); reports_addDBKeys();
echo Database::error();
} else if (array_key_exists('addValue', $options)) { } else if (array_key_exists('addValue', $options)) {
reports_addValue($options['key'], $options['session'], $options['uid'], reports_addValue($options['key'], $options['session'], $options['uid'],
$options['attempt'], $options['score'], $options['attempt'], $options['score'],
$options['progress'], $options['time']); $options['progress'], $options['time']);
echo Database::error();
} else if (array_key_exists('addKey', $options)) { } else if (array_key_exists('addKey', $options)) {
echo reports_addKey($options['course'], $options['tool'], echo reports_addKey($options['course'], $options['tool'],
$options['ci'], $options['cn'], $options['ci'], $options['cn'],
$options['sci'], $options['scn'], $options['sci'], $options['scn'],
$options['ssci'], $options['sscn'], $options['ssci'], $options['sscn'],
$options['link']); $options['link']);
echo "\n"; echo "\n";
echo Database::error();
} else } else
echo "action not found\n"; echo "action not found\n";
echo "\n"; echo "\n";
?> ?>

6
main/reports/reports.cron.php
Unescape View File

@ -1,10 +1,8 @@
<?php <?php
/* For licensing terms, see /license.txt */
require_once 'reports.lib.php'; require_once 'reports.lib.php';
reports_clearAll(); reports_clearAll();
echo Database::error();
reports_build(); reports_build();
echo Database::error();
reports_addDBKeys(); reports_addDBKeys();
echo Database::error();
?>

3
main/webservices/registration.soap.php
Unescape View File

@ -1085,10 +1085,9 @@ function WSCreateUserPasswordCrypted($params) {
} }
} }
} else { } else {
$error = Database::error();
if ($debug) error_log($error);
return 0; return 0;
} }
return $return; return $return;
} }

8
main/wiki/wiki.inc.php
Unescape View File

@ -3173,7 +3173,7 @@ class Wiki
$message_author = api_get_user_id(); $message_author = api_get_user_id();
$sql="INSERT INTO $tbl_wiki_discuss (c_id, publication_id, userc_id, comment, p_score, dtime) VALUES $sql="INSERT INTO $tbl_wiki_discuss (c_id, publication_id, userc_id, comment, p_score, dtime) VALUES
($course_id, '".$id."','".$message_author."','".Database::escape_string($_POST['comment'])."','".Database::escape_string($_POST['rating'])."','".$dtime."')"; ($course_id, '".$id."','".$message_author."','".Database::escape_string($_POST['comment'])."','".Database::escape_string($_POST['rating'])."','".$dtime."')";
$result=Database::query($sql) or die(Database::error()); $result = Database::query($sql);
self::check_emailcue($id, 'D', $dtime, $message_author); self::check_emailcue($id, 'D', $dtime, $message_author);
} }
}//end discuss lock }//end discuss lock
@ -3184,7 +3184,7 @@ class Wiki
$sql="SELECT * FROM $tbl_wiki_discuss reviews, $user_table user $sql="SELECT * FROM $tbl_wiki_discuss reviews, $user_table user
WHERE reviews.c_id = $course_id AND reviews.publication_id='".$id."' AND user.user_id='".$firstuserid."' WHERE reviews.c_id = $course_id AND reviews.publication_id='".$id."' AND user.user_id='".$firstuserid."'
ORDER BY id DESC"; ORDER BY id DESC";
$result=Database::query($sql) or die(Database::error()); $result=Database::query($sql);
$countWPost = Database::num_rows($result); $countWPost = Database::num_rows($result);
echo get_lang('NumComments').": ".$countWPost; //comment's numbers echo get_lang('NumComments').": ".$countWPost; //comment's numbers
@ -3193,12 +3193,12 @@ class Wiki
FROM $tbl_wiki_discuss FROM $tbl_wiki_discuss
WHERE c_id = $course_id AND publication_id = '".$id."' AND NOT p_score='-' WHERE c_id = $course_id AND publication_id = '".$id."' AND NOT p_score='-'
ORDER BY id DESC"; ORDER BY id DESC";
$result2=Database::query($sql) or die(Database::error()); $result2=Database::query($sql);
$row2=Database::fetch_array($result2); $row2=Database::fetch_array($result2);
$sql = "SELECT * FROM $tbl_wiki_discuss $sql = "SELECT * FROM $tbl_wiki_discuss
WHERE c_id = $course_id AND publication_id='".$id."' AND NOT p_score='-'"; WHERE c_id = $course_id AND publication_id='".$id."' AND NOT p_score='-'";
$result3=Database::query($sql) or die(Database::error()); $result3=Database::query($sql);
$countWPost_score= Database::num_rows($result3); $countWPost_score= Database::num_rows($result3);
echo ' - '.get_lang('NumCommentsScore').': '.$countWPost_score;// echo ' - '.get_lang('NumCommentsScore').': '.$countWPost_score;//

10
plugin/buycourses/src/function.php
Unescape View File

@ -387,7 +387,7 @@ if ($_REQUEST['tab'] == 'save_paypal') {
$res = Database::query($sql); $res = Database::query($sql);
if (!$res) { if (!$res) {
$content = $plugin->get_lang('ProblemToSaveThePaypalParameters') . Database::error(); $content = $plugin->get_lang('ProblemToSaveThePaypalParameters');
echo json_encode(array("status" => "false", "content" => $content)); echo json_encode(array("status" => "false", "content" => $content));
} else { } else {
$content = get_lang('Saved'); $content = get_lang('Saved');
@ -404,7 +404,7 @@ if ($_REQUEST['tab'] == 'add_account') {
$res = Database::query($sql); $res = Database::query($sql);
if (!$res) { if (!$res) {
$content = $plugin->get_lang('ProblemToInsertANewAccount') . Database::error(); $content = $plugin->get_lang('ProblemToInsertANewAccount');
echo json_encode(array("status" => "false", "content" => $content)); echo json_encode(array("status" => "false", "content" => $content));
} else { } else {
$content = get_lang('Saved'); $content = get_lang('Saved');
@ -418,7 +418,7 @@ if ($_REQUEST['tab'] == 'delete_account') {
$sql = "DELETE FROM $tableBuyCourseTransfer WHERE id='" . $id . "';"; $sql = "DELETE FROM $tableBuyCourseTransfer WHERE id='" . $id . "';";
$res = Database::query($sql); $res = Database::query($sql);
if (!$res) { if (!$res) {
$content = $plugin->get_lang('ProblemToDeleteTheAccount') . Database::error(); $content = $plugin->get_lang('ProblemToDeleteTheAccount');
echo json_encode(array("status" => "false", "content" => $content)); echo json_encode(array("status" => "false", "content" => $content));
} else { } else {
$content = get_lang('Saved'); $content = get_lang('Saved');
@ -452,7 +452,7 @@ if ($_REQUEST['tab'] == 'save_mod') {
$res = Database::query($sql); $res = Database::query($sql);
if (!$res) { if (!$res) {
$content = $plugin->get_lang('ProblemToSaveTheMessage') . Database::error(); $content = $plugin->get_lang('ProblemToSaveTheMessage');
echo json_encode(array("status" => "false", "content" => $content)); echo json_encode(array("status" => "false", "content" => $content));
} else { } else {
echo json_encode(array("status" => "true", "course_id" => $id)); echo json_encode(array("status" => "true", "course_id" => $id));
@ -480,7 +480,7 @@ if ($_REQUEST['tab'] == 'clear_order') {
$res = Database::query($sql); $res = Database::query($sql);
if (!$res) { if (!$res) {
$content = $plugin->get_lang('ProblemToDeleteTheAccount') . Database::error(); $content = $plugin->get_lang('ProblemToDeleteTheAccount');
echo json_encode(array("status" => "false", "content" => $content)); echo json_encode(array("status" => "false", "content" => $content));
} else { } else {
$content = get_lang('Saved'); $content = get_lang('Saved');

Write Preview
Loading…
Cancel
Save